Merge pull request #10 from redmatrix/master

updating from original codebase

705 files changed, 39274 insertions, 126165 deletions

diff --git a/LICENSE b/LICENSE
index 40cc07bb5..a2c2d1599 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2015 Hubzilla
+Copyright (c) 2010-2016 Hubzilla
 All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Zotlabs/Identity/BasicId.php b/Zotlabs/Identity/BasicId.php
new file mode 100644
index 000000000..3c149808f
--- /dev/null
+++ b/Zotlabs/Identity/BasicId.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Zotlabs\Identity\BasicId;
+
+class BasicId {
+
+	private $name;
+	private $profile_photo;
+	private $profile_url;
+	private $address;
+	private $protocol;
+
+
+
+
+
+}
+
diff --git a/Zotlabs/Identity/ProfilePhoto.php b/Zotlabs/Identity/ProfilePhoto.php
new file mode 100644
index 000000000..2891136c7
--- /dev/null
+++ b/Zotlabs/Identity/ProfilePhoto.php
@@ -0,0 +1,16 @@
+<?php
+namespace Zotlabs\Identity\ProfilePhoto;
+
+class ProfilePhoto {
+
+	private $photo_large_url;
+	private $photo_medium_url;
+	private $photo_small_url;
+	private $photo_mimetype;
+	private $photo_updated;
+
+
+
+
+}
+
diff --git a/Zotlabs/Zot/Auth.php b/Zotlabs/Zot/Auth.php
new file mode 100644
index 000000000..fed253923
--- /dev/null
+++ b/Zotlabs/Zot/Auth.php
@@ -0,0 +1,345 @@
+<?php
+
+namespace Zotlabs\Zot;
+
+class Auth {
+
+	protected $test;
+	protected $test_results;
+	protected $debug_msg;
+
+	protected $address;
+	protected $desturl;
+	protected $sec;
+	protected $version;
+	protected $delegate;
+	protected $success;
+	protected $delegate_success;
+
+	protected $remote;
+	protected $remote_service_class;
+	protected $remote_level;
+	protected $remote_hub;
+	protected $dnt;
+
+	function __construct($req) {
+
+
+		$this->test         = ((array_key_exists('test',$req)) ? intval($req['test']) : 0);
+		$this->test_results = array('success' => false);
+		$this->debug_msg    = '';
+
+		$this->success   = false;
+		$this->address   = $req['auth'];
+		$this->desturl   = $req['dest'];
+		$this->sec       = $req['sec'];
+		$this->version   = $req['version'];
+		$this->delegate  = $req['delegate'];
+
+		$c = get_sys_channel();
+		if(! $c) {
+			logger('unable to obtain response (sys) channel');
+			$this->Debug('no local channels found.');
+			$this->Finalise();
+		}
+
+		$x = $this->GetHublocs($this->address);
+
+		if($x) {
+			foreach($x as $xx) {
+				if($this->Verify($c,$xx))
+					break;
+			}
+		}
+
+		/**
+		 * @FIXME we really want to save the return_url in the session before we
+		 * visit rmagic. This does however prevent a recursion if you visit
+		 * rmagic directly, as it would otherwise send you back here again.
+		 * But z_root() probably isn't where you really want to go.
+		 */
+
+		if(strstr($this->desturl,z_root() . '/rmagic'))
+			goaway(z_root());
+
+		$this->Finalise();	
+
+	}
+
+	function GetHublocs($address) {
+
+		// Try and find a hubloc for the person attempting to auth.
+		// Since we're matching by address, we have to return all entries
+		// some of which may be from re-installed hubs; and we'll need to 
+		// try each sequentially to see if one can pass the test
+
+		$x = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash 
+			where hubloc_addr = '%s' order by hubloc_id desc",
+			dbesc($address)
+		);
+
+		if(! $x) {
+			// finger them if they can't be found.
+			$ret = zot_finger($address, null);
+			if ($ret['success']) {
+				$j = json_decode($ret['body'], true);
+				if($j)
+					import_xchan($j);
+				$x = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash 
+					where hubloc_addr = '%s' order by hubloc_id desc",
+					dbesc($address)
+				);
+			}
+		}
+		if(! $x) {
+			logger('mod_zot: auth: unable to finger ' . $address);
+			$this->Debug('no hubloc found for ' . $address . ' and probing failed.');
+			$this->Finalise();
+		}
+
+		return $x;
+	}
+
+
+	function Verify($channel,$hubloc) {
+
+		logger('auth request received from ' . $hubloc['hubloc_addr'] );
+
+		$this->remote               = remote_channel();
+		$this->remote_service_class = '';
+		$this->remote_level         = 0;
+		$this->remote_hub           = $hubloc['hubloc_url'];
+		$this->dnt                  = 0;
+
+		// check credentials and access
+
+		// If they are already authenticated and haven't changed credentials,
+		// we can save an expensive network round trip and improve performance.
+
+		// Also check that they are coming from the same site as they authenticated with originally.
+
+		$already_authed = (((remote_channel()) && ($hubloc['hubloc_hash'] == remote_channel()) 
+			&& ($hubloc['hubloc_url'] === $_SESSION['remote_hub'])) ? true : false);
+	
+		if($this->delegate && $this->delegate !== $_SESSION['delegate_channel'])
+			$already_authed = false;
+
+		if($already_authed)
+			return true;
+
+		if(local_channel()) {
+
+			// tell them to logout if they're logged in locally as anything but the target remote account
+			// in which case just shut up because they don't need to be doing this at all.
+
+			if (get_app()->channel['channel_hash'] == $hubloc['xchan_hash']) {
+				return true;
+			}
+			else {
+				logger('already authenticated locally as somebody else.');
+				notice( t('Remote authentication blocked. You are logged into this site locally. Please logout and retry.') . EOL);
+				if($this->test) {
+					$this->Debug('already logged in locally with a conflicting identity.');
+					return false;
+				}
+			}
+			return false;
+		}
+
+		// Auth packets MUST use ultra top-secret hush-hush mode - e.g. the entire packet is encrypted using the 
+		// site private key
+		// The actual channel sending the packet ($c[0]) is not important, but this provides a 
+		// generic zot packet with a sender which can be verified
+
+		$p = zot_build_packet($channel,$type = 'auth_check', 
+			array(array('guid' => $hubloc['hubloc_guid'],'guid_sig' => $hubloc['hubloc_guid_sig'])), 
+			$hubloc['hubloc_sitekey'], $this->sec);
+
+		$this->Debug('auth check packet created using sitekey ' . $hubloc['hubloc_sitekey']);
+		$this->Debug('packet contents: ' . $p);
+
+		$result = zot_zot($hubloc['hubloc_callback'],$p);
+		if(! $result['success']) {
+			logger('auth_check callback failed.');
+			if($this->test)
+				$this->Debug('auth check request to your site returned .' . print_r($result, true));
+			return false;
+		}
+
+		$j = json_decode($result['body'], true);
+		if(! $j) {
+			logger('auth_check json data malformed.');
+			if($this->test)
+				$this->Debug('json malformed: ' . $result['body']);
+			return false;
+		}
+
+		$this->Debug('auth check request returned .' . print_r($j, true));
+
+		if(! $j['success']) 
+			return false;
+
+		// legit response, but we do need to check that this wasn't answered by a man-in-middle
+
+		if (! rsa_verify($this->sec . $hubloc['xchan_hash'],base64url_decode($j['confirm']),$hubloc['xchan_pubkey'])) {
+			logger('final confirmation failed.');
+			if($this->test)
+				$this->Debug('final confirmation failed. ' . $sec . print_r($j,true) . print_r($hubloc,true));
+			return false;
+		}
+
+		if (array_key_exists('service_class',$j))
+			$this->remote_service_class = $j['service_class'];
+		if (array_key_exists('level',$j))
+			$this->remote_level = $j['level'];
+		if (array_key_exists('DNT',$j))
+			$this->dnt = $j['DNT'];
+
+
+		// log them in
+
+		if ($this->test) {
+			// testing only - return the success result
+			$this->test_results['success'] = true;
+			$this->Debug('Authentication Success!');
+			$this->Finalise();
+		}
+
+		$_SESSION['authenticated'] = 1;
+
+		// check for delegation and if all is well, log them in locally with delegation restrictions
+
+		$this->delegate_success = false;
+
+		if($this->delegate) {
+			$r = q("select * from channel left join xchan on channel_hash = xchan_hash where xchan_addr = '%s' limit 1",
+				dbesc($this->delegate)
+			);
+			if ($r && intval($r[0]['channel_id'])) {
+				$allowed = perm_is_allowed($r[0]['channel_id'],$hubloc['xchan_hash'],'delegate');
+				if($allowed) {
+					$_SESSION['delegate_channel'] = $r[0]['channel_id'];
+					$_SESSION['delegate'] = $hubloc['xchan_hash'];
+					$_SESSION['account_id'] = intval($r[0]['channel_account_id']);
+					require_once('include/security.php');
+					// this will set the local_channel authentication in the session
+					change_channel($r[0]['channel_id']);
+					$this->delegate_success = true;
+				}
+			}
+		}
+
+		if (! $this->delegate_success) {
+			// normal visitor (remote_channel) login session credentials
+			$_SESSION['visitor_id'] = $hubloc['xchan_hash'];
+			$_SESSION['my_url'] = $hubloc['xchan_url'];
+			$_SESSION['my_address'] = $this->address;
+			$_SESSION['remote_service_class'] = $this->remote_service_class;
+			$_SESSION['remote_level'] = $this->remote_level;
+			$_SESSION['remote_hub'] = $this->remote_hub;
+			$_SESSION['DNT'] = $this->dnt;
+		}
+
+		$arr = array('xchan' => $hubloc, 'url' => $this->desturl, 'session' => $_SESSION);
+		call_hooks('magic_auth_success',$arr);
+		get_app()->set_observer($hubloc);
+		require_once('include/security.php');
+		get_app()->set_groups(init_groups_visitor($_SESSION['visitor_id']));
+		info(sprintf( t('Welcome %s. Remote authentication successful.'),$hubloc['xchan_name']));
+		logger('mod_zot: auth success from ' . $hubloc['xchan_addr']);
+		$this->success = true;
+		return true;
+	}
+
+	function Debug($msg) {
+		$this->debug_msg .= $msg . EOL;
+	}
+
+
+	function Finalise() {
+
+		if($this->test) {
+			$this->test_results['message'] = $this->debug_msg;
+			json_return_and_die($this->test_results);
+		}
+
+		goaway($this->desturl);
+	}
+
+}
+
+
+/**
+ *
+ * Magic Auth
+ * ==========
+ *
+ * So-called "magic auth" takes place by a special exchange. On the site where the "channel to be authenticated" lives (e.g. $mysite), 
+ * a redirection is made via $mysite/magic to the zot endpoint of the remote site ($remotesite) with special GET parameters.
+ *
+ * The endpoint is typically  https://$remotesite/post - or whatever was specified as the callback url in prior communications
+ * (we will bootstrap an address and fetch a zot info packet if possible where no prior communications exist)
+ *
+ * Five GET parameters are supplied:
+ * * auth => the urlencoded webbie (channel@host.domain) of the channel requesting access
+ * * dest => the desired destination URL (urlencoded)
+ * * sec  => a random string which is also stored on $mysite for use during the verification phase. 
+ * * version => the zot revision
+ * * delegate => optional urlencoded webbie of a local channel to invoke delegation rights for
+ *
+ * * test => (optional 1 or 0 - debugs the authentication exchange and returns a json response instead of redirecting the browser session)
+ *
+ * When this packet is received, an "auth-check" zot message is sent to $mysite.
+ * (e.g. if $_GET['auth'] is foobar@podunk.edu, a zot packet is sent to the podunk.edu zot endpoint, which is typically /post)
+ * If no information has been recorded about the requesting identity a zot information packet will be retrieved before
+ * continuing.
+ *
+ * The sender of this packet is an arbitrary/random site channel. The recipients will be a single recipient corresponding
+ * to the guid and guid_sig we have associated with the requesting auth identity
+ *
+ * \code{.json}
+ * {
+ *   "type":"auth_check",
+ *   "sender":{
+ *     "guid":"kgVFf_...",
+ *     "guid_sig":"PT9-TApz...",
+ *     "url":"http:\/\/podunk.edu",
+ *     "url_sig":"T8Bp7j...",
+ *     "sitekey":"aMtgKTiirXrICP..."
+ *   },
+ *   "recipients":{
+ *     {
+ *       "guid":"ZHSqb...",
+ *       "guid_sig":"JsAAXi..."
+ *     }
+ *   }
+ *   "callback":"\/post",
+ *   "version":1,
+ *   "secret":"1eaa661",
+ *   "secret_sig":"eKV968b1..."
+ * }
+ * \endcode
+ *
+ * auth_check messages MUST use encapsulated encryption. This message is sent to the origination site, which checks the 'secret' to see 
+ * if it is the same as the 'sec' which it passed originally. It also checks the secret_sig which is the secret signed by the 
+ * destination channel's private key and base64url encoded. If everything checks out, a json packet is returned:
+ *
+ * \code{.json}
+ * {
+ *   "success":1,
+ *   "confirm":"q0Ysovd1u...",
+ *   "service_class":(optional)
+ *   "level":(optional)
+ *   "DNT": (optional do-not-track - 1 or 0)
+ * }
+ * \endcode
+ *
+ * 'confirm' in this case is the base64url encoded RSA signature of the concatenation of 'secret' with the
+ * base64url encoded whirlpool hash of the requestor's guid and guid_sig; signed with the source channel private key. 
+ * This prevents a man-in-the-middle from inserting a rogue success packet. Upon receipt and successful 
+ * verification of this packet, the destination site will redirect to the original destination URL and indicate a successful remote login. 
+ * Service_class can be used by cooperating sites to provide different access rights based on account rights and subscription plans. It is 
+ * a string whose contents are not defined by protocol. Example: "basic" or "gold".
+ *
+ * @param[in,out] App &$a
+ */
diff --git a/Zotlabs/Zot/IHandler.php b/Zotlabs/Zot/IHandler.php
new file mode 100644
index 000000000..eeca1555c
--- /dev/null
+++ b/Zotlabs/Zot/IHandler.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Zotlabs\Zot;
+
+interface IHandler {
+
+	function Ping();
+
+	function Pickup($data);
+
+	function Notify($data);
+
+	function Request($data);
+
+	function AuthCheck($data,$encrypted);
+
+	function Purge($sender,$recipients);
+
+	function Refresh($sender,$recipients);
+
+}
+
diff --git a/Zotlabs/Zot/Receiver.php b/Zotlabs/Zot/Receiver.php
new file mode 100644
index 000000000..238de1332
--- /dev/null
+++ b/Zotlabs/Zot/Receiver.php
@@ -0,0 +1,296 @@
+<?php
+
+namespace Zotlabs\Zot;
+
+class Receiver {
+
+	protected $data;
+	protected $encrypted;
+	protected $error;
+	protected $messagetype;
+	protected $sender;
+	protected $validated;
+	protected $recipients;
+	protected $response;
+	protected $handler;
+
+	function __construct($data,$prvkey,$handler) {
+
+		$this->error       = false;
+		$this->validated   = false;
+		$this->messagetype = '';
+		$this->response    = array('success' => false);
+
+		$this->handler = $handler;
+
+		if(! is_array($data))
+			$data = json_decode($data,true);
+
+		if($data && is_array($data)) {
+			$this->encrypted = ((array_key_exists('iv',$data)) ? true : false);
+
+			if($this->encrypted) {
+				$this->data = @json_decode(@crypto_unencapsulate($data,$prvkey),true);
+			}
+			if(! $this->data)
+				$this->data = $data;
+
+			if($this->data && is_array($this->data) && array_key_exists('type',$this->data))
+				$this->messagetype = $this->data['type'];
+		}
+		if(! $this->messagetype)
+			$this->error = true;
+
+		$this->sender     = ((array_key_exists('sender',$this->data)) ? $this->data['sender'] : null);
+		$this->recipients = ((array_key_exists('recipients',$this->data)) ? $this->data['recipients'] : null);
+
+
+		if($this->sender)
+			$this->ValidateSender();
+
+		$this->Dispatch();
+	}
+
+	function ValidateSender() {
+		$hubs = zot_gethub($this->sender,true);
+		if (! $hubs) {
+
+			/* Have never seen this guid or this guid coming from this location. Check it and register it. */
+			/* (!!) this will validate the sender. */
+
+        	$result = zot_register_hub($this->sender);
+
+        	if ((! $result['success']) || (! ($hubs = zot_gethub($this->sender,true)))) {
+            	$this->response['message'] = 'Hub not available.';
+	            json_return_and_die($this->response);
+    	    }
+		}
+		foreach($hubs as $hub) {
+			update_hub_connected($hub,((array_key_exists('sitekey',$this->sender)) ? $this->sender['sitekey'] : ''));
+		}
+		$this->validated = true;
+    }
+
+		
+	function Dispatch() {
+
+		/* Handle tasks which don't require sender validation */
+
+		switch($this->messagetype) {
+			case 'ping':
+				/* no validation needed */
+				$this->handler->Ping();
+				break;
+			case 'pickup':
+				/* perform site validation, as opposed to sender validation */
+				$this->handler->Pickup($this->data);
+				break;
+
+			default:
+				if(! $this->validated) {
+					$this->response['message'] = 'Sender not valid';
+					json_return_and_die($this->response);
+				}
+				break;
+		}
+
+		/* Now handle tasks which require sender validation */
+
+		switch($this->messagetype) {
+
+			case 'auth_check':
+				$this->handler->AuthCheck($this->data,$this->encrypted);
+				break;
+
+			case 'request':
+				$this->handler->Request($this->data);
+				break;
+
+			case 'purge':
+				$this->handler->Purge($this->sender,$this->recipients);
+				break;
+
+			case 'refresh':
+			case 'force_refresh':
+				$this->handler->Refresh($this->sender,$this->recipients);
+				break;
+
+			case 'notify':
+				$this->handler->Notify($this->data);
+				break;
+
+			default:
+				$this->response['message'] = 'Not implemented';
+				json_return_and_die($this->response);
+				break;
+		}
+
+	}
+}
+
+
+
+/**
+ * @brief zot communications and messaging.
+ *
+ * Sender HTTP posts to this endpoint ($site/post typically) with 'data' parameter set to json zot message packet.
+ * This packet is optionally encrypted, which we will discover if the json has an 'iv' element.
+ * $contents => array( 'alg' => 'aes256cbc', 'iv' => initialisation vector, 'key' => decryption key, 'data' => encrypted data);
+ * $contents->iv and $contents->key are random strings encrypted with this site's RSA public key and then base64url encoded.
+ * Currently only 'aes256cbc' is used, but this is extensible should that algorithm prove inadequate.
+ *
+ * Once decrypted, one will find the normal json_encoded zot message packet.
+ * 
+ * Defined packet types are: notify, purge, refresh, force_refresh, auth_check, ping, and pickup 
+ *
+ * Standard packet: (used by notify, purge, refresh, force_refresh, and auth_check)
+ * \code{.json}
+ * {
+ *   "type": "notify",
+ *   "sender":{
+ *     "guid":"kgVFf_1...",
+ *     "guid_sig":"PT9-TApzp...",
+ *     "url":"http:\/\/podunk.edu",
+ *     "url_sig":"T8Bp7j5...",
+ *   },
+ *   "recipients": { optional recipient array },
+ *   "callback":"\/post",
+ *   "version":1,
+ *   "secret":"1eaa...",
+ *   "secret_sig": "df89025470fac8..."
+ * }
+ * \endcode
+ *
+ * Signature fields are all signed with the sender channel private key and base64url encoded.
+ * Recipients are arrays of guid and guid_sig, which were previously signed with the recipients private 
+ * key and base64url encoded and later obtained via channel discovery. Absence of recipients indicates
+ * a public message or visible to all potential listeners on this site.
+ *
+ * "pickup" packet:
+ * The pickup packet is sent in response to a notify packet from another site
+ * \code{.json}
+ * {
+ *   "type":"pickup",
+ *   "url":"http:\/\/example.com",
+ *   "callback":"http:\/\/example.com\/post",
+ *   "callback_sig":"teE1_fLI...",
+ *   "secret":"1eaa...",
+ *   "secret_sig":"O7nB4_..."
+ * }
+ * \endcode
+ *
+ * In the pickup packet, the sig fields correspond to the respective data
+ * element signed with this site's system private key and then base64url encoded.
+ * The "secret" is the same as the original secret from the notify packet. 
+ *
+ * If verification is successful, a json structure is returned containing a
+ * success indicator and an array of type 'pickup'.
+ * Each pickup element contains the original notify request and a message field
+ * whose contents are dependent on the message type.
+ *
+ * This JSON array is AES encapsulated using the site public key of the site
+ * that sent the initial zot pickup packet.
+ * Using the above example, this would be example.com.
+ *
+ * \code{.json}
+ * {
+ *   "success":1,
+ *   "pickup":{
+ *     "notify":{
+ *       "type":"notify",
+ *       "sender":{
+ *         "guid":"kgVFf_...",
+ *         "guid_sig":"PT9-TApz...",
+ *         "url":"http:\/\/z.podunk.edu",
+ *         "url_sig":"T8Bp7j5D..."
+ *       },
+ *       "callback":"\/post",
+ *       "version":1,
+ *       "secret":"1eaa661..."
+ *     },
+ *     "message":{
+ *       "type":"activity",
+ *       "message_id":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu",
+ *       "message_top":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu",
+ *       "message_parent":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu",
+ *       "created":"2012-11-20 04:04:16",
+ *       "edited":"2012-11-20 04:04:16",
+ *       "title":"",
+ *       "body":"Hi Nickordo",
+ *       "app":"",
+ *       "verb":"post",
+ *       "object_type":"",
+ *       "target_type":"",
+ *       "permalink":"",
+ *       "location":"",
+ *       "longlat":"",
+ *       "owner":{
+ *         "name":"Indigo",
+ *         "address":"indigo@podunk.edu",
+ *         "url":"http:\/\/podunk.edu",
+ *         "photo":{
+ *           "mimetype":"image\/jpeg",
+ *           "src":"http:\/\/podunk.edu\/photo\/profile\/m\/5"
+ *         },
+ *         "guid":"kgVFf_...",
+ *         "guid_sig":"PT9-TAp...",
+ *       },
+ *       "author":{
+ *         "name":"Indigo",
+ *         "address":"indigo@podunk.edu",
+ *         "url":"http:\/\/podunk.edu",
+ *         "photo":{
+ *           "mimetype":"image\/jpeg",
+ *           "src":"http:\/\/podunk.edu\/photo\/profile\/m\/5"
+ *         },
+ *         "guid":"kgVFf_...",
+ *         "guid_sig":"PT9-TAp..."
+ *       }
+ *     }
+ *   }
+ * }
+ * \endcode
+ *
+ * Currently defined message types are 'activity', 'mail', 'profile', 'location'
+ * and 'channel_sync', which each have different content schemas.
+ *
+ * Ping packet:
+ * A ping packet does not require any parameters except the type. It may or may
+ * not be encrypted.
+ *
+ * \code{.json}
+ * {
+ *   "type": "ping"
+ * }
+ * \endcode
+ *
+ * On receipt of a ping packet a ping response will be returned:
+ *
+ * \code{.json}
+ * {
+ *   "success" : 1,
+ *   "site" {
+ *     "url": "http:\/\/podunk.edu",
+ *     "url_sig": "T8Bp7j5...",
+ *     "sitekey": "-----BEGIN PUBLIC KEY-----
+ *                 MIICIjANBgkqhkiG9w0BAQE..."
+ *   }
+ * }
+ * \endcode
+ *
+ * The ping packet can be used to verify that a site has not been re-installed, and to 
+ * initiate corrective action if it has. The url_sig is signed with the site private key
+ * and base64url encoded - and this should verify with the enclosed sitekey. Failure to
+ * verify indicates the site is corrupt or otherwise unable to communicate using zot.
+ * This return packet is not otherwise verified, so should be compared with other
+ * results obtained from this site which were verified prior to taking action. For instance
+ * if you have one verified result with this signature and key, and other records for this 
+ * url which have different signatures and keys, it indicates that the site was re-installed
+ * and corrective action may commence (remove or mark invalid any entries with different
+ * signatures).
+ * If you have no records which match this url_sig and key - no corrective action should
+ * be taken as this packet may have been returned by an imposter.  
+ *
+ * @param[in,out] App &$a
+ */
+
diff --git a/Zotlabs/Zot/ZotHandler.php b/Zotlabs/Zot/ZotHandler.php
new file mode 100644
index 000000000..f9bb05410
--- /dev/null
+++ b/Zotlabs/Zot/ZotHandler.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Zotlabs\Zot;
+
+require_once('Zotlabs/Zot/IHandler.php');
+
+
+class ZotHandler implements IHandler {
+
+	function Ping() {
+		zot_reply_ping();
+	}
+
+	function Pickup($data) {
+		zot_reply_pickup($data);
+	}
+
+	function Notify($data) {
+		zot_reply_notify($data);
+	}
+
+	function Request($data) {
+		zot_reply_message_request($data);
+	}
+
+	function AuthCheck($data,$encrypted) {
+		zot_reply_auth_check($data,$encrypted);
+	}
+
+	function Purge($sender,$recipients) {
+		zot_reply_purge($sender,$recipients);
+	}
+
+	function Refresh($sender,$recipients) {
+		zot_reply_refresh($sender,$recipients);
+	}
+
+}
diff --git a/boot.php b/boot.php
index 48d81ff59..a3e35f63c 100755
--- a/boot.php
+++ b/boot.php
@@ -48,10 +48,10 @@ require_once('include/AccessList.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'H');
-define ( 'STD_VERSION',             '1.0' );
+define ( 'STD_VERSION',             '1.0.1' );
 define ( 'ZOT_REVISION',            1     );
 
-define ( 'DB_UPDATE_VERSION',       1160  );
+define ( 'DB_UPDATE_VERSION',       1161  );
 
 
 /**
@@ -82,8 +82,8 @@ define ( 'DIRECTORY_FALLBACK_MASTER',  'https://zothub.com');
 $DIRECTORY_FALLBACK_SERVERS = array( 
 	'https://zothub.com', 
 	'https://hubzilla.site',
-	'https://red.zottel.red',
-	'https://gravizot.de',
+	'https://hubzilla.zottel.net',
+	'https://hub.pixelbits.de',
 	'https://my.federated.social',
 	'https://hubzilla.nl'
 );
@@ -704,11 +704,18 @@ class App {
 		'smarty3' => '}}'
 	);
 
+	// These represent the URL which was used to access the page
+
 	private $scheme;
 	private $hostname;
-	private $baseurl;
 	private $path;
 
+	// This is our standardised URL - regardless of what was used
+	// to access the page
+
+	private $baseurl;
+
+
 	/**
 	 * App constructor.
 	 */
@@ -1324,7 +1331,7 @@ function check_config(&$a) {
 	 *
 	 */
 
-	$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
+	$r = q("SELECT * FROM addon WHERE installed = 1");
 	if($r)
 		$installed = $r;
 	else
diff --git a/doc/Hubzilla_on_OpenShift.bb b/doc/Hubzilla_on_OpenShift.bb
index 9b2c539dc..9ccd66284 100644
--- a/doc/Hubzilla_on_OpenShift.bb
+++ b/doc/Hubzilla_on_OpenShift.bb
@@ -8,7 +8,7 @@ Create an account on OpenShift, then use the registration e-mail and password to
 [code]rhc app-create your_app_name php-5.4 mysql-5.5 cron phpmyadmin --namespace your_domain --from-code https://github.com/redmatrix/hubzilla.git -l your@email.address -p your_account_password
 [/code]
 
-Make a note of the database username and password OpenShift creates for your instance, and use these at [url=https://your_app_name-your_domain.rhcloud.com/]https://your_app_name-your_domain.rhcloud.com/[/url] to complete the setup.
+Make a note of the database username and password OpenShift creates for your instance, and use these at [url=https://your_app_name-your_domain.rhcloud.com/]https://your_app_name-your_domain.rhcloud.com/[/url] to complete the setup. You MUST change server address from 127.0.0.1 to localhost.
 
 NOTE: PostgreSQL is NOT supported by the deploy script yet, see [zrl=https://zot-mor.rhcloud.com/display/3c7035f2a6febf87057d84ea0ae511223e9b38dc27913177bc0df053edecac7c@zot-mor.rhcloud.com?zid=haakon%40zot-mor.rhcloud.com]this thread[/zrl].
 
diff --git a/doc/Widgets.md b/doc/Widgets.md
index 7c506dea7..baacffd6f 100644
--- a/doc/Widgets.md
+++ b/doc/Widgets.md
@@ -75,7 +75,7 @@ Some/many of these widgets have restrictions which may restrict the type of page
 * suggestedchats - "interesting" chatrooms chosen for the current observer
 
 * item - displays a single webpage item by mid
-    * args: mid - message_id of webpage to display
+    * args: mid - message_id of webpage to display (must be webpage, not a conversation item)
 <br />&nbsp;<br />
 
 * photo - display a single photo
diff --git a/doc/about.bb b/doc/about.bb
index 1d1a2d099..1ec1cf28e 100644
--- a/doc/about.bb
+++ b/doc/about.bb
@@ -4,7 +4,7 @@ $Projectname is a decentralized communication network, which aims to provide com
 

 $Projectname is free and open source.  It is designed to scale from a $35 Raspberry Pi, to top of the line AMD and Intel Xeon-powered multi-core enterprise servers.  It can be used to support communication between a few individuals, or scale to many thousands and more.

 

-Red aims to be skill and resource agnostic. It is easy to use by everyday computer users, as well as by systems administrators and developers. 

+$Projectname aims to be skill and resource agnostic. It is easy to use by everyday computer users, as well as by systems administrators and developers. 

 

 How you use it depends on how you want to use it. 

 

diff --git a/doc/channels.bb b/doc/channels.bb
index ff0446541..4b47b61dc 100644
--- a/doc/channels.bb
+++ b/doc/channels.bb
@@ -22,7 +22,7 @@ Once you have created your channel, you will be taken to the settings page, wher
 

 Once you have done this, your channel is ready to use. At [observer=1][observer.url][/observer][observer=0]example.com/channel/username[/observer] you will find your channel &quot;stream&quot;. This is where your recent activity will appear, in reverse chronological order. If you post in the box marked &quot;share&quot;, the entry will appear at the top of your stream. You will also find links to all the other communication areas for this channel here. The &quot;About&quot; tab contains your &quot;profile&quot;, the photos page contain photo albums, and the events page contains events share by both yourself and your contacts.

 

-The &quot;Matrix&quot; page contains all recent posts from across the matrix, again in reverse chronologial order. The exact posts that appear here depend largely on your permissions. At their most permissive, you will receive posts from complete strangers. At the other end of the scale, you may see posts from only your friends - or if you're feeling really anti-social, only your own posts.

+The &quot;Grid&quot; page contains all recent posts from across the $Projectname network, again in reverse chronologial order. The exact posts that appear here depend largely on your permissions. At their most permissive, you will receive posts from complete strangers. At the other end of the scale, you may see posts from only your friends - or if you're feeling really anti-social, only your own posts.

 

 As mentioned at the start, many other kinds of channel are possible, however, the creation procedure is the same. The difference between channels lies primarily in the permissions assigned. For example, a channel for sharing documents with colleagues at work would probably want more permissive settings for &quot;Can write to my &quot;public&quot; file storage&quot; than a personal account. For more information, see the permissions section.

 

diff --git a/doc/database.bb b/doc/database.bb
index fe193cf7f..d327adbdc 100644
--- a/doc/database.bb
+++ b/doc/database.bb
@@ -23,18 +23,17 @@
 [tr][td][zrl=[baseurl]/help/database/db_group_member]group_member[/zrl][/td][td]privacy groups (collections), group info[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_groups]groups[/zrl][/td][td]privacy groups (collections), member info[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_hook]hook[/zrl][/td][td]plugin hook registry[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_hubloc]hubloc[/zrl][/td][td]Red location storage, ties a hub location to an xchan[/td][/tr]
+[tr][td][zrl=[baseurl]/help/database/db_hubloc]hubloc[/zrl][/td][td]xchan location storage, ties a hub location to an xchan[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_issue]issue[/zrl][/td][td]future bug/issue database[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_item]item[/zrl][/td][td]all posts and webpages[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_item_id]item_id[/zrl][/td][td]other identifiers on other services for posts[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_likes]likes[/zrl][/td][td]likes of 'things'[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_mail]mail[/zrl][/td][td]private messages[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_manage]manage[/zrl][/td][td]may be unused in Red, table of accounts that can "su" each other[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_menu]menu[/zrl][/td][td]webpage menu data[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_menu_item]menu_item[/zrl][/td][td]entries for webpage menus[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_notify]notify[/zrl][/td][td]notifications[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_obj]obj[/zrl][/td][td]object data for things (x has y)[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_outq]outq[/zrl][/td][td]Red output queue[/td][/tr]
+[tr][td][zrl=[baseurl]/help/database/db_outq]outq[/zrl][/td][td]output queue[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_pconfig]pconfig[/zrl][/td][td]personal (per channel) configuration storage[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_photo]photo[/zrl][/td][td]photo storage[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_poll]poll[/zrl][/td][td]data for polls[/td][/tr]
diff --git a/doc/database/db_abook.bb b/doc/database/db_abook.bb
index 2e4b9c4a7..364429884 100644
--- a/doc/database/db_abook.bb
+++ b/doc/database/db_abook.bb
@@ -39,8 +39,9 @@
 [tr][td]abook_unconnected[/td][td]currently unused. Projected usage is to indicate "one-way" connections which were insitgated on this end but are still pending on the remote end. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [tr][td]abook_self[/td][td]is a special case where the owner is the target. Every channel has one abook entry with abook_self and with a target abook_xchan set to channel.channel_hash . When this flag is present, abook_my_perms is the default permissions granted to all new connections and several other fields are unused.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [tr][td]abook_feed[/td][td]indicates this connection is an RSS/Atom feed and may trigger special handling.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
-[tr][td]abook_incl[/td][td]connection filter allow rules separated by LF[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
-[tr][td]abook_excl[/td][td]connection filter deny rules separated by LF[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[tr][td]abook_incl[/td][td]connection filter allow rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[tr][td]abook_excl[/td][td]connection filter deny rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[tr][td]abook_instance[/td][td]comma separated list of site urls of all channel clones that this connection is connected with (used only for singleton networks which don't support cloning)[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/table]
 
 
diff --git a/doc/database/db_manage.bb b/doc/database/db_manage.bb
deleted file mode 100644
index a0fdf5aa6..000000000
--- a/doc/database/db_manage.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-[table]
-[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra
-[/th][/tr]
-[tr][td]id[/td][td][/td][td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment
-[/td][/tr]
-[tr][td]uid[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
-[/td][/tr]
-[tr][td]xchan[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td]
-[/td][/tr]
-[/table]
-
-Return to [zrl=[baseurl]/help/database]database documentation[/zrl]
\ No newline at end of file
diff --git a/doc/de/about.bb b/doc/de/about.bb
index 313337f17..5e279b5ee 100644
--- a/doc/de/about.bb
+++ b/doc/de/about.bb
@@ -1,23 +1,23 @@
-[size=large][b]Was ist die Red-Matrix?[/b][/size]
+[size=large][b]Was ist $Projectname?[/b][/size]
 
-Die Red-Matrix ist ein dezentralisiertes Kommunikationsnetzwerk mit dem Ziel, Kommunikationsmöglichkeiten bereitzustellen, die Zensur umgehen, die Privatsphäre respektieren und somit frei sind von den Einschränkungen, die die heutigen kommerziellen Kommunikationsgiganten uns auferlegen. Diese stellen in erster Linie Spionagenetzwerke für zahlende Kunden aller Art zur Verfügung und monopolisieren und zentralisieren das ganze Internet – was ursprünglich eben gerade nicht unter den revolutionären Zielen war, die einst zum World Wide Web führten.
+$Projectname ist ein dezentralisiertes Kommunikationsnetzwerk mit dem Ziel, Kommunikationsmöglichkeiten bereitzustellen, die Zensur umgehen, die Privatsphäre respektieren und somit frei sind von den Einschränkungen, die die heutigen kommerziellen Kommunikationsgiganten uns auferlegen. Diese stellen in erster Linie Spionagenetzwerke für zahlende Kunden aller Art zur Verfügung und monopolisieren und zentralisieren das ganze Internet – was ursprünglich eben gerade nicht unter den revolutionären Zielen war, die einst zum World Wide Web führten.
 
-Die Software der Red-Matrix ist frei, kostenlos und Open Source. Sie wurde entwickelt, um auf einem Raspberry Pi für € 30,– ebenso zu laufen wie auf den größten AMD- und Intel-Xeon-Multiprozessor-Servern. Sie kann für die Kommunikation zwischen einigen wenigen Einzelpersonen genutzt werden oder viele tausend Leute und mehr miteinander verbinden.
+$Projectname ist frei, kostenlos und Open Source. Sie wurde entwickelt, um auf einem Raspberry Pi für € 30,– ebenso zu laufen wie auf den größten AMD- und Intel-Xeon-Multiprozessor-Servern. Es kann für die Kommunikation zwischen einigen wenigen Einzelpersonen genutzt werden oder viele tausend Leute und mehr miteinander verbinden.
 
-Ein weiteres Ziel ist es, von Können und Ressourcen unabhängig zu sein. Die Red-Matrix ist für den einfachen Computernutzer ebenso leicht bedienbar wie für Systemadministratoren und Entwickler.
+Ein weiteres Ziel ist es, von Können und Ressourcen unabhängig zu sein. $Projectname ist für den einfachen Computernutzer ebenso leicht bedienbar wie für Systemadministratoren und Entwickler.
 
-Wie Du sie benutzt hängt davon ab, wie Du sie benutzen [i]willst.[/i]
+Wie Du es benutzt hängt davon ab, wie Du es benutzen [i]willst.[/i]
 
-Die Red-Matrix ist in PHP geschrieben, dadurch ist es einfach, sie auf jedweder heutigen Hosting-Plattform zu installieren, inklusive Self-Hosting zu Hause, auf Shared Servern wie bei [url=https://uberspace.de/]Uberspace[/url], [url=http://mediatemple.com/]Media Temple[/url] und [url=http://www.dreamhost.com/]Dreamhost[/url], oder auf virtuellen und dedizierten Servern, wie es sie zum Beispiel bei [url=https://www.linode.com]Linode[/url], [url=http://greenqloud.com]GreenQloud[/url] oder [url=https://aws.amazon.com]Amazon AWS[/url] gibt.
+$Projectname ist in PHP geschrieben, dadurch ist es einfach, sie auf jedweder heutigen Hosting-Plattform zu installieren, inklusive Self-Hosting zu Hause, auf Shared Servern wie bei [url=https://uberspace.de/]Uberspace[/url], [url=http://mediatemple.com/]Media Temple[/url] und [url=http://www.dreamhost.com/]Dreamhost[/url], oder auf virtuellen und dedizierten Servern, wie es sie zum Beispiel bei [url=https://www.linode.com]Linode[/url], [url=http://greenqloud.com]GreenQloud[/url] oder [url=https://aws.amazon.com]Amazon AWS[/url] gibt.
 
-Mit anderen Worten, die Red-Matrix kann auf jeder Plattform laufen, die einen Web-Server, eine MySQL-kompatible Datenbank und PHP mitbringt.
+Mit anderen Worten, $Projectname kann auf jeder Plattform laufen, die einen Web-Server, eine MySQL-kompatible Datenbank und PHP mitbringt.
 
-Dabei bietet Red einige einzigartige Leckerbissen:
+Dabei bietet $Projectname einige einzigartige Leckerbissen:
 
-[b]Ein-Klick-Identifikation:[/b] Du kannst auf andere Server in der Red-Matrix zugreifen, indem Du einfach auf einen Link dorthin klickst. Die Authentifizierung wird ganz einfach automatisch hinter den Kulissen durchgeführt. Vergiss viele verschiedene Usernamen für verschiedene Seiten und die Passwörter dazu – das tut alles die Matrix für Dich.
+[b]Ein-Klick-Identifikation:[/b] Du kannst auf andere Server im $Projectname-Netzwerk zugreifen, indem Du einfach auf einen Link dorthin klickst. Die Authentifizierung wird ganz einfach automatisch hinter den Kulissen durchgeführt. Vergiss viele verschiedene Usernamen für verschiedene Seiten und die Passwörter dazu – das tut alles $Projectname für Dich.
 
-[b]Klone:[/b] Du kannst Deine Online-Identität (oder, wie wir sagen, einen Kanal) klonen. Sie ist nicht mehr länger an einen bestimmten Server, eine Domain oder eine IP-Adresse gebunden. Importiere sie einfach auf einem anderen Red-Server (oder Red-Hub) – direkt online oder mit Hilfe eines vorher generierten Exports. Wenn Dein primärer Hub plötzlich nicht mehr online ist, kein Problem, Deine Kontakte, Posts* und Nachrichten* sind automagisch weiterhin unter Deiner geklonten Identität verfügbar und zugreifbar. [i](*: nur Posts und Nachrichten, die nach dem Moment des Klonens erstellt wurden)[/i]
+[b]Klone:[/b] Du kannst Deine Online-Identität (oder, wie wir sagen, einen Kanal) klonen. Sie ist nicht mehr länger an einen bestimmten Server, eine Domain oder eine IP-Adresse gebunden. Importiere sie einfach auf einem anderen $Projectname-Server (oder $Projectname-Hub, wie es bei uns heißt) – direkt online oder mit Hilfe eines vorher generierten Exports. Wenn Dein primärer Hub plötzlich nicht mehr online ist, kein Problem, Deine Kontakte, Posts* und Nachrichten* sind automagisch weiterhin unter Deiner geklonten Identität verfügbar und zugreifbar. [i](*: nur Posts und Nachrichten, die nach dem Moment des Klonens erstellt wurden)[/i]
 
-[b]Privatsphäre:[/b] Red-Identitäten (Zot-IDs) können gelöscht, gesichert/heruntergeladen und geklont werden. Du hast volle Kontrolle über Deine Daten. Wenn Du Dich entscheidest, all Deine Daten und Deine Zot-ID zu löschen, musst Du nur auf einen Link klicken, und sie werden sofort von dem Server gelöscht. Keine Fragen, keine Umstände.
+[b]Privatsphäre:[/b] $Projectname-Identitäten (Zot-IDs) können gelöscht, gesichert/heruntergeladen und geklont werden. Du hast volle Kontrolle über Deine Daten. Wenn Du Dich entscheidest, all Deine Daten und Deine Zot-ID zu löschen, musst Du nur auf einen Link klicken, und sie werden sofort von dem Server gelöscht. Keine Fragen, keine Umstände.
 
 #include doc/macros/main_footer.bb;
diff --git a/doc/de/admins.bb b/doc/de/admins.bb
new file mode 100644
index 000000000..d278c04ac
--- /dev/null
+++ b/doc/de/admins.bb
@@ -0,0 +1,10 @@
+[h2]Dokumentation für Hub-Administratoren[/h2]
+
+[zrl=[baseurl]/help/install]Installation[/zrl]
+[zrl=[baseurl]/help/red2pi]$Projectname auf einem Raspberry Pi installieren[/zrl]
+[zrl=[baseurl]/help/troubleshooting]Troubleshooting-Tipps[/zrl]
+[zrl=[baseurl]/help/hidden_configs]Versteckte Konfigurations-Optionen[/zrl]
+[zrl=[baseurl]/help/faq_admins]FAQ für Admins[/zrl]
+[zrl=[baseurl]/help/service_classes]Serviceklassen[/zrl]
+[zrl=[baseurl]/help/directories]Arbeit mit Verzeichnissen und ihre Konfiguration[/zrl]
+[zrl=[baseurl]/help/theme_management]Theme-Management[/zrl]
diff --git a/doc/de/channels.bb b/doc/de/channels.bb
index 1c963fc08..0030208c2 100644
--- a/doc/de/channels.bb
+++ b/doc/de/channels.bb
@@ -5,7 +5,7 @@ Kanäle sind Sammlungen von Inhalten, die an einem Ort gespeichert werden. Ein K
 Die wichtigsten Funktionen für einen Kanal, der einen selbst repräsentiert, sind:
 
 [ul][*]Sichere und private, spamfreie Kommunikation
-[*]Identifikation und automatisches Einloggen im gesamten Red-Matrix-Netzwerk
+[*]Identifikation und automatisches Einloggen im gesamten $Projectname-Netzwerk
 [*]Datenschutzeinstellungen und Zugriffsberechtigungen, die im gesamten Netzwerk gültig sind
 [*]Verzeichnisdienste (ähnlich einem Telefonbuch)[/ul]
 
@@ -13,13 +13,13 @@ Kurz gesagt, ein Kanal der Dich repräsentiert ist sozusagen „Ich im Internetâ
 
 Du musst Deinen ersten Kanal erstellen, während Du Dich anmeldest. Du kannst auch weitere Kanäle erstellen und zwischen ihnen wechseln, indem Du auf „Kanal-Manager“ im Menü unter Deinem Profilbild klickst.
 
-Du wirst nach einem Kanalnamen und einem kurzen Spitznamen gefragt. Für einen Kanal, der Dich repräsentiert, ist es eine gute Idee, hier Deinen Realnamen anzugeben, damit Deine Freunde Dich finden und sich mit Dir verbinden können. Der Spitzname wird genutzt, um Deinen „Webbie“ zu erstellen. Das ist so etwas wie ein Username und sieht aus wie eine E-Mail-Adresse, zum Beispiel spitzname@red-hub.de. Überlege ein bisschen, was Du als Spitzname nutzen willst. Stell Dir vor, Du wirst nach Deinem Webbie gefragt und musst Deinem Bekannten dann buchstabieren, dass Dein Webbie „llamas.sind-cool_274@example.com“ ist. „llamassindcool@exmaple.com“ wäre da viel einfacher gewesen.
+Du wirst nach einem Kanalnamen und einem kurzen Spitznamen gefragt. Für einen Kanal, der Dich repräsentiert, ist es eine gute Idee, hier Deinen Realnamen anzugeben, damit Deine Freunde Dich finden und sich mit Dir verbinden können. Der Spitzname wird genutzt, um Deinen „Webbie“ zu erstellen. Das ist so etwas wie ein Username und sieht aus wie eine E-Mail-Adresse, zum Beispiel spitzname@hubzilla-hub.de. Überlege ein bisschen, was Du als Spitzname nutzen willst. Stell Dir vor, Du wirst nach Deinem Webbie gefragt und musst Deinem Bekannten dann buchstabieren, dass Dein Webbie „llamas.sind-cool_274@example.com“ ist. „llamassindcool@example.com“ wäre da viel einfacher gewesen.
 
 Nachdem Du Deinen Kanal erstellt hast, wirst Du zu den Einstellungen weitergeleitet. Hier kannst Du Deinen Kanal einrichten und die Standard-Berechtigungen setzen.
 
-Nachdem Du auch das getan hast, kannst Du Deinen Kanal verwenden. Unter der Addresse https://example.com/channel/spitzname [observer=1]( [observer.url] )[/observer] findest Du Deinen Kanal. Hier werden Deine letzten Aktivitäten gezeigt, die neuesten oben. Wenn Du etwas in die Textbox schreibst, in der „Teilen“ steht, wird der neue Eintrag ganz oben in Deinem Kanal auftauchen. Du findest hier auch Links zu den anderen Kommunikationsbereichen Deines Kanals. Der „Über“-Reiter enthält Dein Profil, der „Fotos“-Reiter Deine Fotoalben, und der Veranstaltungskalender enthält Termine und Veranstaltungen, die Du und Deine Kontakte geteilt haben.
+Nachdem Du auch das getan hast, kannst Du Deinen Kanal verwenden. Unter der Addresse https://example.com/channel/spitzname [observer=1]( [observer.url] )[/observer] findest Du Deinen Kanal. Hier werden Deine letzten Aktivitäten gezeigt, die neuesten oben. Wenn Du etwas in die Textbox schreibst, in der „Teilen“ steht, wird der neue Eintrag ganz oben in Deinem Kanal auftauchen. Du findest hier auch Links zu den anderen Kommunikationsbereichen Deines Kanals. Der „Über“-Reiter enthält Dein Profil, der „Fotos“-Reiter Deine Fotoalben, und der Kalender enthält Termine und Veranstaltungen, die Du und Deine Kontakte geteilt haben.
 
-Die „Matrix“-Seite enthält alle neuen Beiträge aus der gesamten $Projectname, wieder die neuesten oben. Was genau zu sehen ist ist abhängig von den Zugriffsrechten. Falls die Zugriffsrechte Deines Kanals so eingestellt sind, dass jeder Beiträge in Deinen Stream stellen kann, wirst du auch Beiträge von Dir völlig unbekannten Personen hier sehen. Am anderen Ende der Skala kannst Du die Berechtigungen aber auch so einstellen, dass du nur die Beiträge deiner Freunde oder gar nur Deine eigenen siehst.
+Die „Grid“-Seite enthält alle neuen Beiträge aus dem gesamten $Projectname-Netzwerk, wieder die neuesten oben. Was genau zu sehen ist ist abhängig von den Zugriffsrechten. Falls die Zugriffsrechte Deines Kanals so eingestellt sind, dass jeder Beiträge in Deinen Stream stellen kann, wirst du auch Beiträge von Dir völlig unbekannten Personen hier sehen. Am anderen Ende der Skala kannst Du die Berechtigungen aber auch so einstellen, dass du nur die Beiträge deiner Freunde oder gar nur Deine eigenen siehst.
 
 Wie zu Anfang erwähnt sind viele Arten von Kanälen möglich, diese unterscheiden sich hauptsächlich durch die Berechtigungen. Das Anlegen dieser Kanäle unterscheidet sich dagegen nicht. Beispiel: Um einen Kanal zum Austausch von Dokumenten zu erstellen, wirst du vermutlich die Berechtigung „Kann in meinen öffentlichen Dateiordner schreiben“ freizügiger einstellen. Für weitere Informationen sieh bitte in der Hilfe unter Zugriffsrechte nach.
 
diff --git a/doc/de/develop.bb b/doc/de/develop.bb
new file mode 100644
index 000000000..473b18b68
--- /dev/null
+++ b/doc/de/develop.bb
@@ -0,0 +1,33 @@
+[h2]Dokumentation für Entwickler[/h2]
+
+[h3]Technische Dokumentation[/h3]
+[zrl=[baseurl]/help/Zot---A-High-Level-Overview]Zot – ein grober Überblick[/zrl]
+[zrl=[baseurl]/help/zot]Eine Einführung ins Zot-Protokoll[/zrl]
+[zrl=[baseurl]/help/zot_structures]Zot-Strukturen[/zrl]
+[zrl=[baseurl]/help/comanche]Seitenbeschreibung in Comanche[/zrl]
+[zrl=[baseurl]/help/Creating-Templates]Vorlagen erstellen mit Comanche[/zrl]
+[zrl=[baseurl]/help/Widgets]Widgets[/zrl]
+[zrl=[baseurl]/help/plugins]Plugins[/zrl]
+[zrl=[baseurl]/help/doco]Selbst Dokumentation beisteuern[/zrl]
+[zrl=[baseurl]/help/DerivedTheme1]Einen Theme basierend auf einem anderen erstellen[/zrl]
+[zrl=[baseurl]/help/schema_development]Schemata[/zrl]
+[zrl=[baseurl]/help/Translations]Ãœbersetzungen[/zrl]
+[zrl=[baseurl]/help/developers]Entwickler[/zrl]
+[zrl=[baseurl]/help/intro_for_developers]Einführung für Entwickler[/zrl]
+[zrl=[baseurl]/help/database]Datenbank-Schema[/zrl]
+[zrl=[baseurl]/help/api_functions]API-Funktionen[/zrl]
+[zrl=[baseurl]/help/api_posting]Mit der API einen Beitrag erstellen[/zrl]
+[zrl=[baseurl]/help/developer_function_primer]Ãœbersicht der wichtigsten $Projectname-Funktionen[/zrl]
+[zrl=[baseurl]/doc/html/]Code-Referenz (mit doxygen generiert - setzt Cookies)[/zrl]
+[zrl=[baseurl]/help/to_do_doco]To-Do-Liste für das Projekt $Projectname-Dokumentation[/zrl]
+[zrl=[baseurl]/help/to_do_code]To-Do-Liste für Entwickler[/zrl]
+[zrl=[baseurl]/help/roadmap]Roadmap[/zrl]
+[zrl=[baseurl]/help/git_for_non_developers]Git für Nicht-Entwickler[/zrl]
+[zrl=[baseurl]/help/dev_beginner]Schritt-für-Schritt-Einführung für neue Entwickler[/zrl]
+
+[h3]Häufig gestellte Fragen für Entwickler[/h3]
+[zrl=[baseurl]/help/faq_developers]FAQ für Entwickler[/zrl]
+
+[h3]Externe Ressourcen[/h3]
+[url=https://zothub.com/channel/one]Entwickler-Kanal[/url]
+[url=https://federated.social/channel/postgres]Postgres-spezifischer Admin-Support-Kanal[/url]
diff --git a/doc/de/features.bb b/doc/de/features.bb
index 6bee360eb..febdc65ee 100644
--- a/doc/de/features.bb
+++ b/doc/de/features.bb
@@ -1,26 +1,41 @@
-[size=large][b]Features der $Projectname[/b][/size]
+[h1][b]$Projectname-Features[/b][/h1]
 
-Die $Projectname ist ein Allzweck-Kommunikationsnetzwerk mit einigen einzigartigen Features. Sie wurde für eine große Bandbreite von Nutzern entwickelt, von Nutzern sozialer Netzwerke über technisch nicht interessierte Blogger bis hin zu PHP-Experten und erfahrenen Systemadministratoren.
+[h1]$Projectname kurz zusammengefasst[/h1]
 
-Diese Seite listet einige der Kern-Features von Red auf, die in der offiziellen Distribution enthalten sind. Wie immer bei freier Open-Source-Software sind den Möglichkeiten keine Grenzen gesetzt. Beliebige Erweiterungen, Addons, Themes und Konfigurationen sind möglich.
+tl;dr
+
+$Projectname stellt verteiltes Web-Publishing und soziale Kommunikation mit [b]dezentraler Rechteverwaltung[/b] zur Verfügung.
+
+Aber was genau ist eine dezentrale Rechteverwaltung? Sie gibt mir die Möglichkeit, etwas auf meiner Website (Fotos, Medien, Dateien, Webseiten etc.) mit bestimmten Personen auf anderen Websites zu teilen – aber nicht unbedingt mit [i]allen[/i] auf diesen Websites. Und: Sie brauchen kein Konto auf meiner Website und müssen sich auf meiner Website nicht extra einloggen, um sich die Dinge anzusehen, die ich mit ihnen geteilt habe. Sie haben ein Konto auf ihrer Heimat-Website, und „Magic Authentication“ zwischen den Websites besorgt den Rest. Da das Netzwerk dezentral aufgebaut ist, gibt es auch keinen einzelnen Betreiber des Netzwerks, der an der Rechteverwaltung vorbei alles sehen kann.
+
+$Projectname kombiniert viele Features von tradionellen Blogs, sozialen Netzwerken und Medien, Content-Management-Systemen und persönlichem Cloud-Speicher auf einer einfach zu nutzenden Plattform. Jeder Hub (Web-Server) im Grid kann isoliert operieren oder sich mit anderen Hubs zu einem Super-Netzwerk vereinen. Die Kontrolle über die Privatsphäre hat immer derjenige, der die Inhalte veröffentlicht.
+
+$Projectname ist eine Open-Source Webserver-Applikation, geschrieben ursprünglich für PHP/MySQL. Mit minimaler Erfahrung als Admin ist sie leicht zu installieren. Sie kann auch durch Plugins und Themes und weitere Angebote von Drittanbietern erweitert werden.
+
+[h1][b]$Projectname-Features[/b][/h1]
+
+$Projectname ist ein Allzweck-Web-Publishing- und Kommunikationsnetzwerk mit einigen einzigartigen Features. Es wurde für eine große Bandbreite von Nutzern entwickelt, von Nutzern sozialer Netzwerke über technisch nicht interessierte Blogger bis hin zu PHP-Experten und erfahrenen Systemadministratoren.
+
+Diese Seite listet einige der Kern-Features von $Projectname auf, die in der offiziellen Distribution enthalten sind. Wie immer bei freier Open-Source-Software sind den Möglichkeiten keine Grenzen gesetzt. Beliebige Erweiterungen, Addons, Themes und Konfigurationen sind möglich.
 
 [h2]Entwickelt für Privatsphäre und Freiheit[/h2]
 
-Eines der Design-Ziele von Red ist einfache Kommunikations über das Web, ohne die Privatsphäre zu vernachlässigen, wenn die Nutzer das Wünschen. Um dieses Ziel zu erreichen, verfügt Red über einige Features, die beliebige Stufen des Privatsphäre-Schutzes ermöglichen:
+Eines der Design-Ziele von $Projectname ist einfache Kommunikations über das Web, ohne die Privatsphäre zu vernachlässigen, wenn die Nutzer das wünschen. Um dieses Ziel zu erreichen, verfügt $Projectname über einige Features, die beliebige Stufen des Privatsphäre-Schutzes ermöglichen:
 
 [b]Beziehungs-Tool[/b]
 
 Wenn Du in der $Projectname einen Kontakt hinzufügst (und das Beziehungs-Tool aktiviert hast), hast Du die Möglichkeit, einen „Grad der Freundschaft“ zu bestimmen. Bespiel: Wenn Du ein Blog eines Bekannten hinzufügst, könntest Du ihm den Freundschaftsgrad „Bekannte“ (Acquaintances) geben.
 
-
-[img]https://friendicared.net/photo/b07b0262e3146325508b81a9d1ae4a1e-0.png[/img]
-
 Wenn Du aber den privaten Kanal eines Freundes hinzufügst, wäre der Freundschaftsgrad „Freunde“ vermutlich passender.
 
-Wenn Du allen Kontakten solche Freundschaftsgrade zugeordnet hast, kannst Du mit dem Beziehungs-Tool, das (sofern aktiviert) oben auf Deiner Matrix-Seite erscheint, bestimmen, welche Inhalte Du sehen willst. Indem Du die Schieberegler so einstellst, dass der linke auf „Ich“ und der rechte auf „Freunde“ steht, kannst Du dafür sorgen, dass nur Inhalte von Kontakten angezeigt werden, deren Freundschaftsgrad sich irgendwo im Bereich zwischen „Ich“, „Beste Freunde“ und „Freunde“ bewegt. Alle anderen Kontakte, zum Beispiel solche mit einem Freundschaftsgrad in der Nähe von „Bekannte“, werden nicht angezeigt.
+Wenn Du allen Kontakten solche Freundschaftsgrade zugeordnet hast, kannst Du mit dem Beziehungs-Tool, das (sofern aktiviert) oben auf Deiner Matrix-Seite erscheint, bestimmen, welche Inhalte Du sehen willst. Indem Du die Schieberegler einstellst, legst Du fest, was angezeigt wird – nur Kanäle mit einem Freundschaftsgrad innerhalb des eingestellten Bereichs werden angezeigt
 
 Das Beziehungs-Tool erlaubt blitzschnelles Filtern von großen Mengen Inhalt, gruppiert nach Freundschaftsgrad.
 
+[b]Filter für Verbindungen[/b]
+
+Du kannst ganz genau kontrollieren, was in Deinem Stream erscheint, wenn Du den optionalen „Filter für Verbindungen“ aktivierst. Dann kannst Du beim Bearbeiten einer Verbindung Kriterien festlegen, nach denen entschieden wird, ob einzelne Beiträge dieser Verbindung importiert werden sollen oder nicht (Einschluss oder Ausschluss möglich). Wurde ein Beitrag einmal importiert, wirst Du auch alle Kommentare dazu sehen, egal ob eines der Kriterien auf sie zutrifft oder nicht. Du könntest einzelne Wörter festlegen, die, wenn sie in einem Beitrag vorkommen, dafür sorgen, dass er geblockt oder eben nicht geblockt wird. Auch reguläre Ausdrüce können benutzt werden, genauso wie Hashtags oder sogar die Sprache, in der der Beitrag verfasst wurde.
+
 [b]Zugriffsrechte[/b]
 
 Wenn Du Inhalte mit anderen teilst, hast Du die Option, den Zugriff darauf einzuschränken. Wenn Du auf das Schloss unterhalb des Beitrags-Editors klickst, kannst Du auswählen, wer diesen Beitrag sehen darf, indem Du einfach auf die Namen klickst.
@@ -31,9 +46,9 @@ Solche Zugriffsrechte gibt es bei Beiträgen, Fotos, Terminen, Webseiten, Chat-R
 
 [b]Ein Passwort für alle $Projectname-Server (Single Sign-on)[/b]
 
-Zugriffsrechte funktionieren in der gesamten $Projectname mit allen Kanälen. Die meisten Links, die innerhalb der $Projectname verlinken, enthalten deine Identität (zid), so dass der Zielserver Dich direkt anmelden kann. Du kannst Dich aber auch so auf jedem $Projectname-Server mit Deinem $Projectname-Identität anmelden und erhältst dann Zugriff auf die Inhalte, die für Dich freigegeben sind.
+Zugriffsrechte funktionieren im gesamten Grid mit allen Kanälen. Die meisten Links, die innerhalb von $Projectname verlinken, enthalten Deine Identität (zid), so dass der Zielserver Dich direkt anmelden kann. Du kannst Dich aber auch so auf jedem $Projectname-Server mit Deiner $Projectname-Identität anmelden und erhältst dann Zugriff auf die Inhalte, die für Dich freigegeben sind.
 
-Du loggst Dich nur einmal auf Deinem Heimatserver ein. Ab dann funktioniert die Authentifizierung gegenüber anderen $Projectname-Servern „magisch“ von selbst.
+Du loggst Dich nur einmal auf Deinem Heimat-Hub ein. Ab dann funktioniert die Authentifizierung gegenüber anderen $Projectname-Hubs „magisch“ von selbst.
 
 [b]Dateiablage (Cloud) mit WebDAV-Zugriff[/b]
 
@@ -45,7 +60,7 @@ Stelle Deine Fotos online in Alben zur Verfügung. Auch hier kann der Zugriff ü
 
 [b]Terminkalender[/b]
 
-Im eingebauten Terminkalender kannst Du Termine erstellen und verwalten. Auch hier greifen die Zugriffsrechte für andere. Termine können im vcalendar/iCal-Format exportiert und mit anderen geteilt werden. Wenn Deine Kontakte ihren Geburtstag in ihr Profil eingetragen haben, werden diese Geburtstage automatisch zu Deinem Kalender hinzugefügt – mit entsprechender Anpassung der Zeitzone, so dass Du nie zu früh oder zu spät gratulierst.
+Im eingebauten Terminkalender kannst Du Termine erstellen und verwalten. Auch hier greifen die Zugriffsrechte für andere. Termine können im vcalendar/iCal-Format importiert/exportiert und in Beiträgen mit anderen geteilt werden. Wenn Deine Kontakte ihren Geburtstag in ihr Profil eingetragen haben, werden diese Geburtstage automatisch zu Deinem Kalender hinzugefügt – mit entsprechender Anpassung der Zeitzone, so dass Du nie zu früh oder zu spät gratulierst. Termine werden normalerweise mit Teilnehmerzählern erstellt, so dass Deine Freunde und Verbindungen sofort zu- oder absagen können.
 
 [b]Chat-Räume[/b]
 
@@ -53,7 +68,7 @@ Du kannst Chaträume erstellen und über die Zugriffsrechte nur bestimmten Nutze
 
 [b]Erstellen von Webseiten[/b]
 
-In der $Projectname gibt es Werkzeuge für „Content Management“, mit denen Du einfache Webseiten erstellen kannst, aber auch komplexe Layouts, Menüs, Blöcke und Widgets. Auch hier greifen die Zugriffsrechte, so dass die entstandenen Seiten nur von denen betrachtet werden können, denen Du das Recht dazu eingeräumt hast.
+In $Projectname gibt es Werkzeuge für „Content Management“, mit denen Du einfache Webseiten erstellen kannst, aber auch komplexe Layouts, Menüs, Blöcke und Widgets. Auch hier greifen die Zugriffsrechte, so dass die entstandenen Seiten nur von denen betrachtet werden können, denen Du das Recht dazu eingeräumt hast.
 
 [b]Apps[/b]
 
@@ -61,7 +76,7 @@ $Projectname-Mitglieder könnnen Apps erstellen und verteilen. Anders als bei an
 
 [b]Layout[/b]
 
-Das Seiten-Layout basiert auf eine Beschreibungssprache namens Comanche. Die $Projectname ist selbst in Comanche-Layouts verfasst, die man verändern kann. Dadurch ist eine sehr starke Anpassung an die eigenen Bedürfnisse möglich, wie man sie so in Multi-User-Umgebungen normalerweise nicht findet.
+Das Seiten-Layout basiert auf eine Beschreibungssprache namens Comanche. $Projectname ist selbst in Comanche-Layouts verfasst, die man verändern kann. Dadurch ist eine sehr starke Anpassung an die eigenen Bedürfnisse möglich, wie man sie so in Multi-User-Umgebungen normalerweise nicht findet.
 
 [b]Lesezeichen[/b]
 
@@ -69,37 +84,37 @@ Du kannst Lesezeichen teilen, speichern und verwalten, direkt aus den Unterhaltu
 
 [b]Verschlüsselung privater Nachrichten[/b]
 
-Nachrichten mit eingeschränktem Empfängerkreis werden mit einem symmetrischen 256-bit-AES-CBC-Schlüssel verschlüsselt, der seinerseits mit Public-Key-Kryptografie auf Basis von 4096-bittigen RSA-Schlüsseln geschützt (nochmal verschlüsselt) wird, die mit dem sendenden Kanal verbunden sind. Diese Nachrichten werden auch auf anderen Red-Servern verschlüsselt gespeichert.
+Private Nachrichten werden verschlüsselt gespeichert. Das bietet keine absolute Sicherheit, erschwert aber einfaches Herumschnüffeln durch den Administrator oder Internet Provider.
 
-Jeder Red-Kanal hat seinen eigenes 4096-bit-RSA-Schlüsselpaar, das erzeugt wird, wenn der Kanal erstellt wird.
+Jeder $Projectname-Kanal hat seinen eigenes 4096-bit-RSA-Schlüsselpaar, das erzeugt wird, wenn der Kanal erstellt wird. Damit werden private Nachrichten und Beiträge mit eingeschränktem Empfängerkreis während der Übermittlung zu anderen Hubs geschützt.
 
-Zusätzlich können Nachrichten mit Ende-zu-Ende-Verschlüsselung versehen werden, so dass weder $Projectname-Server-Administratoren noch ISPs irgendetwas mitlesen können, solange sie nicht über das Passwort verfügen.
+Zusätzlich können Nachrichten mit Ende-zu-Ende-Verschlüsselung versehen werden, so dass weder $Projectname-Hub-Administratoren noch ISPs irgendetwas mitlesen können, solange sie nicht über das Passwort verfügen.
 
 Komplett öffentliche Nachrichten werden weder in der Datenbank noch bei der Übertragung verschlüsselt (abgesehen ggfs. von SSL).
 
-Private Nachrichten können gelöscht (zurückgezogen) werden, aber es kann natürlich nicht garantiert werden, dass der Empfänger sie nicht schon gelesen hat.
+Private Nachrichten und Beiträge können gelöscht (zurückgezogen) werden, aber es kann natürlich nicht garantiert werden, dass der Empfänger sie nicht schon gelesen hat.
 
-Alle Nachrichten können mit einem „Verfallsdatum“ versehen werden. Zu diesem Zeitpunkt werden sie dann von den Servern der Empfänger gelöscht.
+Alle Beiträge können mit einem „Verfallsdatum“ versehen werden. Zu diesem Zeitpunkt werden sie dann von den Servern der Empfänger gelöscht.
 
 [b]Verbindung zu anderen Diensten[/b]
 
-Neben Plugins, die das „crossposten“ zu diversen anderen Netzwerk erlauben, wird der Import von RSS/Atom-Feeds nativ unterstützt, auch, um mit diesen Inhalten spezielle Kanäle zu erstellen. Außerdem kann über das Diaspora-Protokoll mit Kontakten in den Netzwerken Friendica und Diaspora kommuniziert werden. Diese Unterstützung ist als experimentell eingestuft, da diese Netzwerke nicht die gleichen Möglichkeiten wie die $Projectname in Sachen Privatsphäre und Verschlüsselung bieten, so dass Kommunikation mit ihnen zu Privatsphäreproblemen führen könnte.
+Neben Plugins, die das „crossposten“ zu diversen anderen Netzwerk erlauben, wird der Import von RSS/Atom-Feeds nativ unterstützt, auch, um mit diesen Inhalten spezielle Kanäle zu erstellen. Außerdem kann über das Diaspora-Protokoll mit Kontakten in den Netzwerken Friendica und Diaspora kommuniziert werden. Diese Unterstützung ist als experimentell eingestuft, da diese Netzwerke nicht die gleichen Möglichkeiten wie $Projectname in Sachen Privatsphäre und Verschlüsselung bieten, so dass Kommunikation mit ihnen zu Privatsphäreproblemen führen könnte.
 
-Weiterhin wird OpenID auf experimenteller Ebene unterstützt und kann bei den Zugriffsrechten genutzt werden, um Inhalte für per OpenID authentifizierte Nutzer freizugeben. An dieser Funktion wird noch gearbeitet.
+Weiterhin wird OpenID auf experimenteller Ebene unterstützt und kann bei den Zugriffsrechten genutzt werden, um Inhalte für per OpenID authentifizierte Nutzer freizugeben. An dieser Funktion wird noch gearbeitet. Jeder $Projectname-Hub kann außerdem als OpenID-Provider dienen.
 
 Die Inhalte von Kanälen können als Quellen für andere Kanäle dienen (wenn der Kanalinhaber das erlaubt), so dass Themen-Kanäle mit den Inhalten von zwei oder mehr Kanälen erstellt werden können.
 
 [b]Sammlungen[/b]
 
-„Sammlungen“ sind unsere Implementation von Privatsphäregruppen, ähnlich den „Kreisen“ bei Google+ und den „Aspekten“ bei Diaspora. Sammlungen können zur Filterung der angezeigten Nachrichten genutzt werden (nur Threads anzeigen, die von einem Mitglied dieser Sammlung gestartet wurden), aber auch zum Setzen von Zugriffsrechten.
+„Sammlungen“ sind unsere Implementierung von Privatsphäregruppen, ähnlich den „Kreisen“ bei Google+ und den „Aspekten“ bei Diaspora. Sammlungen können zur Filterung der angezeigten Nachrichten genutzt werden (nur Threads anzeigen, die von einem Mitglied dieser Sammlung gestartet wurden), aber auch zum Setzen von Zugriffsrechten (bevor der Beitrag abgeschickt wird).
 
 [b]Verzeichnisdienste[/b]
 
-Wir stellen einfachen Zugriff auf ein Mitgliederverzeichnis zur Verfügung, samt einer dezentralen Möglichkeit, sich neue Kontakte basierend auf den eigenen vorschlagen zu lassen. Die Verzeichnis-Server sind normale $Projectname-Server, bei denen der Administrator sich entschieden hat, sie auch als Verzeichnis agieren zu lassen. Das benötigt mehr Ressourcen als eine normale $Projectname-Installation, deshalb ist das nicht voreingestellt. Die Verzeichnis-Server synchronisieren sich miteinander, so dass (abgesehen von einer gewissen Verzögerung bis zur nächsten Synchronisation) all Verzeichnis-Server aktuelle Informationen über das gesamte Netzwerk bereitstellen können.
+Wir stellen einfachen Zugriff auf ein Mitgliederverzeichnis zur Verfügung, samt einer dezentralen Möglichkeit, sich neue Kontakte basierend auf den eigenen vorschlagen zu lassen. Die Verzeichnis-Server sind normale $Projectname-Server, bei denen der Administrator sich entschieden hat, sie auch als Verzeichnis agieren zu lassen. Das benötigt mehr Ressourcen als eine normale $Projectname-Installation, deshalb ist das nicht voreingestellt. Die Verzeichnis-Server synchronisieren sich miteinander, so dass (abgesehen von einer gewissen Verzögerung bis zur nächsten Synchronisation) alle Verzeichnis-Server aktuelle Informationen über das gesamte Netzwerk bereitstellen können.
 
 [b]TLS/SSL[/b]
 
-Red-Server, die TLS/SSL benutzen, verschlüsseln ihre Kommunikation vom Server zum Nutzer mit SSL. Nach den aktuellen Enthüllungen über das Umgehen von Verschlüsselung durch NSA, GHCQ und andere Dienste, sollte man jedoch nicht mehr davon ausgehen, dass diese Verbindungen nicht mitgelesen werden können.
+$Projectname-Server, die TLS/SSL benutzen, verschlüsseln ihre Kommunikation vom Server zum Nutzer mit SSL. Nach den aktuellen Enthüllungen über das Umgehen von Verschlüsselung durch NSA, GHCQ und andere Dienste, sollte man jedoch nicht mehr davon ausgehen, dass diese Verbindungen nicht mitgelesen werden können. Private Kommunikation (nicht komplett öffentliche Beiträge) wird darüberhinaus zusätzlich verschlüsselt, bevor sie von einem Server zum anderen geschickt wird.
 
 [b]Kanal-Einstellungen[/b]
 
@@ -107,15 +122,13 @@ Wenn ein Kanal erstellt wird, muss eine bestimmte Zugriffsrechte-Kategorie (z.B.
 
 Wenn Du die Experten-Kategorie wählst, kannst Du detaillierte Zugriffseinstellungen für verschiedenste Aspekte der Kommunikation festlegen. Unter den „Sicherheits- und Privatsphäre-Einstellungen“ kann für jeden Punkt auf der linken Seite eine von 7-8 möglichen Optionen aus dem Menü gewählt werden. Daneben gibt es diverse weitere Einstellmöglichkeiten zum Thema Privatsphäre.
 
-[img]https://friendicared.net/photo/0f5be8da282858edd645b0a1a6626491.png[/img]
-
 Die Optionen für die einzelnen Punkte (z.B., wer Deine normalen Beiträge sehen kann) sind:
 [ul][*]Niemand außer Du selbst
 [*]Nur die, denen Du es explizit erlaubst
 [*]Angenommene Verbindungen
 [*]Beliebige Verbindungen
 [*]Jeder auf diesem Website
-[*]Alle Red-Nutzer
+[*]Alle $Projectname-Nutzer
 [*]Jeder authentifizierte
 [*]Jeder im Internet[/ul]
 
@@ -125,19 +138,19 @@ Foren sind Kanäle, in denen mehrere Nutzer als Autoren fungieren können; eine
 
 [b]Klone[/b]
 
-Konten in der $Projectname werden auch als [i]nomadische Identitäten[/i] bezeichnet (eine ausführliche Erklärung dazu gibt es unter [url=[baseurl]/help/what_is_zot]What is Zot?[/url]). Nomadisch, weil bei anderen Diensten die Identität eines Nutzers an den Server oder die Plattform gebunden ist, auf der er ursprünglich erstellt wurde. Ein Facebook- oder Gmail-Konto ist and diese Dienste gekettet. Er funktioniert nicht ohne Facebook.com bzw. Gmail.com.
+Konten in der $Projectname werden auch als [i]nomadische Identitäten[/i] bezeichnet. Nomadisch, weil bei anderen Diensten die Identität eines Nutzers an den Server oder die Plattform gebunden ist, auf der er ursprünglich erstellt wurde. Ein Facebook- oder Gmail-Konto ist and diese Dienste gekettet. Er funktioniert nicht ohne Facebook.com bzw. Gmail.com.
 
-Bei Red ist das anders. Sagen wir, Du hast eine Red-Indentität namens tina@redhub.com. Die kannst Du auf einen anderen Server klonen, mit dem gleichen oder einem anderen Namen, zum Beispiel lebtEwig@matrixserver.info.
+Bei $Projectname ist das anders. Sagen wir, Du hast eine $Projectname-Indentität namens tina@$Projectnamehub.com. Die kannst Du auf einen anderen Server klonen, mit dem gleichen oder einem anderen Namen, zum Beispiel lebtEwig@Anderer$ProjectnameHub.info.
 
 Beide Kanäle sind jetzt miteinander synchronisiert, das heißt, dass alle Kontakte und Einstellungen auf dem Klon immer die gleichen sind wie auf dem ursprünglichen Kanal. Es ist egal, ob Du eine Nachricht von dort aus oder vom Klon aus schickst. Alle Nachrichten sind in beiden Klonen vorhanden.
 
 Das ist ein ziemlich revolutionäres Feature, wenn man sich einige Szenarien dazu ansieht:
 
-[ul][*]Was passiert, wenn ein Server, auf dem sich Deine Identität befindet, plötzlich offline ist? Ohne Klone ist der Nutzer nicht in der Lage zu kommunzieren, bis der Server wieder online ist. Mit Klonen loggst Du Dich einfach bei Deinem geklonten Kanal ein und lebst glücklich bis an Dein Ende.
-[*]Der Administrator Deines Red-Servers kann es sich nicht länger leisten, seinen für alle kostenlosen Server zu bezahlen. Er gibt bekannt, dass der Server in zwei Wochen vom Netz gehen wird. Zeit genug, um Deine Red-Kanäle auf andere Server zu klonen und somit Verbindungen und Freunde zu behalten.
-[*]Was, wenn Dein Kanal staatlicher Zensur unterliegt? Dein Server-Admin wird gezwungen, Dein Konto und alle damit verbundenen Kanäle und Daten zu löschen. Durch Klone bietet die $Projectname Zensur-Resistenz. Wenn Du willst, kannst Du hunderte von Klonen haben, alle mit unterschiedlichen Namen und auf unterschiedlichen Servern überall im Internet.[/ul]
+[ul][*]Was passiert, wenn ein Server, auf dem sich Deine Identität befindet, plötzlich offline ist (sicher haben viele von Euch den Twitter-„Fail Whale“ gesehen und verflucht)? Ohne Klone ist der Nutzer nicht in der Lage zu kommunizieren, bis der Server wieder online ist. Mit Klonen loggst Du Dich einfach bei Deinem geklonten Kanal ein und lebst glücklich bis an Dein Ende.
+[*]Der Administrator Deines $Projectname-Hubs kann es sich nicht länger leisten, seinen für alle kostenlosen Server zu bezahlen. Er gibt bekannt, dass der Server in zwei Wochen vom Netz gehen wird. Zeit genug, um Deine $Projectname-Kanäle auf andere Server zu klonen und somit Verbindungen und Freunde zu behalten.
+[*]Was, wenn Dein Kanal staatlicher Zensur unterliegt? Dein Server-Admin könnte gezwungen werden, Dein Konto und alle damit verbundenen Kanäle und Daten zu löschen. Durch Klone bietet $Projectname Zensur-Resistenz. Wenn Du willst, kannst Du hunderte von Klonen haben, alle mit unterschiedlichen Namen und auf unterschiedlichen Hubs überall im Internet.[/ul]
 
-Red bietet interessante, neue Möglichkeiten in Bezug auf die Privatsphäre. Mehr dazu unter „Tipps und Tricks zur privaten Kommunikation“.
+$Projectname bietet interessante, neue Möglichkeiten in Bezug auf die Privatsphäre. Mehr dazu unter „Tipps und Tricks zur privaten Kommunikation“.
 
 Klone unterliegen einigen Restriktionen. Eine vollständige Erklärung zum Klonen von Identitäten gibt es unter „Klone“.
 
@@ -147,40 +160,44 @@ Jeder Kanal kann beliebig viele Profile mit unterschiedlichen Informationen defi
 
 [b]Kanal-Backups[/b]
 
-In Red gibt es ein einfaches Ein-Klick-Backup, mit dem Du ein komplettes Backup Deiner Kanal-Einstellungen und Verbindungen herunterladen kannst.
+In $Projectname gibt es ein einfaches Ein-Klick-Backup, mit dem Du ein komplettes Backup Deiner Kanal-Einstellungen und Verbindungen herunterladen kannst.
 
 Solche Backups sind ein Weg, um Klone zu erstellen, und können genutzt werden, um einen Kanal wiederherzustellen.
 
 [b]Löschen von Konten[/b]
 
-Konten und Kanäle können sofort gelöscht werden, indem Du einfach auf einen Link klickst. Das wars. Alle damit verbundenen Inhalte werden aus der Matrix gelöscht (inklusiver aller Beiträge und sonstiger Inhalte, die von dem gelöschten Konto/Kanal erzeugt wurden). Je nach Anzahl Deiner Verbindungen kann es etwas dauern, bis die Inhalte auch von allen Servern Deiner Kontakte gelöscht werden, aber die Löschung wird so schnell wie sinnvoll möglich durchgeführt.
+Konten und Kanäle können sofort gelöscht werden, indem Du einfach auf einen Link klickst. Das wars. Alle damit verbundenen Inhalte werden aus dem Grid gelöscht (inklusiver aller Beiträge und sonstiger Inhalte, die von dem gelöschten Konto/Kanal erzeugt wurden). Je nach Anzahl Deiner Verbindungen kann es etwas dauern, bis die Inhalte auch von allen Servern Deiner Kontakte gelöscht werden, aber die Löschung wird so schnell wie sinnvoll möglich durchgeführt.
 
 [h2]Erstellen von Inhalten[/h2]
 
 [b]Beiträge schreiben[/b]
 
-Red unterstützt diverse verschiedene Wege, um Inhalte mit Auszeichnung (z.B. fett, kursiv, farbig etc.) zu erstellen. Voreinstellung ist die $Projectname-Variante von BBCode (wie in vielen Web-Foren) mit einigen Ergänzungen, die nur hier funktionieren. Du kannst auch Markdown benutzen, wenn Dir das leichter fällt. Bis vor kurzem konnte auch ein grafischer Editor eingesetzt werden, der jedoch große Probleme aufwies und deshalb entfernt wurde. Wir suchen gerade nach einer Alternative.
+$Projectname unterstützt diverse verschiedene Wege, um Inhalte mit Auszeichnung (z.B. fett, kursiv, farbig etc.) zu erstellen. Voreinstellung ist die $Projectname-Variante von BBCode (wie in vielen Web-Foren) mit einigen Ergänzungen, die nur hier funktionieren. Du kannst auch Markdown benutzen, wenn Dir das leichter fällt. Bis vor kurzem konnte auch ein grafischer Editor eingesetzt werden, der jedoch große Probleme aufwies und deshalb entfernt wurde. Wir suchen gerade nach einer Alternative.
 
 Webseiten können neben BBCode und Markdown auch in HTML und Plain Text erstellt werden.
 
 [b]Inhalte löschen[/b]
 
-Alle Inhalte in der $Projectname bleiben unter der Kontrolle des Mitglieds (bzw. Kanals), der sie ursprünglich erstellt hat. Alle Beiträge können jederzeit gelöscht werden, egal, ob sie auf dem Heimat-Server des Nutzers oder auf einem anderen Server erstellt wurden, an dem der Nutzer via Zot angemeldet war.
+Alle Inhalte in $Projectname bleiben unter der Kontrolle des Mitglieds (bzw. Kanals), der sie ursprünglich erstellt hat. Alle Beiträge können jederzeit gelöscht werden, egal, ob sie auf dem Heimat-Server des Nutzers oder auf einem anderen Server erstellt wurden, an dem der Nutzer via Zot (Kommunikations- und Authentifizierungsprotokoll von $Projectname) angemeldet war.
 
 [b]Medien[/b]
 
-Genau wie jedes andere Blog-System, soziale Netzwerk oder Mikro-Blogging-Dienst unterstützt Red das Hochladen von Dateien, das Einbetten von Bildern und Videos und das Verlinken von Seiten.
+Genau wie jedes andere Blog-System, soziale Netzwerk oder Mikro-Blogging-Dienst unterstützt $Projectname das Hochladen von Dateien, das Einbetten von Bildern und Videos und das Verlinken von Seiten.
 
 [b]Vorschau/Editieren[/b] 
 
 Vor dem Absenden kann eine Vorschau von Beiträgen betrachtet werden. Außerdem können Beiträge auch nach dem Absenden noch verändert werden.
 
+[b]Umfragen[/b]
+
+Beiträge können als Umfragen gestaltet werden – die Leser können dann mittels entsprechender Buttons zustimmen, ablehnen oder sich enthalten, was ähnlich wie „Likes“ am Beitrag sichtbar wird. Dadurch kannst Du abschätzen, wie gut neue Ideen ankommen, oder informelle Umfragen starten.
+
 [b]$Projectname erweitern[/b]
 
 Die $Projectname kann auf vielerlei Art erweitert werden: Durch Server-Anpassung, persönliche Anpassung, setzen von Optionen, Themes und Addons/Plugins.
 
 [b]API[/b]
 
-Es existiert eine API, die von beliebigen Programmen/Apps und Diensten genutzt werden kann. Sie basiert auf der ursprünglichen Twitter-API (für die es hunderte von Tools und Apps gibt). Sie wird aktuell erweitert, um Zugriff auf Möglichkeiten zu gewähren, die es nur in der $Projectname gibt. Authentifikation erfolgt über Login/Passwort oder OAuth. Eine Client-Registrierung für OAuth-Applikationen ist möglich.
+Es existiert eine API, die von beliebigen Programmen/Apps und Diensten genutzt werden kann. Sie basiert auf der ursprünglichen Twitter-API (für die es hunderte von Tools und Apps gibt). Sie wird aktuell erweitert, um Zugriff auf Möglichkeiten zu gewähren, die es nur in $Projectname gibt. Authentifikation erfolgt über Login/Passwort oder OAuth. Eine Client-Registrierung für OAuth-Applikationen ist möglich.
 
 #include doc/macros/main_footer.bb;
diff --git a/doc/de/general.bb b/doc/de/general.bb
new file mode 100644
index 000000000..61cc955bb
--- /dev/null
+++ b/doc/de/general.bb
@@ -0,0 +1,19 @@
+[h2]Informationen über das Projekt und diesen Hub[/h2]
+
+[zrl=[baseurl]/help/Privacy]Informationen zum Datenschutz[/zrl]
+
+[zrl=[baseurl]/help/history]Zur Geschichte von $Projectname[/zrl]
+
+[h3]Externe Ressourcen[/h3]
+[zrl=[baseurl]/help/external-resource-links]Links zu externen Ressourcen[/zrl]
+
+[url=https://github.com/redmatrix/redmatrix]Haupt-Website[/url]
+[url=https://github.com/redmatrix/redmatrix-addons]Addons-Website[/url]
+
+[url=[baseurl]/help/credits]$Projectname Credits[/url]
+
+[h3]Ãœber diesen $Projectname-Hub[/h3]
+[zrl=[baseurl]/help/TermsOfService]Nutzungsbedingungen dieses Hubs[/zrl]
+[zrl=[baseurl]/siteinfo]Informationen zu diesem Hub und der $Projectname-Version[/zrl]
+[zrl=[baseurl]/siteinfo/json]Detaillierte technische Informationen zu diesem Hub im JSON-Format[/zrl]
+
diff --git a/doc/de/main.bb b/doc/de/main.bb
index 5786f03ef..eee2e85fe 100644
--- a/doc/de/main.bb
+++ b/doc/de/main.bb
@@ -1,86 +1,11 @@
 [img][baseurl]/images/hubzilla-banner.png[/img]
 
-[zrl=[baseurl]/help/about]Was ist Hubzilla?[/zrl]
-Hubzilla ist eine dezentrale Kommunikations- und Publishing-Plattform. Sie ermöglicht Dir die volle Kontrolle über all Deine Kommunikation mit Hilfe von automatischer Verschlüsselung und detaillierter Zugriffskontrolle. Du, und [i]nur[/i] Du, entscheidest, wer Deine Beiträge sehen darf. Hubzilla ist der Nachfolger, der seit einigen Jahren erfolgreichen Plattformen Firendica und Red Matrix. 
+[zrl=[baseurl]/help/about]Was ist $Projectname?[/zrl]
+$Projectname ist eine dezentrale Kommunikations- und Publishing-Plattform. Es ermöglicht Dir die volle Kontrolle über all Deine Kommunikation mit Hilfe von automatischer Verschlüsselung und detaillierter Zugriffskontrolle. Du, und [i]nur[/i] Du, entscheidest, wer Deine Beiträge sehen darf. $Projectname ist der Nachfolger, der seit einigen Jahren erfolgreichen Plattformen Friendica und RedMatrix. 
 
-[zrl=[baseurl]/help/features]Features von Hubzilla[/zrl]
-Hubzilla, basierend auf der Red Matrix, funktioniert schon heute als ein globales verteiltes Netzwerk und beweist täglich ihre Vielseitigkeit und Skalierbarkeit - auf kleinen Privatservern wie auch auf riesigen Sites.
-Kommunikationsplattformen für Familien, verteilte Online-Communities, Support-Foren, Blogs und Homepages. Oder auch professionelle Inhalte-Anbieter mit kommerziellen Premium-Kanälen und eingeschränktem Zugriff – was immer Du willst,  Hubzilla unterstützt Dich in Deinem kreativen Schaffen.
+[zrl=[baseurl]/help/features]Features von $Projectname[/zrl]
+$Projectname funktioniert schon heute als ein globales verteiltes Netzwerk und beweist täglich seine Vielseitigkeit und Skalierbarkeit - auf kleinen Privatservern wie auch auf riesigen Sites.
+Kommunikationsplattformen für Familien, verteilte Online-Communities, Support-Foren, Blogs und Homepages. Oder auch professionelle Inhalte-Anbieter mit kommerziellen Premium-Kanälen und eingeschränktem Zugriff – was immer Du willst, $Projectname unterstützt Dich in Deinem kreativen Schaffen.
 
 [zrl=[baseurl]/help/what_is_zot]Got Zot? Hast Du schon Zot? Wenn nicht wird es Zeit.[/zrl]
-Zot ist ein großartiges neues Kommunikationsprotokoll, das für Hubzilla - und vorher die Red Matrix - entwickelt wurde. Als Mitglied bist Du dank „Nomadischer Identität“ nicht länger an einen einzigen Server oder einen einzigen Anbieter gebunden. Ziehe einfach auf einen anderen Server um und behalte dabei alle Deine Kontakte, oder klone Deinen Kanal und lasse ihn auf mehreren Servern gleichzeitig laufen – sollte einer davon plötzlich geschlossen werden, ist das kein Problem für Dich. Und bist Du erst Teil des Hubzilla-Netzwerkes, musst Du Dich nie wieder mehrfach anmelden, selbst wenn Du Seiten auf einem andere Hub (den Hubzilla-Servern) betrachtest. Zot ist es, was das Hubzilla-Netzwerk besonders macht.
-
-[h3]Erste Schritte[/h3]
-[zrl=[baseurl]/help/Privacy]Datenschutz[/zrl]
-[zrl=[baseurl]/help/registration]Ein Konto registrieren[/zrl]
-[zrl=[baseurl]/help/accounts_profiles_channels_basics]Du im Hubzilla-Netzwerk: Konten, Profile und Kanäle kurz erklärt[/zrl]
-[zrl=[baseurl]/help/profiles]Profile[/zrl]
-[zrl=[baseurl]/help/channels]Kanäle[/zrl]
-[zrl=[baseurl]/help/roles]Zugriffsrechte-Kategorien und Kanaltypen[/zrl]
-[zrl=[baseurl]/help/first-post]Dein erster Beitrag[/zrl]
-[zrl=[baseurl]/help/connecting_to_channels]Sich mit anderen Kanälen verbinden[/zrl]
-[zrl=[baseurl]/help/permissions]Zugriffsrechte und Verschlüsselung: Du hast alles unter Kontrolle[/zrl]
-[zrl=[baseurl]/help/cloud]Cloud-Speicher[/zrl]
-[zrl=[baseurl]/help/remove_account]Einen Kanal oder das ganze Konto löschen[/zrl]
-
-[h3]Hilfe für $Projectname-Mitglieder[/h3]
-[zrl=[baseurl]/help/tags_and_mentions]Tags und Erwähnungen[/zrl]
-[zrl=[baseurl]/help/webpages]Webseiten[/zrl]
-[zrl=[baseurl]/help/bbcode]BBcode-Referenz für Beiträge und Kommentare[/zrl]
-[zrl=[baseurl]/help/checking_account_quota_usage]Überprüfung der Kontenlimits[/zrl]
-[zrl=[baseurl]/help/cloud_desktop_clients]Desktop-Anwendungen und die Cloud[/zrl]
-[zrl=[baseurl]/help/AdvancedSearch]Fortgeschrittene Suche im Kanalverzeichnis[/zrl]
-[zrl=[baseurl]/help/addons]Hilfe zu Addons[/zrl]
-[zrl=[baseurl]/help/diaspora_compat]Kompatibilität zum Diaspora-Protokoll (zur Kommunikation mit Kontakten aus Diaspora und Friendica)[/zrl]
-[zrl=[baseurl]/help/faq_members]FAQ für Mitglieder[/zrl]
-
-[h3]Hilfe für Administratoren[/h3]
-[zrl=[baseurl]/help/install]Installation[/zrl]
-[zrl=[baseurl]/help/red2pi]Hubzilla auf einem Raspberry Pi installieren[/zrl]
-[zrl=[baseurl]/help/troubleshooting]Troubleshooting-Tipps[/zrl]
-[zrl=[baseurl]/help/hidden_configs]Versteckte Konfigurations-Optionen[/zrl]
-[zrl=[baseurl]/help/faq_admins]FAQ für Admins[/zrl]
-[zrl=[baseurl]/help/service_classes]Serviceklassen[/zrl]
-
-[h3]Technische Dokumentation[/h3]
-[zrl=[baseurl]/help/history]Die Geschichte von $Projectname[/zrl]
-[zrl=[baseurl]/help/Zot---A-High-Level-Overview]Zot – ein grober Überblick[/zrl]
-[zrl=[baseurl]/help/zot]Eine Einführung ins Zot-Protokoll[/zrl]
-[zrl=[baseurl]/help/zot_structures]Zot-Strukturen[/zrl]
-[zrl=[baseurl]/help/comanche]Seitenbeschreibung in Comanche[/zrl]
-[zrl=[baseurl]/help/Creating-Templates]Vorlagen erstellen mit Comanche[/zrl]
-[zrl=[baseurl]/help/Widgets]Widgets[/zrl]
-[zrl=[baseurl]/help/plugins]Plugins[/zrl]
-[zrl=[baseurl]/help/doco]Selbst Dokumentation beisteuern[/zrl]
-[zrl=[baseurl]/help/DerivedTheme1]Einen Theme basierend auf einem anderen erstellen[/zrl]
-[zrl=[baseurl]/help/schema_development]Schemata[/zrl]
-[zrl=[baseurl]/help/Translations]Ãœbersetzungen[/zrl]
-[zrl=[baseurl]/help/developers]Entwickler[/zrl]
-[zrl=[baseurl]/help/intro_for_developers]Einführung für Entwickler[/zrl]
-[zrl=[baseurl]/help/database]Datenbank-Schema[/zrl]
-[zrl=[baseurl]/help/api_functions]API-Funktionen[/zrl]
-[zrl=[baseurl]/help/api_posting]Mit der API einen Beitrag erstellen[/zrl]
-[zrl=[baseurl]/help/developer_function_primer]Ãœbersicht der wichtigsten Hubzilla-Funktionen[/zrl]
-[zrl=[baseurl]/doc/html/]Code-Referenz (mit doxygen generiert - setzt Cookies)[/zrl]
-[zrl=[baseurl]/help/to_do_doco]To-Do-Liste für das Projekt Hubzilla-Dokumentation[/zrl]
-[zrl=[baseurl]/help/to_do_code]To-Do-Liste für Entwickler[/zrl]
-[zrl=[baseurl]/help/roadmap]Roadmap für Version 3[/zrl]
-[zrl=[baseurl]/help/git_for_non_developers]Git für Nicht-Entwickler[/zrl]
-[zrl=[baseurl]/help/dev_beginner]Schritt-für-Schritt-Einführung für neue Entwickler[/zrl]
-
-[h3]Häufig gestellte Fragen für Entwickler[/h3]
-[zrl=[baseurl]/help/faq_developers]FAQ für Entwickler[/zrl]
-
-[h3]Externe Ressourcen[/h3]
-[zrl=[baseurl]/help/external-resource-links]Links zu externen Ressourcen[/zrl]
-[url=https://github.com/redmatrix/redmatrix]Haupt-Website[/url]
-[url=https://github.com/redmatrix/redmatrix-addons]Addons-Website[/url]
-[url=https://zothub.com/channel/one]Entwickler-Kanal[/url]
-[url=https://federated.social/channel/postgres]Postgres-spezifischer Admin-Support-Kanal[/url]
-
-[url=[baseurl]/help/credits]$Projectname Credits[/url]
-
-[h3]Ãœber diesen Hub (Hubzilla-Server)[/h3]
-[zrl=[baseurl]/help/TermsOfService]Nutzungsbedingungen dieses Hubs (Hubzilla-Servers)[/zrl]
-[zrl=[baseurl]/siteinfo]Informationen zu diesem Server und der Hubzilla-Version[/zrl]
-[zrl=[baseurl]/siteinfo/json]Detaillierte technische Informationen zu diesem Server im JSON-Format[/zrl]
+Zot ist ein großartiges neues Kommunikationsprotokoll, das für $Projectname entwickelt wurde. Als Mitglied bist Du dank „Nomadischer Identität“ nicht länger an einen einzigen Server oder einen einzigen Anbieter gebunden. Ziehe einfach auf einen anderen Server um und behalte dabei alle Deine Kontakte, oder klone Deinen Kanal und lasse ihn auf mehreren Servern gleichzeitig laufen – sollte einer davon plötzlich geschlossen werden, ist das kein Problem für Dich. Und bist Du erst Teil des $Projectname-Netzwerkes, musst Du Dich nie wieder mehrfach anmelden, selbst wenn Du Seiten auf einem andere Hub (den $Projectname-Servern) betrachtest. Zot ist, was das $Projectname-Netzwerk besonders macht.
diff --git a/doc/de/members.bb b/doc/de/members.bb
new file mode 100644
index 000000000..c85855f62
--- /dev/null
+++ b/doc/de/members.bb
@@ -0,0 +1,25 @@
+[h2]Dokumentation für Hub-Mitglieder[/h2]
+
+[h3]Erste Schritte[/h3]
+[zrl=[baseurl]/help/registration]Ein Konto registrieren[/zrl]
+[zrl=[baseurl]/help/accounts_profiles_channels_basics]Du im Hubzilla-Netzwerk: Konten, Profile und Kanäle kurz erklärt[/zrl]
+[zrl=[baseurl]/help/profiles]Profile[/zrl]
+[zrl=[baseurl]/help/channels]Kanäle[/zrl]
+[zrl=[baseurl]/help/roles]Zugriffsrechte-Kategorien und Kanaltypen[/zrl]
+[zrl=[baseurl]/help/first-post]Dein erster Beitrag[/zrl]
+[zrl=[baseurl]/help/connecting_to_channels]Sich mit anderen Kanälen verbinden[/zrl]
+[zrl=[baseurl]/help/permissions]Zugriffsrechte und Verschlüsselung: Du hast alles unter Kontrolle[/zrl]
+[zrl=[baseurl]/help/cloud]Cloud-Speicher[/zrl]
+[zrl=[baseurl]/help/remove_account]Einen Kanal oder das ganze Konto löschen[/zrl]
+
+[h3]Hilfe für $Projectname-Mitglieder[/h3]
+[zrl=[baseurl]/help/tags_and_mentions]Tags und Erwähnungen[/zrl]
+[zrl=[baseurl]/help/webpages]Webseiten[/zrl]
+[zrl=[baseurl]/help/bbcode]BBcode-Referenz für Beiträge und Kommentare[/zrl]
+[zrl=[baseurl]/help/checking_account_quota_usage]Überprüfung der Kontenlimits[/zrl]
+[zrl=[baseurl]/help/cloud_desktop_clients]Desktop-Anwendungen und die Cloud[/zrl]
+[zrl=[baseurl]/help/AdvancedSearch]Fortgeschrittene Suche im Kanalverzeichnis[/zrl]
+[zrl=[baseurl]/help/addons]Hilfe zu Addons[/zrl]
+[zrl=[baseurl]/help/diaspora_compat]Kompatibilität zum Diaspora-Protokoll (zur Kommunikation mit Kontakten aus Diaspora und Friendica)[/zrl]
+[zrl=[baseurl]/help/faq_members]FAQ für Mitglieder[/zrl]
+[zrl=[baseurl]/help/bugs]Bugs, Probleme und Sachen, die einem um die Ohren fliegen können[/zrl]
diff --git a/doc/de/profiles.bb b/doc/de/profiles.bb
index 262aeb6e2..7860ad47c 100644
--- a/doc/de/profiles.bb
+++ b/doc/de/profiles.bb
@@ -1,6 +1,6 @@
-[size=large][b]Profile[/b][/size]
+[h3]Profile[/h3]
 
-In Red kannst Du beliebig viele Profile anlegen. Du kannst mehrere Profile nutzen, um verschiedenen Kontakten und Profilbesuchern unterschiedliche Seiten Deiner Persönlichkeit zu zeigen. Das ist nicht das gleiche wie das Anlegen mehrerer [i]Kanäle.[/i]
+In $Projectname kannst Du beliebig viele Profile anlegen. Du kannst mehrere Profile nutzen, um verschiedenen Kontakten und Profilbesuchern unterschiedliche Seiten Deiner Persönlichkeit zu zeigen. Das ist nicht das gleiche wie das Anlegen mehrerer [i]Kanäle.[/i]
 
 Mehrere Kanäle erlauben es, komplett voneinander getrennte Informationen zu verwalten. Du könntest zum Beispiel einen Kanal für Dich selbst anlegen, einen für Deinen Schwimmverein, einen für Dein Blog und so weiter und so fort.
 
@@ -18,21 +18,21 @@ Wenn Du Leute kennenlernen möchtest, die ähnliche Interessen haben wie Du, nim
 
 Um alternative Profile zu erstellen, besuche zunächst die Seite [zrl=[baseurl]/settings/features]Einstellungen > Zusätzliche Funktionen[/zrl] und aktiviere dort „Mehrfachprofile“. Ohne diese Aktivierung hast Du nur ein Profil, nämlich Dein Standard-Profil.
 
-Klicke dann auf „Profile bearbeiten“ im Menü Deines Red-Servers. Dort kannst Du existierende Profile bearbeiten, Dein Profilfoto verändern, Dinge zu einem Profil hinzufügen oder ein neues Profil erstellen. Du kannst auch ein Profil „klonen“, wenn Du nur einige wenige Einträge ändern willst, ohne die ganzen Informationen noch einmal einzugeben. Klicke dazu auf das Profil, das Du klonen willst, und wähle dann „Dieses Profil klonen“.
+Klicke dann auf „Profile bearbeiten“ im Menü Deines $Projectname-Servers. Dort kannst Du existierende Profile bearbeiten, Dein Profilfoto verändern, Dinge zu einem Profil hinzufügen oder ein neues Profil erstellen. Du kannst auch ein Profil „klonen“, wenn Du nur einige wenige Einträge ändern willst, ohne die ganzen Informationen noch einmal einzugeben. Klicke dazu auf das Profil, das Du klonen willst, und wähle dann „Dieses Profil klonen“.
 
 In der Liste Deiner Profile kannst Du auch bestimmen, wer ein bestimmtes Profil zu sehen bekommt. Klicke dazu auf „Sichtbarkeit bearbeiten“ neben dem Profil, um das es geht (gibt es nur bei Profilen, die nicht Dein Standard-Profil sind). Klicke dann auf die Bilder derjenigen Kontakte, die dieses Profil sehen sollen – sie sind dann oben zu sehen. Wenn Du oben auf ein Bild klickst, wird dieser Kontakt wieder aus der Gruppe derjenigen herausgenommen, die dieses Profil zu sehen bekommen.
 
-Hast Du einem Kontakt ein Profil zugeordnet, wird er immer dieses Profil sehen, wenn er sich Dein Profil ansieht. Besucht er Deinen Red-Server, ohne sich anzumelden, sieht er aber weiterhin Dein Standard-Profil.
+Hast Du einem Kontakt ein Profil zugeordnet, wird er immer dieses Profil sehen, wenn er sich Dein Profil ansieht. Besucht er Deinen $Projectname-Server, ohne sich anzumelden, sieht er aber weiterhin Dein Standard-Profil.
 
-Auf der allgemeinen „Einstellungen“-Seite gibt es eine Einstellung, mit der Du festlegen kannst, ob Dein Standard-Profil in den Red-Verzeichnissen veröffentlicht werden soll.
+Auf der allgemeinen „Einstellungen“-Seite gibt es eine Einstellung, mit der Du festlegen kannst, ob Dein Standard-Profil in den $Projectname-Verzeichnissen veröffentlicht werden soll.
 
 Wenn Du nicht möchtest, dass andere Dich finden können, ohne dass Du ihnen Deine Kanal-Adresse gibst, kannst Du so verhindern, dass Dein Profil veröffentlicht wird.
 
 [b]Schlüsselwörter und Verzeichnissuche[/b]
 
-Im Verzeichnis (Kanal-Anzeiger) kannst Du nach Leuten suchen, die ihre Profile veröffentlichen. Zum Beispiel, indem Du Namen oder Spitznamen eingibst. Aktuell werden nur das Namensfeld und die Schlüsselwörter durchsucht. Wenn Du Schlüsselwörter in Dein Standard-Profil einträgst, können Dich Leute mit ähnlichen Interessen finden. Sie werden außerdem bei den Kanal-Vorschlägen benutzt. Sie sind im Verzeichnis nicht direkt sichtbar, wohl aber auf Deiner Profil-Seite.
+Im Verzeichnis (Kanal-Verzeichnis) kannst Du nach Leuten suchen, die ihre Profile veröffentlichen. Zum Beispiel, indem Du Namen oder Spitznamen eingibst. Aktuell werden nur das Namensfeld und die Schlüsselwörter durchsucht. Wenn Du Schlüsselwörter in Dein Standard-Profil einträgst, können Dich Leute mit ähnlichen Interessen finden. Sie werden außerdem bei den Kanal-Vorschlägen benutzt. Sie sind im Verzeichnis nicht direkt sichtbar, wohl aber auf Deiner Profil-Seite.
 
-Auf Deiner „Verbindungen“-Seite und im Verzeichnis (Kanal-Anzeiger) gibt es einen Link „Vorschläge“ bzw. „Kanal-Vorschläge“. Dort findest Du Kanäle, die gleiche oder ähnliche Schlüsselwörter im Profil haben wie Du. Je mehr Schlüsselwörter Du in Dein Standard-Profil einträgst, desto besser werden die Suchergebnisse. Sie sind nach Relevanz sortiert.
+Auf Deiner „Verbindungen“-Seite und im Verzeichnis gibt es einen Link „Vorschläge“ bzw. „Kanal-Vorschläge“. Dort findest Du Kanäle, die gleiche oder ähnliche Schlüsselwörter im Profil haben wie Du. Je mehr Schlüsselwörter Du in Dein Standard-Profil einträgst, desto besser werden die Suchergebnisse. Sie sind nach Relevanz sortiert.
 
 Siehe auch:
 
diff --git a/doc/de/registration.bb b/doc/de/registration.bb
index ebd187357..ac24782a6 100644
--- a/doc/de/registration.bb
+++ b/doc/de/registration.bb
@@ -1,6 +1,6 @@
-[size=large][b]Registrieren[/b][/size]
+[h3]Registrieren[/h3]
 
-Nicht alle Server in der Red-Matrix erlauben jedem, sich zu registrieren. Wenn eine Registrierung möglich ist, erscheint unter dem Anmelde-Formular ein Link mit dem Titel „Registrieren“, der Dich zur Registrierungs-Seite des Servers führt. Auf manchen Servern wirst Du auf einen anderen Server weitergeleitet, der Registrierungen erlaubt. Da alle Red-Server miteinander verbunden sind, ist es egal, auf welchem Du Dich registrierst.
+Nicht alle $Projectname-Hubs erlauben jedem, sich zu registrieren. Wenn eine Registrierung möglich ist, erscheint unter dem Anmelde-Formular ein Link mit dem Titel „Registrieren“, der Dich zur Registrierungs-Seite des Hubs führt. Auf manchen Hubs wirst Du auf einen anderen Hub weitergeleitet, der Registrierungen erlaubt. Da alle $Projectname-Hubs miteinander verbunden sind, ist es egal, auf welchem Du Dich registrierst.
 
 [b]Deine E-Mail-Adresse[/b]
 
@@ -8,7 +8,7 @@ Bitte gib eine funktionierende E-Mail-Adresse an. Sie wird [b]nie[/b] veröffent
 
 [b]Passwort[/b]
 
-Gib ein Passwort Deiner Wahl ein und wiederhole es in der zweiten Box, um sicherzugehen, dass Du Dich nicht vertippt hast. Da die Red-Matrix dezentralisierten Identitäsnachweis beherrscht, kannst Du Dich mit Deinem Konto auf vielen anderen Webseiten anmelden.
+Gib ein Passwort Deiner Wahl ein und wiederhole es in der zweiten Box, um sicherzugehen, dass Du Dich nicht vertippt hast. Da $Projectname dezentralisierten Identitäsnachweis beherrscht, kannst Du Dich mit Deinem Konto auf vielen anderen Webseiten anmelden.
 
 [b]Nutzungsbedingungen[/b]
 
@@ -27,7 +27,7 @@ Der Kanal-Name ist der Titel oder eine kurze Beschreibung des Kanals. Der „Spi
 Wenn Dein Kanal angelegt ist, geht es direkt weiter zu den Einstellungen. Dort kannst Du Zugriffsrechte setzen, Funktionen zu- oder abschalten und so weiter. Diese Punkte werden auf den entsprechenden Hilfeseiten erklärt.  
 
 Siehe auch
-[zrl=[baseurl]/help/accounts_profiles_channels_basics]Grundlagen zu Identitäten in der $Projectname[/zrl]
+[zrl=[baseurl]/help/accounts_profiles_channels_basics]Grundlagen zu Identitäten in $Projectname[/zrl]
 [zrl=[baseurl]/help/accounts]Konten[/zrl]
 [zrl=[baseurl]/help/profiles]Profile[/zrl]
 [zrl=[baseurl]/help/permissions]Zugriffsrechte[/zrl]
diff --git a/doc/develop.bb b/doc/develop.bb
index ad5b2288f..56ba08421 100644
--- a/doc/develop.bb
+++ b/doc/develop.bb
@@ -17,12 +17,12 @@
 [zrl=[baseurl]/help/intro_for_developers]Intro for Developers[/zrl]
 [zrl=[baseurl]/help/database]Database schema documentation[/zrl]
 [zrl=[baseurl]/help/api_functions]API functions[/zrl]
-[zrl=[baseurl]/help/api_posting]Posting to the red# using the API[/zrl]
+[zrl=[baseurl]/help/api_posting]Posting to $Projectname using the API[/zrl]
 [zrl=[baseurl]/help/developer_function_primer]Red Functions 101[/zrl]
 [zrl=[baseurl]/doc/html/]Code Reference (Doxygen generated - sets cookies)[/zrl]
-[zrl=[baseurl]/help/to_do_doco]To-Do list for the Red Documentation Project[/zrl]
+[zrl=[baseurl]/help/to_do_doco]To-Do list for the $Projectname Documentation Project[/zrl]
 [zrl=[baseurl]/help/to_do_code]To-Do list for Developers[/zrl]
-[zrl=[baseurl]/help/roadmap]Version 3 roadmap[/zrl]
+[zrl=[baseurl]/help/roadmap]Roadmap[/zrl]
 [zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl]
 [zrl=[baseurl]/help/dev_beginner]Step-for-step manual for beginning developers[/zrl]
 
@@ -30,6 +30,5 @@
 [zrl=[baseurl]/help/faq_developers]FAQ For Developers[/zrl]
 
 [h3]External Resources[/h3]
-
 [url=https://zothub.com/channel/one]Development Channel[/url]
 [url=https://federated.social/channel/postgres]Postgres-specific $Projectname Admin Support Channel[/url]
diff --git a/doc/features.bb b/doc/features.bb
index 2abf0ec30..2d9849d4e 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -146,7 +146,7 @@ Forums are typically channels which may be open to participation from multiple a
 

 Accounts in $Projectname are referred to as [i]nomadic identities[/i], because a member's identity is not bound to the hub where the identity was originally created.  For example, when you create a Facebook or Gmail account, it is tied to those services.  They cannot function without Facebook.com or Gmail.com.  

 

-By contrast, say you've created a$Projectname identity called [b]tina@redhub.com[/b].  You can clone it to another$Projectname hub by choosing the same, or a different name: [b]liveForever@Some$ProjectnameHub.info[/b]

+By contrast, say you've created a $Projectname identity called [b]tina@$Projectnamehub.com[/b].  You can clone it to another $Projectname hub by choosing the same, or a different name: [b]liveForever@Some$ProjectnameHub.info[/b]

 

 Both channels are now synchronized, which means all your contacts and preferences will be duplicated on your clone.  It doesn't matter whether you send a post from your original hub, or the new hub.  Posts will be mirrored on both accounts.

 

@@ -158,7 +158,7 @@ This is a rather revolutionary feature, if we consider some scenarios:
 

  - What if your identity is subject to government censorship?  Your hub provider may be compelled to delete your account, along with any identities and associated data.  With cloning, $Projectname offers [b]censorship resistance[/b].  You can have hundreds of clones, if you wanted to, all named different, and existing on many different hubs, strewn around the internet.  

 

-Red offers interesting new possibilities for privacy. You can read more at the &lt;&lt;Private Communications Best Practices&gt;&gt; page.

+$Projectname offers interesting new possibilities for privacy. You can read more at the &lt;&lt;Private Communications Best Practices&gt;&gt; page.

 

 Some caveats apply. For a full explanation of identity cloning, read the &lt;HOW TO CLONE MY IDENTITY&gt;.

 

@@ -180,7 +180,7 @@ Accounts can be immediately deleted by clicking on a link. That's it.  All assoc
 

 [b]Writing Posts[/b]

 

-Red supports a number of different ways of adding rich-text content. The default is a custom variant of BBcode, tailored for use in $Projectname. You may also enable the use of Markdown if you find that easier to work with. A visual editor may also be used. The traditional visual editor for $Projectname had some serious issues and has since been removed. We are currently looking for a replacement. 

+$Projectname supports a number of different ways of adding rich-text content. The default is a custom variant of BBcode, tailored for use in $Projectname. You may also enable the use of Markdown if you find that easier to work with. A visual editor may also be used. The traditional visual editor for $Projectname had some serious issues and has since been removed. We are currently looking for a replacement. 

 

 When creating &quot;Websites&quot;, content may be entered in HTML, Markdown, BBcode, and/or plain text.

 

diff --git a/doc/fr/git_for_non_developers.bb b/doc/fr/git_for_non_developers.bb
new file mode 100644
index 000000000..9e2448e68
--- /dev/null
+++ b/doc/fr/git_for_non_developers.bb
@@ -0,0 +1,73 @@
+[b]Git pour les non développeurs[/b]
+
+Bon vous traduivez ou contribuez à un thème et chaque fois que vous faites un pull request, vous devez parler avec un des développeurs avant que vos changements soient pris en compte.
+
+Vous devez trouver un petit tutorial pour vous aider à maintenair les choses synchronisé. C'est trés facile
+
+
+
+After you've created a fork of the repo (just click &quot;fork&quot; at github), you need to clone your own copy.
+
+For the sake of examples, we'll assume you're working on a theme called redexample (which does not exist).
+
+[code]git clone https://github.com/username/red.git[/code]
+
+Once you've done that, cd into the directory, and add an upstream.
+
+[code]
+cd red
+git remote add upstream https://github.com/redmatrix/redmatrix
+[/code]
+
+From now on, you can pull upstream changes with the command
+[code]git fetch upstream[/code]
+
+Before your changes can be merged automatically, you will often need to merge upstream changes.
+
+[code]
+git merge upstream/master
+[/code]
+
+You should always merge upstream before pushing any changes, and [i]must[/i] merge upstream with any pull requests to make them automatically mergeable.
+
+99% of the time, this will all go well.  The only time it won't is if somebody else has been editing the same files as you - and often, only if they have been editing the same lines of the same files.  If that happens, that would be a good time to request help until you get the hang of handling your own merge conflicts.
+
+Then you just need to add your changes [code]git add view/theme/redexample/[/code]
+
+This will add all the files in view/theme/redexample and any subdirectories.  If your particular files are mixed throughout the code, you should add one at a time.  Try not to do git add -a, as this will add everything, including temporary files (we mostly, but not always catch those with a .gitignore) and any local changes you have, but did not intend to commit.
+
+Once you have added all the files you have changed, you need to commit them.  [code]git commit[/code]
+
+This will open up an editor where you can describe the changes you have made.  Save this file, and exit the editor.
+
+Finally, push the changes to your own git
+[code]git push[/code]
+
+And that's it, your repo is up to date!
+
+All you need to do now is actually create the pull request.  There are two ways to do this.
+
+The easy way, if you're using Github is to simply click the green button at the top of your own copy of the repository, enter a description of the changes, and click 'create pull request'.  The
+main repository, themes, and addons all have their main branch at Github, so this method can be used most of the time.
+
+Most people can stop here.
+
+Some projects in the extended RedMatrix ecosphere have no Github presence, to pull request these is a bit different - you'll have to create your pull request manually.  Fortunately, this isn't
+much harder.
+
+[code]git request-pull -p <start> <url>[/code]
+
+Start is the name of a commit to start at.  This must exist upstream.  Normally, you just want master.
+
+URL is the URL of [i]your[/i] repo.
+
+One can also specify <end>.  This defaults to HEAD.
+
+Example:
+[code]
+git request-pull master https://example.com/project
+[/code]
+
+And simply send the output to the project maintainer.
+
+#include doc/macros/main_footer.bb;
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index b06df641f..39ec9569d 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -65,7 +65,11 @@ This document assumes you're an administrator.
         this website.  Can be overwritten by user settings.
     [b]system > projecthome[/b]
         Set the project homepage as the homepage of your hub.
-    [b]system > workflowchannelnext[/b]
+	[b]system > default_permissions_role[/b]
+		If set to a valid permissions role name (for instance 'public'), use that role for
+		the first channel created by a new account and don't ask for the "Channel Type" on
+		the channel creation form. 
+    [b]system > workflow_channel_next[/b]
         The page to direct users to immediately after creating a channel.
     [b]system > max_daily_registrations[/b]
         Set the maximum number of new registrations allowed on any day.
diff --git a/doc/hook/check_channelallowed.bb b/doc/hook/check_channelallowed.bb
new file mode 100644
index 000000000..e7559c92f
--- /dev/null
+++ b/doc/hook/check_channelallowed.bb
@@ -0,0 +1,11 @@
+[h2]check_channelallowed[/h2]
+
+Called when checking the channel (xchan) black and white lists to see if a channel is blocked.
+
+Hook data 
+
+	array('hash' => xchan_hash of xchan to check);
+
+	create and set array element 'allowed' to true or false to override the system checks
+
+
diff --git a/doc/hook/check_siteallowed.bb b/doc/hook/check_siteallowed.bb
new file mode 100644
index 000000000..28134cbd2
--- /dev/null
+++ b/doc/hook/check_siteallowed.bb
@@ -0,0 +1,10 @@
+[h2]check_siteallowed[/h2]
+
+Called when checking the site black and white lists to see if a site is blocked.
+
+Hook data 
+
+	array('url' => URL of site to check);
+
+	create and set array element 'allowed' to true or false to override the system checks
+
diff --git a/doc/hooklist.bb b/doc/hooklist.bb
index 45a4861d9..9172628a0 100644
--- a/doc/hooklist.bb
+++ b/doc/hooklist.bb
@@ -82,6 +82,12 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/check_account_password]check_account_password[/zrl]
 	Used to provide policy control over account passwords (minimum length, character set inclusion, etc.)
 
+[zrl=[baseurl]/help/hook/check_channelallowed]check_channelallowed[/zrl]
+	Used to over-ride or bypass the channel black/white block lists
+
+[zrl=[baseurl]/help/hook/check_siteallowed]check_siteallowed[/zrl]
+	Used to over-ride or bypass the site black/white block lists
+
 [zrl=[baseurl]/help/hook/connect_premium]connect_premium[/zrl]
 	Called when connecting to a premium channel
 
diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb
index b8a4e4eb5..99dd8f8f3 100644
--- a/doc/intro_for_developers.bb
+++ b/doc/intro_for_developers.bb
@@ -1,4 +1,4 @@
-[b]Red Developer Guide[/b]

+[b]$Projectname Developer Guide[/b]

 

 [b]File system layout:[/b]

 

@@ -63,13 +63,12 @@
     [li]item_id - other identifiers on other services for posts[/li]

     [li]likes - likes of 'things'[/li]

     [li]mail - private messages[/li]

-    [li]manage - may be unused in Red, table of accounts that can &quot;su&quot; each other[/li]

     [li]menu - channel menu data[/li]

     [li]menu_item - items uses by channel menus[/li]

     [li]notify - notifications[/li]

     [li]notify-threads - need to factor this out and use item thread info on notifications[/li]

     [li]obj - object data for things (x has y)[/li]

-    [li]outq - Red output queue[/li]

+    [li]outq - output queue[/li]

     [li]pconfig - personal (per channel) configuration storage[/li]

     [li]photo - photo storage[/li]

     [li]poll - data for polls[/li]

@@ -99,9 +98,9 @@
     [li]xtag - if this hub is a directory server, contains tags or interests of everybody in the network[/li]

 

     

-[b]How to theme Red - by Olivier Migeot[/b]

+[b]How to theme $Projectname - by Olivier Migeot[/b]

 

-This is a short documentation on what I found while trying to modify Red's appearance.

+This is a short documentation on what I found while trying to modify $Projectname's appearance.

 

 First, you'll need to create a new theme. This is in /view/theme, and I chose to copy 'redbasic' since it's the only available for now. Let's assume I named it .

 

diff --git a/doc/profiles.bb b/doc/profiles.bb
index cae51a9c6..513bf5fed 100644
--- a/doc/profiles.bb
+++ b/doc/profiles.bb
@@ -1,6 +1,6 @@
 [b]Profiles[/b]

 

-Red has unlimited profiles. You may use different profiles to show different &quot;sides of yourself&quot; to different audiences. This is different to having different channels. Different channels allow for completely different sets of information. You may have a channel for yourself, a channel for your sports team, a channel for your website, or whatever else. A profile allows for finely graded &quot;sides&quot; of each channel. For example, your default public profile might say &quot;Hello, I'm Fred, and I like laughing&quot;. You may show your close friends a profile that adds &quot;and I also enjoy dwarf tossing&quot;.

+$Projectname has unlimited profiles. You may use different profiles to show different &quot;sides of yourself&quot; to different audiences. This is different to having different channels. Different channels allow for completely different sets of information. You may have a channel for yourself, a channel for your sports team, a channel for your website, or whatever else. A profile allows for finely graded &quot;sides&quot; of each channel. For example, your default public profile might say &quot;Hello, I'm Fred, and I like laughing&quot;. You may show your close friends a profile that adds &quot;and I also enjoy dwarf tossing&quot;.

 

 You always have a profile known as your &quot;default&quot; or &quot;public&quot; profile. This profile is always available to the general public and cannot be hidden (there may be rare exceptions on privately run or disconnected sites). You may, and probably should restrict the information you make available on your public profile.

 

diff --git a/doc/registration.bb b/doc/registration.bb
index 31d696221..f656eeaa6 100644
--- a/doc/registration.bb
+++ b/doc/registration.bb
@@ -8,7 +8,7 @@ Please provide a valid email address. Your email address is never published. Thi
 

 [b]Password[/b]

 

-Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the $Projectname offers a decentralised identity, your account can log you in to many other websites.

+Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As $Projectname offers a decentralised identity, your account can log you in to many other websites.

 

 [b]Terms Of Service[/b]

 

@@ -25,7 +25,7 @@ Next, you will be presented with the &quot;Add a channel&quot; screen. Normally,
 When your channel is created you will be taken straight to your settings page where you can define permissions, enable features, etc. All these things are covered in the appropriate section of the helpfiles.

 

 See Also

-[zrl=[baseurl]/help/accounts_profiles_channels_basics]The Basics about Identities within the $Projectname[/zrl]

+[zrl=[baseurl]/help/accounts_profiles_channels_basics]The Basics about Identities within $Projectname[/zrl]

 [zrl=[baseurl]/help/accounts]Accounts[/zrl]

 [zrl=[baseurl]/help/profiles]Profiles[/zrl]

 [zrl=[baseurl]/help/permissions]Permissions[/zrl]

diff --git a/hubzilla_er/anomalies.html b/hubzilla_er/anomalies.html
deleted file mode 100644
index e911fc65b..000000000
--- a/hubzilla_er/anomalies.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - zot - Anomalies</title>
-  <link rel=stylesheet href='schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='schemaSpy.js'></SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li id='current'><a href='anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>SchemaSpy Analysis of <span title='Database'>zot</span> - Anomalies</span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%'>
-  <tr><td class='container' align='right' valign='top' colspan='2'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td></tr>
-<tr>
-<td class='container'><b>Things that might not be 'quite right' about your schema:</b></td>
-<td class='container' align='right'>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-</td></tr></table>
-<ul>
-<li>
-<b>Columns whose name and type imply a relationship to another table's primary key:</b>
-<table class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<thead align='left'>
-<tr>
-  <th>Child Column</th>
-  <th>Implied Parent Column</th>
-</tr>
-</thead>
-<tbody>
- <tr>
-  <td class='detail'><a href='tables/addon.html'>addon</a>.id</td>
-  <td class='detail'><a href='tables/notify.html'>notify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/app.html'>app</a>.id</td>
-  <td class='detail'><a href='tables/notify.html'>notify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/attach.html'>attach</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a>.client_id</td>
-  <td class='detail'><a href='tables/clients.html'>clients</a>.client_id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a>.id</td>
-  <td class='detail'><a href='tables/tokens.html'>tokens</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/config.html'>config</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/config.html'>config</a>.k</td>
-  <td class='detail'><a href='tables/cache.html'>cache</a>.k</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/conv.html'>conv</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/event.html'>event</a>.id</td>
-  <td class='detail'><a href='tables/notify.html'>notify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/fcontact.html'>fcontact</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/ffinder.html'>ffinder</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/fserver.html'>fserver</a>.id</td>
-  <td class='detail'><a href='tables/notify.html'>notify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a>.id</td>
-  <td class='detail'><a href='tables/notify.html'>notify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/group_member.html'>group_member</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/groups.html'>groups</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/hook.html'>hook</a>.id</td>
-  <td class='detail'><a href='tables/notify.html'>notify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/item.html'>item</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/item_id.html'>item_id</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/likes.html'>likes</a>.channel_id</td>
-  <td class='detail'><a href='tables/channel.html'>channel</a>.channel_id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/likes.html'>likes</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/mail.html'>mail</a>.account_id</td>
-  <td class='detail'><a href='tables/account.html'>account</a>.account_id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/mail.html'>mail</a>.channel_id</td>
-  <td class='detail'><a href='tables/channel.html'>channel</a>.channel_id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/mail.html'>mail</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/manage.html'>manage</a>.id</td>
-  <td class='detail'><a href='tables/notify.html'>notify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/pconfig.html'>pconfig</a>.id</td>
-  <td class='detail'><a href='tables/notify.html'>notify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/pconfig.html'>pconfig</a>.k</td>
-  <td class='detail'><a href='tables/cache.html'>cache</a>.k</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/photo.html'>photo</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/profdef.html'>profdef</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/profext.html'>profext</a>.channel_id</td>
-  <td class='detail'><a href='tables/channel.html'>channel</a>.channel_id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/profext.html'>profext</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/profext.html'>profext</a>.k</td>
-  <td class='detail'><a href='tables/cache.html'>cache</a>.k</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/profile.html'>profile</a>.id</td>
-  <td class='detail'><a href='tables/notify.html'>notify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/profile_check.html'>profile_check</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/register.html'>register</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/sign.html'>sign</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/spam.html'>spam</a>.id</td>
-  <td class='detail'><a href='tables/notify.html'>notify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a>.k</td>
-  <td class='detail'><a href='tables/cache.html'>cache</a>.k</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/tokens.html'>tokens</a>.client_id</td>
-  <td class='detail'><a href='tables/clients.html'>clients</a>.client_id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/xconfig.html'>xconfig</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/xconfig.html'>xconfig</a>.k</td>
-  <td class='detail'><a href='tables/cache.html'>cache</a>.k</td>
- </tr>
- <tr>
-  <td class='detail'><a href='tables/xign.html'>xign</a>.id</td>
-  <td class='detail'><a href='tables/verify.html'>verify</a>.id</td>
- </tr>
-</tbody>
-</table>
-42 instances of anomaly detected<p></li>
-<li>
-<b>Tables without indexes:</b>
-<br>Anomaly not detected<p></li>
-<li>
-<b>Columns that are flagged as both 'nullable' and 'must be unique':</b>
-<br>Anomaly not detected<p></li>
-<li>
-<b>Tables that contain a single column:</b><br>Anomaly not detected<p></li>
-<li>
-<b>Tables with incrementing column names, potentially indicating denormalization:</b>
-<br>Anomaly not detected<p></li>
-<li>
-<b>Columns whose default value is the word 'NULL' or 'null', but the SQL NULL value may have been intended:</b>
-<br>Anomaly not detected<p></li>
-</ul>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/columns.byAuto.html b/hubzilla_er/columns.byAuto.html
deleted file mode 100644
index f8d951d19..000000000
--- a/hubzilla_er/columns.byAuto.html
+++ /dev/null
@@ -1,7153 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - zot - Columns</title>
-  <link rel=stylesheet href='schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='schemaSpy.js'></SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li id='current'><a href='columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>SchemaSpy Analysis of <span title='Database'>zot</span> - Columns</span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr><td class='container'>
-<span class='container'>Generated by <span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span> on on aug 19 21:08 CEST 2015</span>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td></tr>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<p>
-<form name='options' action=''>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</table>
-<div class='indent'>
-<b>zot contains 705 columns</b> - click on heading to sort:<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th class='notSortedByColumn'><a href='columns.byTable.html#columns'><span class='notSortedByColumn'>Table</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.byColumn.html#columns'><span class='notSortedByColumn'>Column</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.byType.html#columns'><span class='notSortedByColumn'>Type</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.bySize.html#columns'><span class='notSortedByColumn'>Size</span></a></th>
-  <th title='Are nulls allowed?' class='notSortedByColumn'><a href='columns.byNulls.html#columns'><span class='notSortedByColumn'>Nulls</span></a></th>
-  <th title='Is column automatically updated?' class='sortedByColumn'>Auto</th>
-  <th title='Default value' class='notSortedByColumn'><a href='columns.byDefault.html#columns'><span class='notSortedByColumn'>Default</span></a></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='primaryKey' title='Primary Key'>abook_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='primaryKey' title='Primary Key'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='primaryKey' title='Primary Key'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='primaryKey' title='Primary Key'>chat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='primaryKey' title='Primary Key'>cp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='primaryKey' title='Primary Key'>cr_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='primaryKey' title='Primary Key'>hubloc_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='primaryKey' title='Primary Key'>issue_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='primaryKey' title='Primary Key'>menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='primaryKey' title='Primary Key'>mitem_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='primaryKey' title='Primary Key'>obj_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='primaryKey' title='Primary Key'>pelm_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='primaryKey' title='Primary Key'>poll_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='primaryKey' title='Primary Key'>share_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='primaryKey' title='Primary Key'>src_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='primaryKey' title='Primary Key'>tid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='primaryKey' title='Primary Key'>ud_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='primaryKey' title='Primary Key'>vote_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='primaryKey' title='Primary Key'>xchat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='primaryKey' title='Primary Key'>xlink_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='primaryKey' title='Primary Key'>xp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='primaryKey' title='Primary Key'>xtag_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_archived</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_blocked</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_closeness</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>99</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_dob</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_excl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_feed</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_hidden</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_ignored</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_incl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_my_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_pending</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_profile</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_self</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_their_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_unconnected</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_default_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_email</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_expire_notified</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_external</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>en</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_lastlog</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_level</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_password_changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_roles</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_salt</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_service_class</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>adjust</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>1</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>album</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>alias</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>app</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_author</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_channel</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_price</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_requires</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_sig</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>author_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>batch</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>book</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>chandesc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_delegate</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_republish</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_default_group</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_deleted</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_dirdate</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_expire_days</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_lastpost</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_anon_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_friend_req</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_notifyflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>65535</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_pageflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_passwd_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_prvkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_abook</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_profile</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_removed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_startpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_theme</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_timezone</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_chat</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_comment</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_like</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_tagwall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_wall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>channels</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='detail'>chat_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>cid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='primaryKey' title='Primary Key'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comment_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>commented</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comments_closed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>confirm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>contact</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>convid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>coord</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>country_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='detail'>cp_client</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_expire</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>data</td>
- <td class='detail'>longblob</td>
- <td class='detail' align='right'>2147483647</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>data</td>
- <td class='detail'>mediumblob</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='detail'>data</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='detail'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>dfrn_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>diaspora_meta</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dislikes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob_tz</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>education</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_percent</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_repeat</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_sequence</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_status_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>expires</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>fid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_help</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_inputs</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='indexedColumn' title='Indexed'>field_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>file</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filesize</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>film</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>finish</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>folder</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>from_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>function</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>gid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>ham</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>height</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hide_friends</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='indexedColumn' title='Indexed'>hook</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>howlong</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>html</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_callback</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connect</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_error</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_host</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_orphancheck</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_sitekey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_status</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_url_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>icon</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>ignore</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>imgurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>installed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>interest</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>is_default</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_dir</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>is_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_photo</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_assigned</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_component</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_priority</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_status</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_blocked</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_consensus</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_delayed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_mentionsme</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nocomment</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_notshown</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_obscured</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_origin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_pending_remove</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_private</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_relay</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_restrict</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_retained</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_rss</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_starred</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_thread_top</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unpublished</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unseen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_uplink</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_verified</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_wall</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='primaryKey' title='Primary Key'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='detail'>key</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>lang</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>layout_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>likee</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>liker</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>likes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>llink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>locality</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>location</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_deleted</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_isreply</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_obscured</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_recalled</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_replied</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_seen</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='detail'>menu_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>meta</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_order</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>music</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>name</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>nick</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>nofinish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>note</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>notify</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_obj</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>obj_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_type</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>object</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>oid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_async</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_delivered</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_driver</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='primaryKey' title='Primary Key'>outq_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_notify</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_priority</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>owner_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>parent_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>pdesc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_poll</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_result</td>
- <td class='detail'>float</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_usage</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>plink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>plugin_admin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>politic</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>poll</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='detail'>poll_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_votes</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>postal_code</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>postopts</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>profile</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>profile_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>profile_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>public_perm</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>public_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>publish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>pw</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>received</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>recips</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>religion</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>resource_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>retract_iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>romance</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>route</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>scale</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>250</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>sec</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>secret</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>seen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>server</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>service</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_target</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signature</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signed_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signer</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_access</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_dead</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_directory</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_pull</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_realm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_register</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_sellpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_sync</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_update</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='primaryKey' title='Primary Key'>site_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_valid</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>size</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>source_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>spam</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='detail'>src_patt</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>start</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>subject</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>target</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='detail'>target</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>tgt_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>thr_parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>thumb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>timestamp</td>
- <td class='detail'>bigint</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>title</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>to_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>token</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>tv</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>visible</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_element</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_poll</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='detail'>vote_result</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>width</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>with</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>work</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_censored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_connpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_connurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_follow</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='primaryKey' title='Primary Key'>xchan_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_instance_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_name_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_orphan</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_l</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_m</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_s</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_pubforum</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_selfcensored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_rating</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_rating_text</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_static</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_client</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_perm</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_age</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_country</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='primaryKey' title='Primary Key'>xprof_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_locale</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_postcode</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/columns.byColumn.html b/hubzilla_er/columns.byColumn.html
deleted file mode 100644
index 1e89008af..000000000
--- a/hubzilla_er/columns.byColumn.html
+++ /dev/null
@@ -1,7153 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - zot - Columns</title>
-  <link rel=stylesheet href='schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='schemaSpy.js'></SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li id='current'><a href='columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>SchemaSpy Analysis of <span title='Database'>zot</span> - Columns</span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr><td class='container'>
-<span class='container'>Generated by <span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span> on on aug 19 21:08 CEST 2015</span>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td></tr>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<p>
-<form name='options' action=''>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</table>
-<div class='indent'>
-<b>zot contains 705 columns</b> - click on heading to sort:<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th class='notSortedByColumn'><a href='columns.byTable.html#columns'><span class='notSortedByColumn'>Table</span></a></th>
-  <th class='sortedByColumn'>Column</th>
-  <th class='notSortedByColumn'><a href='columns.byType.html#columns'><span class='notSortedByColumn'>Type</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.bySize.html#columns'><span class='notSortedByColumn'>Size</span></a></th>
-  <th title='Are nulls allowed?' class='notSortedByColumn'><a href='columns.byNulls.html#columns'><span class='notSortedByColumn'>Nulls</span></a></th>
-  <th title='Is column automatically updated?' class='notSortedByColumn'><a href='columns.byAuto.html#columns'><span class='notSortedByColumn'>Auto</span></a></th>
-  <th title='Default value' class='notSortedByColumn'><a href='columns.byDefault.html#columns'><span class='notSortedByColumn'>Default</span></a></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_archived</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_blocked</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_closeness</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>99</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_dob</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_excl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_feed</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_hidden</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='primaryKey' title='Primary Key'>abook_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_ignored</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_incl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_my_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_pending</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_profile</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_self</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_their_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_unconnected</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_default_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_email</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_expire_notified</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_external</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='primaryKey' title='Primary Key'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>en</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_lastlog</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_level</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_password_changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_roles</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_salt</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_service_class</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>adjust</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>1</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>album</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>alias</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>app</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_author</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_channel</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_price</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_requires</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_sig</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>author_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>batch</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>book</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>chandesc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_delegate</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_republish</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_default_group</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_deleted</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_dirdate</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_expire_days</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='primaryKey' title='Primary Key'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_lastpost</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_anon_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_friend_req</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_notifyflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>65535</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_pageflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_passwd_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_prvkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_abook</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_profile</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_removed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_startpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_theme</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_timezone</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_chat</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_comment</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_like</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_tagwall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_wall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>channels</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='primaryKey' title='Primary Key'>chat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='detail'>chat_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>cid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='primaryKey' title='Primary Key'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comment_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>commented</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comments_closed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>confirm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>contact</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>convid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>coord</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>country_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='detail'>cp_client</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='primaryKey' title='Primary Key'>cp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_expire</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='primaryKey' title='Primary Key'>cr_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>data</td>
- <td class='detail'>longblob</td>
- <td class='detail' align='right'>2147483647</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>data</td>
- <td class='detail'>mediumblob</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='detail'>data</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='detail'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>dfrn_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>diaspora_meta</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dislikes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob_tz</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>education</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_percent</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_repeat</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_sequence</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_status_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>expires</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>fid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_help</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_inputs</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='indexedColumn' title='Indexed'>field_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>file</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filesize</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>film</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>finish</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>folder</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>from_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>function</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>gid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>ham</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>height</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hide_friends</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='indexedColumn' title='Indexed'>hook</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>howlong</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>html</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_callback</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connect</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_error</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_host</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='primaryKey' title='Primary Key'>hubloc_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_orphancheck</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_sitekey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_status</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_url_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>icon</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>ignore</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>imgurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>installed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>interest</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>is_default</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_dir</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>is_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_photo</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_assigned</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_component</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='primaryKey' title='Primary Key'>issue_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_priority</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_status</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_blocked</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_consensus</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_delayed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_mentionsme</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nocomment</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_notshown</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_obscured</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_origin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_pending_remove</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_private</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_relay</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_restrict</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_retained</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_rss</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_starred</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_thread_top</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unpublished</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unseen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_uplink</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_verified</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_wall</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='primaryKey' title='Primary Key'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='detail'>key</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>lang</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>layout_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>likee</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>liker</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>likes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>llink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>locality</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>location</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_deleted</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_isreply</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_obscured</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_recalled</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_replied</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_seen</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='detail'>menu_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='primaryKey' title='Primary Key'>menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>meta</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='primaryKey' title='Primary Key'>mitem_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_order</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>music</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>name</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>nick</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>nofinish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>note</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>notify</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='primaryKey' title='Primary Key'>obj_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_obj</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>obj_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_type</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>object</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>oid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_async</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_delivered</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_driver</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='primaryKey' title='Primary Key'>outq_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_notify</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_priority</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>owner_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>parent_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>pdesc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='primaryKey' title='Primary Key'>pelm_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_poll</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_result</td>
- <td class='detail'>float</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_usage</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>plink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>plugin_admin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>politic</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>poll</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='detail'>poll_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='primaryKey' title='Primary Key'>poll_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_votes</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>postal_code</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>postopts</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>profile</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>profile_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>profile_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>public_perm</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>public_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>publish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>pw</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>received</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>recips</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>religion</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>resource_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>retract_iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>romance</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>route</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>scale</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>250</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>sec</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>secret</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>seen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>server</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>service</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='primaryKey' title='Primary Key'>share_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_target</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signature</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signed_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signer</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_access</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_dead</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_directory</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_pull</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_realm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_register</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_sellpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_sync</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_update</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='primaryKey' title='Primary Key'>site_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_valid</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>size</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>source_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>spam</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='primaryKey' title='Primary Key'>src_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='detail'>src_patt</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>start</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>subject</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>target</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='detail'>target</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>tgt_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>thr_parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>thumb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='primaryKey' title='Primary Key'>tid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>timestamp</td>
- <td class='detail'>bigint</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>title</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>to_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>token</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>tv</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='primaryKey' title='Primary Key'>ud_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>visible</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_element</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='primaryKey' title='Primary Key'>vote_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_poll</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='detail'>vote_result</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>width</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>with</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>work</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_censored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_connpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_connurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_follow</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='primaryKey' title='Primary Key'>xchan_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_instance_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_name_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_orphan</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_l</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_m</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_s</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_pubforum</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_selfcensored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='primaryKey' title='Primary Key'>xchat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='primaryKey' title='Primary Key'>xlink_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_rating</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_rating_text</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_static</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_client</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='primaryKey' title='Primary Key'>xp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_perm</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_age</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_country</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='primaryKey' title='Primary Key'>xprof_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_locale</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_postcode</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='primaryKey' title='Primary Key'>xtag_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/columns.byDefault.html b/hubzilla_er/columns.byDefault.html
deleted file mode 100644
index 6913d1c9f..000000000
--- a/hubzilla_er/columns.byDefault.html
+++ /dev/null
@@ -1,7153 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - zot - Columns</title>
-  <link rel=stylesheet href='schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='schemaSpy.js'></SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li id='current'><a href='columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>SchemaSpy Analysis of <span title='Database'>zot</span> - Columns</span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr><td class='container'>
-<span class='container'>Generated by <span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span> on on aug 19 21:08 CEST 2015</span>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td></tr>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<p>
-<form name='options' action=''>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</table>
-<div class='indent'>
-<b>zot contains 705 columns</b> - click on heading to sort:<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th class='notSortedByColumn'><a href='columns.byTable.html#columns'><span class='notSortedByColumn'>Table</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.byColumn.html#columns'><span class='notSortedByColumn'>Column</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.byType.html#columns'><span class='notSortedByColumn'>Type</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.bySize.html#columns'><span class='notSortedByColumn'>Size</span></a></th>
-  <th title='Are nulls allowed?' class='notSortedByColumn'><a href='columns.byNulls.html#columns'><span class='notSortedByColumn'>Nulls</span></a></th>
-  <th title='Is column automatically updated?' class='notSortedByColumn'><a href='columns.byAuto.html#columns'><span class='notSortedByColumn'>Auto</span></a></th>
-  <th title='Default value' class='sortedByColumn'>Default</th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_profile</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_email</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_external</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_salt</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_service_class</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>album</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>app</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_author</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_price</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_requires</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_sig</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>author_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_default_group</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_passwd_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_startpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_theme</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='primaryKey' title='Primary Key'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comment_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>coord</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>country_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='detail'>cp_client</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>dfrn_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_help</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='indexedColumn' title='Indexed'>field_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>file</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>folder</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>from_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>function</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='indexedColumn' title='Indexed'>hook</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_callback</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connect</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_host</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>imgurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_assigned</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_component</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='primaryKey' title='Primary Key'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>lang</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>layout_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>likee</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>liker</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>llink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>locality</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='detail'>menu_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>meta</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_obj</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>obj_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_driver</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>owner_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>parent_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>pdesc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>plink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>politic</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>postal_code</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>profile_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>profile_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>public_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>pw</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>religion</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>resource_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>250</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>sec</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>server</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>service</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signer</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_directory</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_realm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_sellpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>source_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>tgt_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>thr_parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>thumb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>title</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>to_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>token</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_connpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_connurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_follow</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_instance_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_l</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_m</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_s</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_client</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_perm</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_country</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_locale</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_postcode</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_archived</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_blocked</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_feed</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_hidden</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_ignored</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_my_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_pending</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_self</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_their_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_unconnected</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_default_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_level</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_roles</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_channel</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_delegate</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_republish</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_expire_days</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_pageflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_abook</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_profile</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_removed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_chat</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_comment</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_like</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_tagwall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_wall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>cid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>convid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_expire</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_percent</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_sequence</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>expires</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filesize</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>gid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>ham</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>height</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hide_friends</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_error</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_orphancheck</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_status</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>ignore</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>installed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>is_default</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_dir</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>is_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_photo</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_priority</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_status</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_blocked</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_consensus</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_delayed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_mentionsme</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nocomment</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_notshown</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_obscured</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_origin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_pending_remove</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_private</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_relay</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_restrict</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_retained</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_rss</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_starred</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_thread_top</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unpublished</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unseen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_uplink</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_verified</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_wall</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_deleted</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_isreply</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_obscured</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_recalled</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_replied</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_seen</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_order</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>nofinish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_type</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>oid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_async</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_delivered</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_priority</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_poll</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_result</td>
- <td class='detail'>float</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_usage</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>plugin_admin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_votes</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>profile</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>public_perm</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>publish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>retract_iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>scale</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>seen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_target</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_access</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_dead</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_register</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_valid</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>size</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>spam</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>timestamp</td>
- <td class='detail'>bigint</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>visible</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_element</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_poll</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>width</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_censored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_orphan</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_pubforum</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_selfcensored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_rating</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_static</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_age</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_dob</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_expire_notified</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_lastlog</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_password_changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_deleted</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_dirdate</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_lastpost</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>commented</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comments_closed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='detail'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_status_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>finish</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>howlong</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>received</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_pull</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_sync</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_update</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>start</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_name_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>adjust</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>1</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_anon_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_friend_req</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_notifyflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>65535</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_closeness</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>99</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>en</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_excl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='primaryKey' title='Primary Key'>abook_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_incl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='primaryKey' title='Primary Key'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>alias</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>batch</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>book</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>chandesc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='primaryKey' title='Primary Key'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_prvkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>channels</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='primaryKey' title='Primary Key'>chat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='detail'>chat_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>confirm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>contact</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='primaryKey' title='Primary Key'>cp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='primaryKey' title='Primary Key'>cr_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>data</td>
- <td class='detail'>longblob</td>
- <td class='detail' align='right'>2147483647</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>data</td>
- <td class='detail'>mediumblob</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='detail'>data</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>diaspora_meta</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dislikes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>education</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_repeat</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>fid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_inputs</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>film</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>html</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='primaryKey' title='Primary Key'>hubloc_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_sitekey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_url_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>icon</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>interest</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='primaryKey' title='Primary Key'>issue_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='detail'>key</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>likes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>location</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='primaryKey' title='Primary Key'>menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='primaryKey' title='Primary Key'>mitem_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>music</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>name</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>nick</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>note</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>notify</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='primaryKey' title='Primary Key'>obj_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>object</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='primaryKey' title='Primary Key'>outq_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_notify</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='primaryKey' title='Primary Key'>pelm_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>poll</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='detail'>poll_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='primaryKey' title='Primary Key'>poll_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>postopts</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>recips</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>romance</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>route</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>secret</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='primaryKey' title='Primary Key'>share_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signature</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signed_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='primaryKey' title='Primary Key'>site_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='primaryKey' title='Primary Key'>src_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='detail'>src_patt</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>subject</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>target</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='detail'>target</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='primaryKey' title='Primary Key'>tid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>tv</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='primaryKey' title='Primary Key'>ud_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='primaryKey' title='Primary Key'>vote_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='detail'>vote_result</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>with</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>work</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='primaryKey' title='Primary Key'>xchan_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='primaryKey' title='Primary Key'>xchat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='primaryKey' title='Primary Key'>xlink_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_rating_text</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='primaryKey' title='Primary Key'>xp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='primaryKey' title='Primary Key'>xprof_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='primaryKey' title='Primary Key'>xtag_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_timezone</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob_tz</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/columns.byNulls.html b/hubzilla_er/columns.byNulls.html
deleted file mode 100644
index bcbf1e3e6..000000000
--- a/hubzilla_er/columns.byNulls.html
+++ /dev/null
@@ -1,7153 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - zot - Columns</title>
-  <link rel=stylesheet href='schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='schemaSpy.js'></SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li id='current'><a href='columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>SchemaSpy Analysis of <span title='Database'>zot</span> - Columns</span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr><td class='container'>
-<span class='container'>Generated by <span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span> on on aug 19 21:08 CEST 2015</span>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td></tr>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<p>
-<form name='options' action=''>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</table>
-<div class='indent'>
-<b>zot contains 705 columns</b> - click on heading to sort:<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th class='notSortedByColumn'><a href='columns.byTable.html#columns'><span class='notSortedByColumn'>Table</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.byColumn.html#columns'><span class='notSortedByColumn'>Column</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.byType.html#columns'><span class='notSortedByColumn'>Type</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.bySize.html#columns'><span class='notSortedByColumn'>Size</span></a></th>
-  <th title='Are nulls allowed?' class='sortedByColumn'>Nulls</th>
-  <th title='Is column automatically updated?' class='notSortedByColumn'><a href='columns.byAuto.html#columns'><span class='notSortedByColumn'>Auto</span></a></th>
-  <th title='Default value' class='notSortedByColumn'><a href='columns.byDefault.html#columns'><span class='notSortedByColumn'>Default</span></a></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>icon</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>name</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_archived</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_blocked</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_closeness</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>99</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_dob</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_excl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_feed</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_hidden</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='primaryKey' title='Primary Key'>abook_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_ignored</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_incl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_my_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_pending</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_profile</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_self</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_their_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_unconnected</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_default_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_email</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_expire_notified</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_external</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='primaryKey' title='Primary Key'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>en</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_lastlog</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_level</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_password_changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_roles</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_salt</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_service_class</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>adjust</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>1</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>album</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>alias</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>app</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_author</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_channel</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_price</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_requires</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_sig</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>author_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>batch</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>book</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>chandesc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_delegate</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_republish</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_default_group</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_deleted</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_dirdate</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_expire_days</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='primaryKey' title='Primary Key'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_lastpost</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_anon_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_friend_req</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_notifyflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>65535</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_pageflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_passwd_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_prvkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_abook</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_profile</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_removed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_startpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_theme</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_timezone</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_chat</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_comment</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_like</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_tagwall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_wall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>channels</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='primaryKey' title='Primary Key'>chat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='detail'>chat_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>cid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='primaryKey' title='Primary Key'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comment_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>commented</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comments_closed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>confirm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>contact</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>convid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>coord</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>country_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='detail'>cp_client</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='primaryKey' title='Primary Key'>cp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_expire</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='primaryKey' title='Primary Key'>cr_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>data</td>
- <td class='detail'>longblob</td>
- <td class='detail' align='right'>2147483647</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>data</td>
- <td class='detail'>mediumblob</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='detail'>data</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='detail'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>dfrn_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>diaspora_meta</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dislikes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob_tz</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>education</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_percent</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_repeat</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_sequence</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_status_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>expires</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>fid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_help</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_inputs</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='indexedColumn' title='Indexed'>field_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>file</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filesize</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>film</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>finish</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>folder</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>from_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>function</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>gid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>ham</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>height</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hide_friends</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='indexedColumn' title='Indexed'>hook</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>howlong</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>html</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_callback</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connect</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_error</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_host</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='primaryKey' title='Primary Key'>hubloc_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_orphancheck</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_sitekey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_status</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_url_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>ignore</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>imgurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>installed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>interest</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>is_default</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_dir</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>is_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_photo</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_assigned</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_component</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='primaryKey' title='Primary Key'>issue_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_priority</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_status</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_blocked</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_consensus</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_delayed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_mentionsme</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nocomment</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_notshown</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_obscured</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_origin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_pending_remove</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_private</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_relay</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_restrict</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_retained</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_rss</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_starred</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_thread_top</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unpublished</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unseen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_uplink</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_verified</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_wall</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='primaryKey' title='Primary Key'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='detail'>key</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>lang</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>layout_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>likee</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>liker</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>likes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>llink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>locality</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>location</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_deleted</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_isreply</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_obscured</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_recalled</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_replied</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_seen</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='detail'>menu_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='primaryKey' title='Primary Key'>menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>meta</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='primaryKey' title='Primary Key'>mitem_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_order</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>music</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>nick</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>nofinish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>note</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>notify</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='primaryKey' title='Primary Key'>obj_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_obj</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>obj_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_type</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>object</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>oid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_async</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_delivered</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_driver</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='primaryKey' title='Primary Key'>outq_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_notify</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_priority</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>owner_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>parent_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>pdesc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='primaryKey' title='Primary Key'>pelm_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_poll</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_result</td>
- <td class='detail'>float</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_usage</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>plink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>plugin_admin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>politic</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>poll</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='detail'>poll_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='primaryKey' title='Primary Key'>poll_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_votes</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>postal_code</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>postopts</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>profile</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>profile_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>profile_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>public_perm</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>public_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>publish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>pw</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>received</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>recips</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>religion</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>resource_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>retract_iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>romance</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>route</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>scale</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>250</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>sec</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>secret</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>seen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>server</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>service</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='primaryKey' title='Primary Key'>share_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_target</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signature</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signed_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signer</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_access</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_dead</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_directory</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_pull</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_realm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_register</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_sellpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_sync</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_update</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='primaryKey' title='Primary Key'>site_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_valid</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>size</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>source_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>spam</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='primaryKey' title='Primary Key'>src_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='detail'>src_patt</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>start</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>subject</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>target</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='detail'>target</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>tgt_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>thr_parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>thumb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='primaryKey' title='Primary Key'>tid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>timestamp</td>
- <td class='detail'>bigint</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>title</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>to_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>token</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>tv</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='primaryKey' title='Primary Key'>ud_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>visible</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_element</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='primaryKey' title='Primary Key'>vote_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_poll</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='detail'>vote_result</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>width</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>with</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>work</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_censored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_connpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_connurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_follow</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='primaryKey' title='Primary Key'>xchan_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_instance_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_name_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_orphan</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_l</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_m</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_s</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_pubforum</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_selfcensored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='primaryKey' title='Primary Key'>xchat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='primaryKey' title='Primary Key'>xlink_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_rating</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_rating_text</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_static</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_client</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='primaryKey' title='Primary Key'>xp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_perm</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_age</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_country</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='primaryKey' title='Primary Key'>xprof_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_locale</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_postcode</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='primaryKey' title='Primary Key'>xtag_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/columns.bySize.html b/hubzilla_er/columns.bySize.html
deleted file mode 100644
index 98b0408b3..000000000
--- a/hubzilla_er/columns.bySize.html
+++ /dev/null
@@ -1,7153 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - zot - Columns</title>
-  <link rel=stylesheet href='schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='schemaSpy.js'></SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li id='current'><a href='columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>SchemaSpy Analysis of <span title='Database'>zot</span> - Columns</span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr><td class='container'>
-<span class='container'>Generated by <span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span> on on aug 19 21:08 CEST 2015</span>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td></tr>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<p>
-<form name='options' action=''>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</table>
-<div class='indent'>
-<b>zot contains 705 columns</b> - click on heading to sort:<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th class='notSortedByColumn'><a href='columns.byTable.html#columns'><span class='notSortedByColumn'>Table</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.byColumn.html#columns'><span class='notSortedByColumn'>Column</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.byType.html#columns'><span class='notSortedByColumn'>Type</span></a></th>
-  <th class='sortedByColumn'>Size</th>
-  <th title='Are nulls allowed?' class='notSortedByColumn'><a href='columns.byNulls.html#columns'><span class='notSortedByColumn'>Nulls</span></a></th>
-  <th title='Is column automatically updated?' class='notSortedByColumn'><a href='columns.byAuto.html#columns'><span class='notSortedByColumn'>Auto</span></a></th>
-  <th title='Default value' class='notSortedByColumn'><a href='columns.byDefault.html#columns'><span class='notSortedByColumn'>Default</span></a></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>adjust</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>1</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_removed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hide_friends</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_error</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_orphancheck</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>ignore</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>installed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>is_default</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_dir</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>is_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_photo</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_blocked</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_consensus</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_delayed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_mentionsme</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nocomment</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_notshown</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_obscured</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_origin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_pending_remove</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_private</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_relay</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_retained</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_rss</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_starred</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_thread_top</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unpublished</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unseen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_uplink</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_verified</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_wall</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>nofinish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_async</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_delivered</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>plugin_admin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>profile</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>public_perm</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>publish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>seen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>visible</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_censored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_orphan</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_pubforum</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_selfcensored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_static</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_archived</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_blocked</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_closeness</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>99</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_feed</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_hidden</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_ignored</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_pending</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_self</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_unconnected</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_deleted</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_isreply</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_recalled</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_replied</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_seen</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>scale</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_age</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_percent</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_sequence</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>height</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_obscured</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_priority</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_usage</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_dead</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_valid</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>width</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='primaryKey' title='Primary Key'>abook_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_my_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_their_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_default_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='primaryKey' title='Primary Key'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_level</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_roles</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_channel</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_delegate</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_republish</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_expire_days</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='primaryKey' title='Primary Key'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_anon_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_friend_req</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_notifyflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>65535</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_pageflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_abook</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_profile</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_chat</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_comment</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_like</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_tagwall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_wall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='primaryKey' title='Primary Key'>chat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>cid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>convid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='primaryKey' title='Primary Key'>cp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_expire</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='primaryKey' title='Primary Key'>cr_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>expires</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>fid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filesize</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>gid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>ham</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='primaryKey' title='Primary Key'>hubloc_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_status</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='primaryKey' title='Primary Key'>issue_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_priority</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_status</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_restrict</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='primaryKey' title='Primary Key'>menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='primaryKey' title='Primary Key'>mitem_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_order</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='primaryKey' title='Primary Key'>obj_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_type</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>oid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='primaryKey' title='Primary Key'>pelm_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_poll</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='primaryKey' title='Primary Key'>poll_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_votes</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>retract_iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='primaryKey' title='Primary Key'>share_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_target</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_access</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_register</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>size</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>spam</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='primaryKey' title='Primary Key'>src_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='primaryKey' title='Primary Key'>tid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='primaryKey' title='Primary Key'>ud_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_element</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='primaryKey' title='Primary Key'>vote_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_poll</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='primaryKey' title='Primary Key'>xchat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='primaryKey' title='Primary Key'>xlink_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_rating</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='primaryKey' title='Primary Key'>xp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='primaryKey' title='Primary Key'>xtag_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_result</td>
- <td class='detail'>float</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>en</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>resource_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_dob</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_expire_notified</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_lastlog</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_password_changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_deleted</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_dirdate</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_lastpost</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>commented</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comments_closed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='detail'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_status_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>finish</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>howlong</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>received</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_pull</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_sync</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_update</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>start</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>timestamp</td>
- <td class='detail'>bigint</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_name_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='primaryKey' title='Primary Key'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>pw</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_client</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_salt</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_service_class</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_driver</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>postal_code</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_postcode</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_profile</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>folder</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>lang</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>profile_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_perm</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_timezone</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='detail'>cp_client</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>likee</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>liker</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>250</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_email</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_external</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>album</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>alias</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>app</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_author</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_price</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_requires</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_sig</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>author_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>batch</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_default_group</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_passwd_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_startpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_theme</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comment_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>confirm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>coord</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>country_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>dfrn_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob_tz</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_help</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='indexedColumn' title='Indexed'>field_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>file</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>from_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>function</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='indexedColumn' title='Indexed'>hook</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_callback</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connect</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_host</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>imgurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_assigned</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_component</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='primaryKey' title='Primary Key'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>layout_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>llink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>locality</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='detail'>menu_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>meta</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>nick</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>notify</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_obj</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>obj_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='primaryKey' title='Primary Key'>outq_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>owner_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>parent_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>pdesc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>plink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>politic</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>poll</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>profile_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>public_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>religion</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>sec</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>server</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>service</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signer</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_directory</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_realm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_sellpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='primaryKey' title='Primary Key'>site_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>source_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>tgt_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>thr_parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>thumb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>title</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>to_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>token</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_connpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_connurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_follow</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='primaryKey' title='Primary Key'>xchan_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_instance_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_l</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_m</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_s</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_country</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='primaryKey' title='Primary Key'>xprof_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_locale</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_excl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_incl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>book</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>chandesc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_prvkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>channels</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>contact</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='detail'>data</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dislikes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>education</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_repeat</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>film</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_sitekey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_url_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>icon</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>interest</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='detail'>key</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>likes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>location</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>music</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>name</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>note</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>object</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='detail'>poll_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>postopts</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>romance</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>route</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>secret</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signature</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>target</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>tv</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='detail'>vote_result</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>with</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>work</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_rating_text</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='detail'>chat_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>data</td>
- <td class='detail'>mediumblob</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>diaspora_meta</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_inputs</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>html</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_notify</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>recips</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signed_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='detail'>src_patt</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>subject</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='detail'>target</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>data</td>
- <td class='detail'>longblob</td>
- <td class='detail' align='right'>2147483647</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/columns.byTable.html b/hubzilla_er/columns.byTable.html
deleted file mode 100644
index 5bf52c043..000000000
--- a/hubzilla_er/columns.byTable.html
+++ /dev/null
@@ -1,7153 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - zot - Columns</title>
-  <link rel=stylesheet href='schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='schemaSpy.js'></SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li id='current'><a href='columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>SchemaSpy Analysis of <span title='Database'>zot</span> - Columns</span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr><td class='container'>
-<span class='container'>Generated by <span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span> on on aug 19 21:08 CEST 2015</span>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td></tr>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<p>
-<form name='options' action=''>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</table>
-<div class='indent'>
-<b>zot contains 705 columns</b> - click on heading to sort:<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th class='sortedByColumn'>Table</th>
-  <th class='notSortedByColumn'><a href='columns.byColumn.html#columns'><span class='notSortedByColumn'>Column</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.byType.html#columns'><span class='notSortedByColumn'>Type</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.bySize.html#columns'><span class='notSortedByColumn'>Size</span></a></th>
-  <th title='Are nulls allowed?' class='notSortedByColumn'><a href='columns.byNulls.html#columns'><span class='notSortedByColumn'>Nulls</span></a></th>
-  <th title='Is column automatically updated?' class='notSortedByColumn'><a href='columns.byAuto.html#columns'><span class='notSortedByColumn'>Auto</span></a></th>
-  <th title='Default value' class='notSortedByColumn'><a href='columns.byDefault.html#columns'><span class='notSortedByColumn'>Default</span></a></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_archived</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_blocked</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_closeness</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>99</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_dob</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_excl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_feed</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_hidden</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='primaryKey' title='Primary Key'>abook_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_ignored</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_incl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_my_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_pending</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_profile</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_self</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_their_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_unconnected</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_default_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_email</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_expire_notified</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_external</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='primaryKey' title='Primary Key'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>en</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_lastlog</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_level</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_password_changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_roles</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_salt</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_service_class</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>installed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>plugin_admin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>timestamp</td>
- <td class='detail'>bigint</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_author</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_channel</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_price</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_requires</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_sig</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>data</td>
- <td class='detail'>longblob</td>
- <td class='detail' align='right'>2147483647</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filesize</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>folder</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_dir</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_photo</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>expires</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>250</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='primaryKey' title='Primary Key'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_delegate</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_republish</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_default_group</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_deleted</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_dirdate</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_expire_days</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='primaryKey' title='Primary Key'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_lastpost</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_anon_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_friend_req</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_notifyflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>65535</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_pageflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_passwd_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_prvkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_abook</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_profile</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_removed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_startpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_theme</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_timezone</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_chat</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_comment</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_like</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_tagwall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_wall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='primaryKey' title='Primary Key'>chat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='detail'>chat_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='detail'>cp_client</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='primaryKey' title='Primary Key'>cp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_expire</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='primaryKey' title='Primary Key'>cr_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='primaryKey' title='Primary Key'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>icon</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>name</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>pw</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>recips</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>subject</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>adjust</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>1</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_percent</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_repeat</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_sequence</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_status_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>finish</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>ignore</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>location</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>nofinish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>start</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>alias</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>batch</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>confirm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>nick</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>notify</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>poll</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>fid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='detail'>key</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>server</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>cid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>note</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>gid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>visible</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>file</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>function</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='indexedColumn' title='Indexed'>hook</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_callback</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connect</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_error</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_host</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='primaryKey' title='Primary Key'>hubloc_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_orphancheck</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_sitekey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_status</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_url_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_assigned</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_component</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='primaryKey' title='Primary Key'>issue_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_priority</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_status</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>app</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>author_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comment_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>commented</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comments_closed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>coord</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>diaspora_meta</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>html</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_blocked</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_consensus</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_delayed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_mentionsme</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nocomment</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_notshown</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_obscured</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_origin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_pending_remove</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_private</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_relay</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_restrict</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_retained</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_rss</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_starred</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_thread_top</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unpublished</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unseen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_uplink</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_verified</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_wall</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>lang</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>layout_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>llink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>obj_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>object</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>owner_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>plink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>postopts</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>public_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>received</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>resource_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>route</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>source_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>target</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>tgt_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>thr_parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>service</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>likee</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>liker</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='detail'>target</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>convid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>from_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_deleted</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_isreply</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_obscured</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_recalled</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_replied</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_seen</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>to_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='detail'>menu_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='primaryKey' title='Primary Key'>menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='primaryKey' title='Primary Key'>mitem_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_order</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>seen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='primaryKey' title='Primary Key'>obj_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_obj</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_type</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_async</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_delivered</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_driver</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='primaryKey' title='Primary Key'>outq_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_notify</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_priority</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>album</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>data</td>
- <td class='detail'>mediumblob</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>height</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>is_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_usage</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>profile</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>scale</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>size</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>title</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>width</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='detail'>poll_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='primaryKey' title='Primary Key'>poll_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_votes</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='primaryKey' title='Primary Key'>pelm_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_poll</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_result</td>
- <td class='detail'>float</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_help</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_inputs</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='indexedColumn' title='Indexed'>field_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>book</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>chandesc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>channels</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>contact</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>country_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dislikes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob_tz</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>education</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>film</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hide_friends</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>howlong</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>interest</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>is_default</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>likes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>locality</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>music</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>pdesc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>politic</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>postal_code</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>profile_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>profile_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>publish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>religion</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>romance</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>thumb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>tv</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>with</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>work</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>dfrn_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>sec</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='detail'>data</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='primaryKey' title='Primary Key'>share_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_target</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>retract_iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signature</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signed_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signer</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_access</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_dead</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_directory</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_pull</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_realm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_register</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_sellpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_sync</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_update</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='primaryKey' title='Primary Key'>site_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_valid</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='primaryKey' title='Primary Key'>src_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='detail'>src_patt</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='detail'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>ham</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>spam</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>public_perm</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>imgurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>oid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>parent_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='primaryKey' title='Primary Key'>tid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>secret</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='primaryKey' title='Primary Key'>ud_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>meta</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>token</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_element</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='primaryKey' title='Primary Key'>vote_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_poll</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='detail'>vote_result</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_censored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_connpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_connurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_follow</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='primaryKey' title='Primary Key'>xchan_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_instance_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_name_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_orphan</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_l</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_m</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_s</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_pubforum</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_selfcensored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='primaryKey' title='Primary Key'>xchat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='primaryKey' title='Primary Key'>xlink_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_rating</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_rating_text</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_static</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_client</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='primaryKey' title='Primary Key'>xp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_perm</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_age</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_country</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='primaryKey' title='Primary Key'>xprof_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_locale</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_postcode</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='primaryKey' title='Primary Key'>xtag_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/columns.byType.html b/hubzilla_er/columns.byType.html
deleted file mode 100644
index f2dc706e1..000000000
--- a/hubzilla_er/columns.byType.html
+++ /dev/null
@@ -1,7153 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - zot - Columns</title>
-  <link rel=stylesheet href='schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='schemaSpy.js'></SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li id='current'><a href='columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>SchemaSpy Analysis of <span title='Database'>zot</span> - Columns</span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr><td class='container'>
-<span class='container'>Generated by <span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span> on on aug 19 21:08 CEST 2015</span>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td></tr>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<p>
-<form name='options' action=''>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</table>
-<div class='indent'>
-<b>zot contains 705 columns</b> - click on heading to sort:<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th class='notSortedByColumn'><a href='columns.byTable.html#columns'><span class='notSortedByColumn'>Table</span></a></th>
-  <th class='notSortedByColumn'><a href='columns.byColumn.html#columns'><span class='notSortedByColumn'>Column</span></a></th>
-  <th class='sortedByColumn'>Type</th>
-  <th class='notSortedByColumn'><a href='columns.bySize.html#columns'><span class='notSortedByColumn'>Size</span></a></th>
-  <th title='Are nulls allowed?' class='notSortedByColumn'><a href='columns.byNulls.html#columns'><span class='notSortedByColumn'>Nulls</span></a></th>
-  <th title='Is column automatically updated?' class='notSortedByColumn'><a href='columns.byAuto.html#columns'><span class='notSortedByColumn'>Auto</span></a></th>
-  <th title='Default value' class='notSortedByColumn'><a href='columns.byDefault.html#columns'><span class='notSortedByColumn'>Default</span></a></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>timestamp</td>
- <td class='detail'>bigint</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>adjust</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>1</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_removed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hide_friends</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_error</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_orphancheck</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>ignore</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>installed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>is_default</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_dir</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>is_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>is_photo</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_blocked</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_consensus</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_delayed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_mentionsme</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nocomment</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_notshown</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_obscured</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_origin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_pending_remove</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_private</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_relay</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_retained</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_rss</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_starred</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_thread_top</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unpublished</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_unseen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_uplink</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_verified</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_wall</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>nofinish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_async</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_delivered</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>plugin_admin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>profile</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>public_perm</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>publish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>seen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>visible</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_censored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_orphan</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_pubforum</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_selfcensored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_static</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>en</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>resource_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_salt</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_service_class</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_driver</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>postal_code</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_postcode</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_profile</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>folder</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>lang</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>profile_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_timezone</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='detail'>cp_client</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>likee</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>liker</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_email</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_external</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='indexedColumn' title='Indexed'>addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>album</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>alias</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>app</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_author</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_price</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_requires</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_sig</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>author_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>batch</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_default_group</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_passwd_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_startpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_theme</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comment_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>confirm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>coord</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>country_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>dfrn_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dob_tz</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_help</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='indexedColumn' title='Indexed'>field_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>file</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>from_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>function</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='indexedColumn' title='Indexed'>hook</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_callback</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connect</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_host</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>imgurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_assigned</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_component</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='primaryKey' title='Primary Key'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>layout_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>llink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>locality</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='detail'>menu_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>meta</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='indexedColumn' title='Indexed'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>nick</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>notify</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_obj</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>obj_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='primaryKey' title='Primary Key'>outq_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>owner_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>parent_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='detail'>password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>pdesc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>plink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>politic</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>poll</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>profile_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>public_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>religion</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>sec</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='indexedColumn' title='Indexed'>server</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>service</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signer</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_directory</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_realm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_sellpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='primaryKey' title='Primary Key'>site_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>source_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>target_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>term_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>tgt_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>thr_parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>thumb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>title</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>to_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>token</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='detail'>version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_connpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_connurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_follow</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='primaryKey' title='Primary Key'>xchan_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_instance_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_l</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_m</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_s</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_country</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='primaryKey' title='Primary Key'>xprof_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_locale</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_dob</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='detail'>account_expire_notified</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_lastlog</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_password_changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_deleted</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_dirdate</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_lastpost</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>commented</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>comments_closed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='detail'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_status_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>finish</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>howlong</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>received</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_pull</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='detail'>site_sync</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_update</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>start</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='indexedColumn' title='Indexed'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_name_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_photo_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='indexedColumn' title='Indexed'>xchat_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_result</td>
- <td class='detail'>float</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_my_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_their_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='indexedColumn' title='Indexed'>app_channel</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_expire_days</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>cid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>expires</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>ham</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/addon.html'>addon</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_priority</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='indexedColumn' title='Indexed'>issue_status</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_restrict</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>item_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>mitem_order</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_votes</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_access</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_register</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>spam</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='indexedColumn' title='Indexed'>ud_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/manage.html'>manage</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/spam.html'>spam</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_element</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='indexedColumn' title='Indexed'>vote_poll</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='indexedColumn' title='Indexed'>xlink_rating</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='indexedColumn' title='Indexed'>xtag_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='primaryKey' title='Primary Key'>abook_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_default_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='primaryKey' title='Primary Key'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_level</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/account.html'>account</a></td>
- <td class='indexedColumn' title='Indexed'>account_roles</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='indexedColumn' title='Indexed'>channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_delegate</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_a_republish</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='primaryKey' title='Primary Key'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_anon_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_max_friend_req</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_notifyflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>65535</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_pageflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_abook</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_profile</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_r_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_chat</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_comment</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_like</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_tagwall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='indexedColumn' title='Indexed'>channel_w_wall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='primaryKey' title='Primary Key'>chat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='indexedColumn' title='Indexed'>chat_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>convid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='primaryKey' title='Primary Key'>cp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
- <td class='indexedColumn' title='Indexed'>cp_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_expire</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='primaryKey' title='Primary Key'>cr_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='indexedColumn' title='Indexed'>cr_uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>fid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>filesize</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>gid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='primaryKey' title='Primary Key'>hubloc_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='indexedColumn' title='Indexed'>hubloc_status</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/verify.html'>verify</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xign.html'>xign</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/issue.html'>issue</a></td>
- <td class='primaryKey' title='Primary Key'>issue_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='indexedColumn' title='Indexed'>menu_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu.html'>menu</a></td>
- <td class='primaryKey' title='Primary Key'>menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='primaryKey' title='Primary Key'>mitem_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='indexedColumn' title='Indexed'>mitem_menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='primaryKey' title='Primary Key'>obj_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='indexedColumn' title='Indexed'>obj_type</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>oid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='primaryKey' title='Primary Key'>pelm_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='indexedColumn' title='Indexed'>pelm_poll</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='indexedColumn' title='Indexed'>poll_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='primaryKey' title='Primary Key'>poll_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hook.html'>hook</a></td>
- <td class='detail'>priority</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='indexedColumn' title='Indexed'>retract_iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='primaryKey' title='Primary Key'>share_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/shares.html'>shares</a></td>
- <td class='indexedColumn' title='Indexed'>share_target</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>size</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='indexedColumn' title='Indexed'>src_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='primaryKey' title='Primary Key'>src_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='primaryKey' title='Primary Key'>tid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/updates.html'>updates</a></td>
- <td class='primaryKey' title='Primary Key'>ud_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/groups.html'>groups</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/register.html'>register</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='primaryKey' title='Primary Key'>vote_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='indexedColumn' title='Indexed'>xchan_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
- <td class='primaryKey' title='Primary Key'>xchat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='primaryKey' title='Primary Key'>xlink_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='primaryKey' title='Primary Key'>xp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
- <td class='primaryKey' title='Primary Key'>xtag_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>data</td>
- <td class='detail'>longblob</td>
- <td class='detail' align='right'>2147483647</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>data</td>
- <td class='detail'>mediumblob</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chat.html'>chat</a></td>
- <td class='detail'>chat_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/obj.html'>obj</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>diaspora_meta</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
- <td class='detail'>field_inputs</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>html</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/notify.html'>notify</a></td>
- <td class='detail'>msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/attach.html'>attach</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='detail'>outq_notify</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>recips</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signed_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/source.html'>source</a></td>
- <td class='detail'>src_patt</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/conv.html'>conv</a></td>
- <td class='detail'>subject</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/likes.html'>likes</a></td>
- <td class='detail'>target</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profext.html'>profext</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_percent</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='indexedColumn' title='Indexed'>event_sequence</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>height</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_obscured</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/outq.html'>outq</a></td>
- <td class='indexedColumn' title='Indexed'>outq_priority</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>photo_usage</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_dead</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/site.html'>site</a></td>
- <td class='indexedColumn' title='Indexed'>site_valid</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>width</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_excl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='detail'>abook_incl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/app.html'>app</a></td>
- <td class='detail'>app_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>book</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>chandesc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_prvkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/channel.html'>channel</a></td>
- <td class='detail'>channel_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>channels</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>contact</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/session.html'>session</a></td>
- <td class='detail'>data</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>dislikes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>education</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>event_repeat</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>film</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_sitekey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
- <td class='detail'>hubloc_url_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>icon</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>interest</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
- <td class='detail'>key</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>likes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>location</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>music</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>name</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
- <td class='detail'>note</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>object</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
- <td class='detail'>pelm_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/poll.html'>poll</a></td>
- <td class='detail'>poll_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>postopts</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
- <td class='detail'>pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>romance</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>route</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>secret</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/sign.html'>sign</a></td>
- <td class='detail'>signature</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/event.html'>event</a></td>
- <td class='detail'>summary</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='detail'>target</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/item.html'>item</a></td>
- <td class='indexedColumn' title='Indexed'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='detail'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>tv</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/cache.html'>cache</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/config.html'>config</a></td>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/vote.html'>vote</a></td>
- <td class='detail'>vote_result</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>with</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/profile.html'>profile</a></td>
- <td class='detail'>work</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
- <td class='detail'>xchan_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_rating_text</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
- <td class='detail'>xlink_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='detail'>xprof_keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_archived</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_blocked</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_feed</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_hidden</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_ignored</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_pending</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_self</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_unconnected</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_deleted</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_isreply</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_recalled</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_replied</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/mail.html'>mail</a></td>
- <td class='indexedColumn' title='Indexed'>mail_seen</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/photo.html'>photo</a></td>
- <td class='indexedColumn' title='Indexed'>scale</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/abook.html'>abook</a></td>
- <td class='indexedColumn' title='Indexed'>abook_closeness</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>99</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/term.html'>term</a></td>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
- <td class='indexedColumn' title='Indexed'>xprof_age</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='primaryKey' title='Primary Key'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='indexedColumn' title='Indexed'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>pw</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_client</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
- <td class='indexedColumn' title='Indexed'>xp_perm</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/clients.html'>clients</a></td>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>250</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='comment detail'></td>
-</tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/constraints.html b/hubzilla_er/constraints.html
deleted file mode 100644
index bf19c7cd0..000000000
--- a/hubzilla_er/constraints.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - zot - Constraints</title>
-  <link rel=stylesheet href='schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='schemaSpy.js'></SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li id='current'><a href='constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>SchemaSpy Analysis of <span title='Database'>zot</span> - Constraints</span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<div class='indent'>
-<table width='100%'>
-<tr><td class='container' valign='bottom'><b>
-0 Foreign Key Constraints:</b>
-</td><td class='container' align='right'>
-<table>
-  <tr><td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td></tr>
-<tr><td class='container'>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-</td></tr></table>
-</td></tr>
-</table><br>
-<table class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<thead align='left'>
-<tr>
-  <th>Constraint Name</th>
-  <th>Child Column</th>
-  <th>Parent Column</th>
-  <th>Delete Rule</th>
-</tr>
-</thead>
-<tbody>
- <tr>
-  <td class='detail' valign='top' colspan='4'>None detected</td>
- </tr>
-</tbody>
-</table>
-<a name='checkConstraints'></a><p>
-<b>Check Constraints:</b>
-<TABLE class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<thead align='left'>
-<tr>
-  <th>Table</th>
-  <th>Constraint Name</th>
-  <th>Constraint</th>
-</tr>
-</thead>
-<tbody>
- <tr>
-  <td class='detail' valign='top' colspan='3'>None detected</td>
- </tr>
-</tbody>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/deletionOrder.txt b/hubzilla_er/deletionOrder.txt
deleted file mode 100644
index 6bcbd5236..000000000
--- a/hubzilla_er/deletionOrder.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-xtag
-xprof
-xperm
-xlink
-xchat
-xchan
-vote
-updates
-term
-source
-site
-shares
-session
-poll_elm
-poll
-outq
-obj
-menu_item
-menu
-issue
-hubloc
-chatroom
-chatpresence
-chat
-abook
-profext
-mail
-xconfig
-sys_perms
-pconfig
-likes
-config
-auth_codes
-xign
-spam
-sign
-register
-profile_check
-profile
-profdef
-photo
-manage
-item_id
-item
-hook
-groups
-group_member
-fsuggest
-fserver
-ffinder
-fcontact
-event
-conv
-attach
-app
-addon
-tokens
-account
-clients
-channel
-cache
-notify
-verify
diff --git a/hubzilla_er/diagrams/account.1degree.dot b/hubzilla_er/diagrams/account.1degree.dot
deleted file mode 100644
index 0233118c9..000000000
--- a/hubzilla_er/diagrams/account.1degree.dot
+++ /dev/null
@@ -1,49 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "account" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">account</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">account_id</TD><TD PORT="account_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_parent" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_parent</TD><TD PORT="account_parent.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_default_channel" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_default_channel</TD><TD PORT="account_default_channel.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_salt" COLSPAN="2" ALIGN="LEFT">account_salt</TD><TD PORT="account_salt.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="account_password" COLSPAN="2" ALIGN="LEFT">account_password</TD><TD PORT="account_password.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_email" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_email</TD><TD PORT="account_email.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_external" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_external</TD><TD PORT="account_external.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_language" COLSPAN="2" ALIGN="LEFT">account_language</TD><TD PORT="account_language.type" ALIGN="LEFT">char[16]</TD></TR>
-      <TR><TD PORT="account_created" COLSPAN="2" ALIGN="LEFT">account_created</TD><TD PORT="account_created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="account_lastlog" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_lastlog</TD><TD PORT="account_lastlog.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="account_flags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_flags</TD><TD PORT="account_flags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_roles" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_roles</TD><TD PORT="account_roles.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_reset" COLSPAN="2" ALIGN="LEFT">account_reset</TD><TD PORT="account_reset.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_expires" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_expires</TD><TD PORT="account_expires.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="account_expire_notified" COLSPAN="2" ALIGN="LEFT">account_expire_notified</TD><TD PORT="account_expire_notified.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="account_service_class" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_service_class</TD><TD PORT="account_service_class.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="account_level" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_level</TD><TD PORT="account_level.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_password_changed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_password_changed</TD><TD PORT="account_password_changed.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="account.html"
-    tooltip="account"
-  ];
-}
diff --git a/hubzilla_er/diagrams/account.1degree.png b/hubzilla_er/diagrams/account.1degree.png
deleted file mode 100644
index b2f201996..000000000
--- a/hubzilla_er/diagrams/account.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/account.implied2degrees.dot b/hubzilla_er/diagrams/account.implied2degrees.dot
deleted file mode 100644
index f5c61fb84..000000000
--- a/hubzilla_er/diagrams/account.implied2degrees.dot
+++ /dev/null
@@ -1,102 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "mail":"account_id":w -> "account":"account_id.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"channel_id":w -> "channel":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"id":w -> "verify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "account" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">account</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">account_id</TD><TD PORT="account_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_parent" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_parent</TD><TD PORT="account_parent.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_default_channel" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_default_channel</TD><TD PORT="account_default_channel.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_salt" COLSPAN="2" ALIGN="LEFT">account_salt</TD><TD PORT="account_salt.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="account_password" COLSPAN="2" ALIGN="LEFT">account_password</TD><TD PORT="account_password.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_email" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_email</TD><TD PORT="account_email.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_external" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_external</TD><TD PORT="account_external.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_language" COLSPAN="2" ALIGN="LEFT">account_language</TD><TD PORT="account_language.type" ALIGN="LEFT">char[16]</TD></TR>
-      <TR><TD PORT="account_created" COLSPAN="2" ALIGN="LEFT">account_created</TD><TD PORT="account_created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="account_lastlog" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_lastlog</TD><TD PORT="account_lastlog.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="account_flags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_flags</TD><TD PORT="account_flags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_roles" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_roles</TD><TD PORT="account_roles.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_reset" COLSPAN="2" ALIGN="LEFT">account_reset</TD><TD PORT="account_reset.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_expires" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_expires</TD><TD PORT="account_expires.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="account_expire_notified" COLSPAN="2" ALIGN="LEFT">account_expire_notified</TD><TD PORT="account_expire_notified.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="account_service_class" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_service_class</TD><TD PORT="account_service_class.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="account_level" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_level</TD><TD PORT="account_level.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="account_password_changed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_password_changed</TD><TD PORT="account_password_changed.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="account.html"
-    tooltip="account"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="channel.html"
-    tooltip="channel"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="convid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">convid</TD></TR>
-      <TR><TD PORT="mail_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_flags</TD></TR>
-      <TR><TD PORT="from_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">from_xchan</TD></TR>
-      <TR><TD PORT="to_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">to_xchan</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="body" COLSPAN="3" ALIGN="LEFT">body</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="3" ALIGN="LEFT">sig</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="3" ALIGN="LEFT">attach</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD></TR>
-      <TR><TD PORT="mail_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_deleted</TD></TR>
-      <TR><TD PORT="mail_replied" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_replied</TD></TR>
-      <TR><TD PORT="mail_isreply" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_isreply</TD></TR>
-      <TR><TD PORT="mail_seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_seen</TD></TR>
-      <TR><TD PORT="mail_recalled" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_recalled</TD></TR>
-      <TR><TD PORT="mail_obscured" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_obscured</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-}
diff --git a/hubzilla_er/diagrams/account.implied2degrees.png b/hubzilla_er/diagrams/account.implied2degrees.png
deleted file mode 100644
index db4b4d9c3..000000000
--- a/hubzilla_er/diagrams/account.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/addon.1degree.dot b/hubzilla_er/diagrams/addon.1degree.dot
deleted file mode 100644
index 9718ee5e3..000000000
--- a/hubzilla_er/diagrams/addon.1degree.dot
+++ /dev/null
@@ -1,38 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="version" COLSPAN="2" ALIGN="LEFT">version</TD><TD PORT="version.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="installed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">installed</TD><TD PORT="installed.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="hidden" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hidden</TD><TD PORT="hidden.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="timestamp" COLSPAN="2" ALIGN="LEFT">timestamp</TD><TD PORT="timestamp.type" ALIGN="LEFT">bigint[19]</TD></TR>
-      <TR><TD PORT="plugin_admin" COLSPAN="2" ALIGN="LEFT">plugin_admin</TD><TD PORT="plugin_admin.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="addon.html"
-    tooltip="addon"
-  ];
-}
diff --git a/hubzilla_er/diagrams/addon.1degree.png b/hubzilla_er/diagrams/addon.1degree.png
deleted file mode 100644
index 59f2eb90b..000000000
--- a/hubzilla_er/diagrams/addon.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/addon.implied2degrees.dot b/hubzilla_er/diagrams/addon.implied2degrees.dot
deleted file mode 100644
index 7a5819ae2..000000000
--- a/hubzilla_er/diagrams/addon.implied2degrees.dot
+++ /dev/null
@@ -1,162 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "event":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "addon" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="version" COLSPAN="2" ALIGN="LEFT">version</TD><TD PORT="version.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="installed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">installed</TD><TD PORT="installed.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="hidden" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hidden</TD><TD PORT="hidden.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="timestamp" COLSPAN="2" ALIGN="LEFT">timestamp</TD><TD PORT="timestamp.type" ALIGN="LEFT">bigint[19]</TD></TR>
-      <TR><TD PORT="plugin_admin" COLSPAN="2" ALIGN="LEFT">plugin_admin</TD><TD PORT="plugin_admin.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="app.html"
-    tooltip="app"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="event.html"
-    tooltip="event"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="hook.html"
-    tooltip="hook"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="3" ALIGN="LEFT">msg</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">10 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile.html"
-    tooltip="profile"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="spam.html"
-    tooltip="spam"
-  ];
-}
diff --git a/hubzilla_er/diagrams/addon.implied2degrees.png b/hubzilla_er/diagrams/addon.implied2degrees.png
deleted file mode 100644
index 02f9162e3..000000000
--- a/hubzilla_er/diagrams/addon.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/app.1degree.dot b/hubzilla_er/diagrams/app.1degree.dot
deleted file mode 100644
index 6b50c4e5f..000000000
--- a/hubzilla_er/diagrams/app.1degree.dot
+++ /dev/null
@@ -1,45 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="app_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_id</TD><TD PORT="app_id.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_sig" COLSPAN="2" ALIGN="LEFT">app_sig</TD><TD PORT="app_sig.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_author" COLSPAN="2" ALIGN="LEFT">app_author</TD><TD PORT="app_author.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_name" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_name</TD><TD PORT="app_name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_desc" COLSPAN="2" ALIGN="LEFT">app_desc</TD><TD PORT="app_desc.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="app_url" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_url</TD><TD PORT="app_url.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_photo" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_photo</TD><TD PORT="app_photo.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_version" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_version</TD><TD PORT="app_version.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_channel" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_channel</TD><TD PORT="app_channel.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="app_addr" COLSPAN="2" ALIGN="LEFT">app_addr</TD><TD PORT="app_addr.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_price" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_price</TD><TD PORT="app_price.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_page" COLSPAN="2" ALIGN="LEFT">app_page</TD><TD PORT="app_page.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_requires" COLSPAN="2" ALIGN="LEFT">app_requires</TD><TD PORT="app_requires.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="app.html"
-    tooltip="app"
-  ];
-}
diff --git a/hubzilla_er/diagrams/app.1degree.png b/hubzilla_er/diagrams/app.1degree.png
deleted file mode 100644
index a61da6ea4..000000000
--- a/hubzilla_er/diagrams/app.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/app.implied2degrees.dot b/hubzilla_er/diagrams/app.implied2degrees.dot
deleted file mode 100644
index 211434419..000000000
--- a/hubzilla_er/diagrams/app.implied2degrees.dot
+++ /dev/null
@@ -1,169 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "event":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="app_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_id</TD><TD PORT="app_id.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_sig" COLSPAN="2" ALIGN="LEFT">app_sig</TD><TD PORT="app_sig.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_author" COLSPAN="2" ALIGN="LEFT">app_author</TD><TD PORT="app_author.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_name" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_name</TD><TD PORT="app_name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_desc" COLSPAN="2" ALIGN="LEFT">app_desc</TD><TD PORT="app_desc.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="app_url" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_url</TD><TD PORT="app_url.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_photo" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_photo</TD><TD PORT="app_photo.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_version" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_version</TD><TD PORT="app_version.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_channel" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_channel</TD><TD PORT="app_channel.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="app_addr" COLSPAN="2" ALIGN="LEFT">app_addr</TD><TD PORT="app_addr.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_price" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">app_price</TD><TD PORT="app_price.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_page" COLSPAN="2" ALIGN="LEFT">app_page</TD><TD PORT="app_page.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="app_requires" COLSPAN="2" ALIGN="LEFT">app_requires</TD><TD PORT="app_requires.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="app.html"
-    tooltip="app"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="event.html"
-    tooltip="event"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="hook.html"
-    tooltip="hook"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="3" ALIGN="LEFT">msg</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">10 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile.html"
-    tooltip="profile"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="spam.html"
-    tooltip="spam"
-  ];
-}
diff --git a/hubzilla_er/diagrams/app.implied2degrees.png b/hubzilla_er/diagrams/app.implied2degrees.png
deleted file mode 100644
index 18f21ef6c..000000000
--- a/hubzilla_er/diagrams/app.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/attach.1degree.dot b/hubzilla_er/diagrams/attach.1degree.dot
deleted file mode 100644
index 34646c1dc..000000000
--- a/hubzilla_er/diagrams/attach.1degree.dot
+++ /dev/null
@@ -1,54 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD><TD PORT="hash.type" ALIGN="LEFT">char[64]</TD></TR>
-      <TR><TD PORT="creator" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">creator</TD><TD PORT="creator.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="filename" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">filename</TD><TD PORT="filename.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="filetype" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">filetype</TD><TD PORT="filetype.type" ALIGN="LEFT">char[64]</TD></TR>
-      <TR><TD PORT="filesize" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">filesize</TD><TD PORT="filesize.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="revision" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">revision</TD><TD PORT="revision.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="folder" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">folder</TD><TD PORT="folder.type" ALIGN="LEFT">char[64]</TD></TR>
-      <TR><TD PORT="flags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">flags</TD><TD PORT="flags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="is_dir" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">is_dir</TD><TD PORT="is_dir.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="is_photo" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">is_photo</TD><TD PORT="is_photo.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD><TD PORT="os_storage.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="os_path" COLSPAN="2" ALIGN="LEFT">os_path</TD><TD PORT="os_path.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="display_path" COLSPAN="2" ALIGN="LEFT">display_path</TD><TD PORT="display_path.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="data" COLSPAN="2" ALIGN="LEFT">data</TD><TD PORT="data.type" ALIGN="LEFT">longblob[2147483647]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">edited</TD><TD PORT="edited.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="2" ALIGN="LEFT">allow_cid</TD><TD PORT="allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="2" ALIGN="LEFT">allow_gid</TD><TD PORT="allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="2" ALIGN="LEFT">deny_cid</TD><TD PORT="deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="2" ALIGN="LEFT">deny_gid</TD><TD PORT="deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-}
diff --git a/hubzilla_er/diagrams/attach.1degree.png b/hubzilla_er/diagrams/attach.1degree.png
deleted file mode 100644
index c796d9e3b..000000000
--- a/hubzilla_er/diagrams/attach.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/attach.implied2degrees.dot b/hubzilla_er/diagrams/attach.implied2degrees.dot
deleted file mode 100644
index fb253bf66..000000000
--- a/hubzilla_er/diagrams/attach.implied2degrees.dot
+++ /dev/null
@@ -1,279 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD><TD PORT="hash.type" ALIGN="LEFT">char[64]</TD></TR>
-      <TR><TD PORT="creator" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">creator</TD><TD PORT="creator.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="filename" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">filename</TD><TD PORT="filename.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="filetype" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">filetype</TD><TD PORT="filetype.type" ALIGN="LEFT">char[64]</TD></TR>
-      <TR><TD PORT="filesize" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">filesize</TD><TD PORT="filesize.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="revision" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">revision</TD><TD PORT="revision.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="folder" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">folder</TD><TD PORT="folder.type" ALIGN="LEFT">char[64]</TD></TR>
-      <TR><TD PORT="flags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">flags</TD><TD PORT="flags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="is_dir" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">is_dir</TD><TD PORT="is_dir.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="is_photo" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">is_photo</TD><TD PORT="is_photo.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD><TD PORT="os_storage.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="os_path" COLSPAN="2" ALIGN="LEFT">os_path</TD><TD PORT="os_path.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="display_path" COLSPAN="2" ALIGN="LEFT">display_path</TD><TD PORT="display_path.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="data" COLSPAN="2" ALIGN="LEFT">data</TD><TD PORT="data.type" ALIGN="LEFT">longblob[2147483647]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">edited</TD><TD PORT="edited.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="2" ALIGN="LEFT">allow_cid</TD><TD PORT="allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="2" ALIGN="LEFT">allow_gid</TD><TD PORT="allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="2" ALIGN="LEFT">deny_cid</TD><TD PORT="deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="2" ALIGN="LEFT">deny_gid</TD><TD PORT="deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/attach.implied2degrees.png b/hubzilla_er/diagrams/attach.implied2degrees.png
deleted file mode 100644
index 93cbc5de9..000000000
--- a/hubzilla_er/diagrams/attach.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/auth_codes.1degree.dot b/hubzilla_er/diagrams/auth_codes.1degree.dot
deleted file mode 100644
index 863f01a7f..000000000
--- a/hubzilla_er/diagrams/auth_codes.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "auth_codes" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">auth_codes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="2" ALIGN="LEFT">client_id</TD><TD PORT="client_id.type" ALIGN="LEFT">varchar[20]</TD></TR>
-      <TR><TD PORT="redirect_uri" COLSPAN="2" ALIGN="LEFT">redirect_uri</TD><TD PORT="redirect_uri.type" ALIGN="LEFT">varchar[200]</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="2" ALIGN="LEFT">expires</TD><TD PORT="expires.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="scope" COLSPAN="2" ALIGN="LEFT">scope</TD><TD PORT="scope.type" ALIGN="LEFT">varchar[250]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="auth_codes.html"
-    tooltip="auth_codes"
-  ];
-}
diff --git a/hubzilla_er/diagrams/auth_codes.1degree.png b/hubzilla_er/diagrams/auth_codes.1degree.png
deleted file mode 100644
index b8232f028..000000000
--- a/hubzilla_er/diagrams/auth_codes.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/auth_codes.implied2degrees.dot b/hubzilla_er/diagrams/auth_codes.implied2degrees.dot
deleted file mode 100644
index e96b9c2d4..000000000
--- a/hubzilla_er/diagrams/auth_codes.implied2degrees.dot
+++ /dev/null
@@ -1,69 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "auth_codes":"client_id":w -> "clients":"client_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "auth_codes":"id":w -> "tokens":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "tokens":"client_id":w -> "clients":"client_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "auth_codes" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">auth_codes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="2" ALIGN="LEFT">client_id</TD><TD PORT="client_id.type" ALIGN="LEFT">varchar[20]</TD></TR>
-      <TR><TD PORT="redirect_uri" COLSPAN="2" ALIGN="LEFT">redirect_uri</TD><TD PORT="redirect_uri.type" ALIGN="LEFT">varchar[200]</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="2" ALIGN="LEFT">expires</TD><TD PORT="expires.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="scope" COLSPAN="2" ALIGN="LEFT">scope</TD><TD PORT="scope.type" ALIGN="LEFT">varchar[250]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="auth_codes.html"
-    tooltip="auth_codes"
-  ];
-  "clients" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">clients</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="pw" COLSPAN="3" ALIGN="LEFT">pw</TD></TR>
-      <TR><TD PORT="redirect_uri" COLSPAN="3" ALIGN="LEFT">redirect_uri</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="icon" COLSPAN="3" ALIGN="LEFT">icon</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="clients.html"
-    tooltip="clients"
-  ];
-  "tokens" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">tokens</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="secret" COLSPAN="3" ALIGN="LEFT">secret</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="scope" COLSPAN="3" ALIGN="LEFT">scope</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tokens.html"
-    tooltip="tokens"
-  ];
-}
diff --git a/hubzilla_er/diagrams/auth_codes.implied2degrees.png b/hubzilla_er/diagrams/auth_codes.implied2degrees.png
deleted file mode 100644
index 324bdd59a..000000000
--- a/hubzilla_er/diagrams/auth_codes.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/cache.1degree.dot b/hubzilla_er/diagrams/cache.1degree.dot
deleted file mode 100644
index 26fb47e97..000000000
--- a/hubzilla_er/diagrams/cache.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="k" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">k</TD><TD PORT="k.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="v" COLSPAN="2" ALIGN="LEFT">v</TD><TD PORT="v.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="2" ALIGN="LEFT">updated</TD><TD PORT="updated.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="cache.html"
-    tooltip="cache"
-  ];
-}
diff --git a/hubzilla_er/diagrams/cache.1degree.png b/hubzilla_er/diagrams/cache.1degree.png
deleted file mode 100644
index 88c587490..000000000
--- a/hubzilla_er/diagrams/cache.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/cache.implied2degrees.dot b/hubzilla_er/diagrams/cache.implied2degrees.dot
deleted file mode 100644
index e97e3354a..000000000
--- a/hubzilla_er/diagrams/cache.implied2degrees.dot
+++ /dev/null
@@ -1,144 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "config":"id":w -> "verify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"k":w -> "cache":"k.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "pconfig":"id":w -> "notify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"k":w -> "cache":"k.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profext":"channel_id":w -> "channel":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profext":"id":w -> "verify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"k":w -> "cache":"k.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "sys_perms":"id":w -> "verify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"k":w -> "cache":"k.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xconfig":"id":w -> "verify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"k":w -> "cache":"k.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "cache" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="k" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">k</TD><TD PORT="k.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="v" COLSPAN="2" ALIGN="LEFT">v</TD><TD PORT="v.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="2" ALIGN="LEFT">updated</TD><TD PORT="updated.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 &gt;</TD></TR>
-    </TABLE>>
-    URL="cache.html"
-    tooltip="cache"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="channel.html"
-    tooltip="channel"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">10 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD PORT="public_perm" COLSPAN="3" ALIGN="LEFT">public_perm</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-}
diff --git a/hubzilla_er/diagrams/cache.implied2degrees.png b/hubzilla_er/diagrams/cache.implied2degrees.png
deleted file mode 100644
index 20f354c92..000000000
--- a/hubzilla_er/diagrams/cache.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/channel.1degree.dot b/hubzilla_er/diagrams/channel.1degree.dot
deleted file mode 100644
index 65df644d9..000000000
--- a/hubzilla_er/diagrams/channel.1degree.dot
+++ /dev/null
@@ -1,79 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">channel_id</TD><TD PORT="channel_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_account_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_account_id</TD><TD PORT="channel_account_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_primary" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_primary</TD><TD PORT="channel_primary.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="channel_name" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_name</TD><TD PORT="channel_name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_address" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_address</TD><TD PORT="channel_address.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_guid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_guid</TD><TD PORT="channel_guid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_guid_sig" COLSPAN="2" ALIGN="LEFT">channel_guid_sig</TD><TD PORT="channel_guid_sig.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channel_hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_hash</TD><TD PORT="channel_hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_timezone" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_timezone</TD><TD PORT="channel_timezone.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="channel_location" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_location</TD><TD PORT="channel_location.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_theme" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_theme</TD><TD PORT="channel_theme.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_startpage" COLSPAN="2" ALIGN="LEFT">channel_startpage</TD><TD PORT="channel_startpage.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_pubkey" COLSPAN="2" ALIGN="LEFT">channel_pubkey</TD><TD PORT="channel_pubkey.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channel_prvkey" COLSPAN="2" ALIGN="LEFT">channel_prvkey</TD><TD PORT="channel_prvkey.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channel_notifyflags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_notifyflags</TD><TD PORT="channel_notifyflags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_pageflags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_pageflags</TD><TD PORT="channel_pageflags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_dirdate" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_dirdate</TD><TD PORT="channel_dirdate.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="channel_lastpost" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_lastpost</TD><TD PORT="channel_lastpost.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="channel_deleted" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_deleted</TD><TD PORT="channel_deleted.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="channel_max_anon_mail" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_anon_mail</TD><TD PORT="channel_max_anon_mail.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_max_friend_req" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_friend_req</TD><TD PORT="channel_max_friend_req.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_expire_days" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_expire_days</TD><TD PORT="channel_expire_days.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="channel_passwd_reset" COLSPAN="2" ALIGN="LEFT">channel_passwd_reset</TD><TD PORT="channel_passwd_reset.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_default_group" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_default_group</TD><TD PORT="channel_default_group.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_allow_cid" COLSPAN="2" ALIGN="LEFT">channel_allow_cid</TD><TD PORT="channel_allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_allow_gid" COLSPAN="2" ALIGN="LEFT">channel_allow_gid</TD><TD PORT="channel_allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_deny_cid" COLSPAN="2" ALIGN="LEFT">channel_deny_cid</TD><TD PORT="channel_deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_deny_gid" COLSPAN="2" ALIGN="LEFT">channel_deny_gid</TD><TD PORT="channel_deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_r_stream" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_stream</TD><TD PORT="channel_r_stream.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_profile" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_profile</TD><TD PORT="channel_r_profile.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_photos" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_photos</TD><TD PORT="channel_r_photos.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_abook" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_abook</TD><TD PORT="channel_r_abook.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_stream" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_stream</TD><TD PORT="channel_w_stream.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_wall" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_wall</TD><TD PORT="channel_w_wall.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_tagwall" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_tagwall</TD><TD PORT="channel_w_tagwall.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_comment" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_comment</TD><TD PORT="channel_w_comment.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_mail" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_mail</TD><TD PORT="channel_w_mail.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_photos" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_photos</TD><TD PORT="channel_w_photos.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_chat" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_chat</TD><TD PORT="channel_w_chat.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_a_delegate" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_delegate</TD><TD PORT="channel_a_delegate.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_storage</TD><TD PORT="channel_r_storage.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_storage</TD><TD PORT="channel_w_storage.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_pages" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_pages</TD><TD PORT="channel_r_pages.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_pages" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_pages</TD><TD PORT="channel_w_pages.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_a_republish" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_republish</TD><TD PORT="channel_a_republish.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_like" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_like</TD><TD PORT="channel_w_like.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_removed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_removed</TD><TD PORT="channel_removed.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="channel_system" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_system</TD><TD PORT="channel_system.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="channel.html"
-    tooltip="channel"
-  ];
-}
diff --git a/hubzilla_er/diagrams/channel.1degree.png b/hubzilla_er/diagrams/channel.1degree.png
deleted file mode 100644
index 5ae2a80df..000000000
--- a/hubzilla_er/diagrams/channel.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/channel.implied2degrees.dot b/hubzilla_er/diagrams/channel.implied2degrees.dot
deleted file mode 100644
index 4cc3b73a3..000000000
--- a/hubzilla_er/diagrams/channel.implied2degrees.dot
+++ /dev/null
@@ -1,179 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "likes":"channel_id":w -> "channel":"channel_id.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "likes":"id":w -> "verify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"account_id":w -> "account":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"channel_id":w -> "channel":"channel_id.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"id":w -> "verify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"channel_id":w -> "channel":"channel_id.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profext":"id":w -> "verify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"k":w -> "cache":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "account" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">account</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="account.html"
-    tooltip="account"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 &gt;</TD></TR>
-    </TABLE>>
-    URL="cache.html"
-    tooltip="cache"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">channel_id</TD><TD PORT="channel_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_account_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_account_id</TD><TD PORT="channel_account_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_primary" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_primary</TD><TD PORT="channel_primary.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="channel_name" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_name</TD><TD PORT="channel_name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_address" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_address</TD><TD PORT="channel_address.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_guid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_guid</TD><TD PORT="channel_guid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_guid_sig" COLSPAN="2" ALIGN="LEFT">channel_guid_sig</TD><TD PORT="channel_guid_sig.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channel_hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_hash</TD><TD PORT="channel_hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_timezone" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_timezone</TD><TD PORT="channel_timezone.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="channel_location" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_location</TD><TD PORT="channel_location.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_theme" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_theme</TD><TD PORT="channel_theme.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_startpage" COLSPAN="2" ALIGN="LEFT">channel_startpage</TD><TD PORT="channel_startpage.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_pubkey" COLSPAN="2" ALIGN="LEFT">channel_pubkey</TD><TD PORT="channel_pubkey.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channel_prvkey" COLSPAN="2" ALIGN="LEFT">channel_prvkey</TD><TD PORT="channel_prvkey.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channel_notifyflags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_notifyflags</TD><TD PORT="channel_notifyflags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_pageflags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_pageflags</TD><TD PORT="channel_pageflags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_dirdate" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_dirdate</TD><TD PORT="channel_dirdate.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="channel_lastpost" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_lastpost</TD><TD PORT="channel_lastpost.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="channel_deleted" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_deleted</TD><TD PORT="channel_deleted.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="channel_max_anon_mail" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_anon_mail</TD><TD PORT="channel_max_anon_mail.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_max_friend_req" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_friend_req</TD><TD PORT="channel_max_friend_req.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_expire_days" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_expire_days</TD><TD PORT="channel_expire_days.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="channel_passwd_reset" COLSPAN="2" ALIGN="LEFT">channel_passwd_reset</TD><TD PORT="channel_passwd_reset.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_default_group" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_default_group</TD><TD PORT="channel_default_group.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_allow_cid" COLSPAN="2" ALIGN="LEFT">channel_allow_cid</TD><TD PORT="channel_allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_allow_gid" COLSPAN="2" ALIGN="LEFT">channel_allow_gid</TD><TD PORT="channel_allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_deny_cid" COLSPAN="2" ALIGN="LEFT">channel_deny_cid</TD><TD PORT="channel_deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_deny_gid" COLSPAN="2" ALIGN="LEFT">channel_deny_gid</TD><TD PORT="channel_deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_r_stream" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_stream</TD><TD PORT="channel_r_stream.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_profile" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_profile</TD><TD PORT="channel_r_profile.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_photos" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_photos</TD><TD PORT="channel_r_photos.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_abook" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_abook</TD><TD PORT="channel_r_abook.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_stream" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_stream</TD><TD PORT="channel_w_stream.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_wall" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_wall</TD><TD PORT="channel_w_wall.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_tagwall" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_tagwall</TD><TD PORT="channel_w_tagwall.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_comment" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_comment</TD><TD PORT="channel_w_comment.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_mail" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_mail</TD><TD PORT="channel_w_mail.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_photos" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_photos</TD><TD PORT="channel_w_photos.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_chat" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_chat</TD><TD PORT="channel_w_chat.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_a_delegate" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_delegate</TD><TD PORT="channel_a_delegate.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_storage</TD><TD PORT="channel_r_storage.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_storage</TD><TD PORT="channel_w_storage.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_pages" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_pages</TD><TD PORT="channel_r_pages.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_pages" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_pages</TD><TD PORT="channel_w_pages.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_a_republish" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_republish</TD><TD PORT="channel_a_republish.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_like" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_like</TD><TD PORT="channel_w_like.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_removed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_removed</TD><TD PORT="channel_removed.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="channel_system" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_system</TD><TD PORT="channel_system.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="channel.html"
-    tooltip="channel"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="liker" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">liker</TD></TR>
-      <TR><TD PORT="likee" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">likee</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="target_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">target_type</TD></TR>
-      <TR><TD PORT="target_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">target_id</TD></TR>
-      <TR><TD PORT="target" COLSPAN="3" ALIGN="LEFT">target</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="convid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">convid</TD></TR>
-      <TR><TD PORT="mail_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_flags</TD></TR>
-      <TR><TD PORT="from_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">from_xchan</TD></TR>
-      <TR><TD PORT="to_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">to_xchan</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="body" COLSPAN="3" ALIGN="LEFT">body</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="3" ALIGN="LEFT">sig</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="3" ALIGN="LEFT">attach</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD></TR>
-      <TR><TD PORT="mail_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_deleted</TD></TR>
-      <TR><TD PORT="mail_replied" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_replied</TD></TR>
-      <TR><TD PORT="mail_isreply" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_isreply</TD></TR>
-      <TR><TD PORT="mail_seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_seen</TD></TR>
-      <TR><TD PORT="mail_recalled" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_recalled</TD></TR>
-      <TR><TD PORT="mail_obscured" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_obscured</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-}
diff --git a/hubzilla_er/diagrams/channel.implied2degrees.png b/hubzilla_er/diagrams/channel.implied2degrees.png
deleted file mode 100644
index 039513b03..000000000
--- a/hubzilla_er/diagrams/channel.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/clients.1degree.dot b/hubzilla_er/diagrams/clients.1degree.dot
deleted file mode 100644
index a8d3793ee..000000000
--- a/hubzilla_er/diagrams/clients.1degree.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "clients" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">clients</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">client_id</TD><TD PORT="client_id.type" ALIGN="LEFT">varchar[20]</TD></TR>
-      <TR><TD PORT="pw" COLSPAN="2" ALIGN="LEFT">pw</TD><TD PORT="pw.type" ALIGN="LEFT">varchar[20]</TD></TR>
-      <TR><TD PORT="redirect_uri" COLSPAN="2" ALIGN="LEFT">redirect_uri</TD><TD PORT="redirect_uri.type" ALIGN="LEFT">varchar[200]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="icon" COLSPAN="2" ALIGN="LEFT">icon</TD><TD PORT="icon.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="clients.html"
-    tooltip="clients"
-  ];
-}
diff --git a/hubzilla_er/diagrams/clients.1degree.png b/hubzilla_er/diagrams/clients.1degree.png
deleted file mode 100644
index e60450897..000000000
--- a/hubzilla_er/diagrams/clients.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/clients.implied2degrees.dot b/hubzilla_er/diagrams/clients.implied2degrees.dot
deleted file mode 100644
index 90ae9c0ee..000000000
--- a/hubzilla_er/diagrams/clients.implied2degrees.dot
+++ /dev/null
@@ -1,69 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "auth_codes":"client_id":w -> "clients":"client_id.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "auth_codes":"id":w -> "tokens":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "tokens":"client_id":w -> "clients":"client_id.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "auth_codes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">auth_codes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="redirect_uri" COLSPAN="3" ALIGN="LEFT">redirect_uri</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="scope" COLSPAN="3" ALIGN="LEFT">scope</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="auth_codes.html"
-    tooltip="auth_codes"
-  ];
-  "clients" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">clients</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">client_id</TD><TD PORT="client_id.type" ALIGN="LEFT">varchar[20]</TD></TR>
-      <TR><TD PORT="pw" COLSPAN="2" ALIGN="LEFT">pw</TD><TD PORT="pw.type" ALIGN="LEFT">varchar[20]</TD></TR>
-      <TR><TD PORT="redirect_uri" COLSPAN="2" ALIGN="LEFT">redirect_uri</TD><TD PORT="redirect_uri.type" ALIGN="LEFT">varchar[200]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="icon" COLSPAN="2" ALIGN="LEFT">icon</TD><TD PORT="icon.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="clients.html"
-    tooltip="clients"
-  ];
-  "tokens" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">tokens</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="secret" COLSPAN="3" ALIGN="LEFT">secret</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="scope" COLSPAN="3" ALIGN="LEFT">scope</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tokens.html"
-    tooltip="tokens"
-  ];
-}
diff --git a/hubzilla_er/diagrams/clients.implied2degrees.png b/hubzilla_er/diagrams/clients.implied2degrees.png
deleted file mode 100644
index 7a74599f6..000000000
--- a/hubzilla_er/diagrams/clients.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/config.1degree.dot b/hubzilla_er/diagrams/config.1degree.dot
deleted file mode 100644
index 502f9cff5..000000000
--- a/hubzilla_er/diagrams/config.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD><TD PORT="cat.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="k" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD><TD PORT="k.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="v" COLSPAN="2" ALIGN="LEFT">v</TD><TD PORT="v.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-}
diff --git a/hubzilla_er/diagrams/config.1degree.png b/hubzilla_er/diagrams/config.1degree.png
deleted file mode 100644
index 09927d53a..000000000
--- a/hubzilla_er/diagrams/config.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/config.implied2degrees.dot b/hubzilla_er/diagrams/config.implied2degrees.dot
deleted file mode 100644
index 1e7c98ca7..000000000
--- a/hubzilla_er/diagrams/config.implied2degrees.dot
+++ /dev/null
@@ -1,287 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 &gt;</TD></TR>
-    </TABLE>>
-    URL="cache.html"
-    tooltip="cache"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD><TD PORT="cat.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="k" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD><TD PORT="k.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="v" COLSPAN="2" ALIGN="LEFT">v</TD><TD PORT="v.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/config.implied2degrees.png b/hubzilla_er/diagrams/config.implied2degrees.png
deleted file mode 100644
index 4ae547f50..000000000
--- a/hubzilla_er/diagrams/config.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/conv.1degree.dot b/hubzilla_er/diagrams/conv.1degree.dot
deleted file mode 100644
index 5fa098a72..000000000
--- a/hubzilla_er/diagrams/conv.1degree.dot
+++ /dev/null
@@ -1,39 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="guid" COLSPAN="2" ALIGN="LEFT">guid</TD><TD PORT="guid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="recips" COLSPAN="2" ALIGN="LEFT">recips</TD><TD PORT="recips.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="creator" COLSPAN="2" ALIGN="LEFT">creator</TD><TD PORT="creator.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">updated</TD><TD PORT="updated.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="subject" COLSPAN="2" ALIGN="LEFT">subject</TD><TD PORT="subject.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-}
diff --git a/hubzilla_er/diagrams/conv.1degree.png b/hubzilla_er/diagrams/conv.1degree.png
deleted file mode 100644
index 8855f5b33..000000000
--- a/hubzilla_er/diagrams/conv.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/conv.implied2degrees.dot b/hubzilla_er/diagrams/conv.implied2degrees.dot
deleted file mode 100644
index 8c5732b33..000000000
--- a/hubzilla_er/diagrams/conv.implied2degrees.dot
+++ /dev/null
@@ -1,264 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="guid" COLSPAN="2" ALIGN="LEFT">guid</TD><TD PORT="guid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="recips" COLSPAN="2" ALIGN="LEFT">recips</TD><TD PORT="recips.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="creator" COLSPAN="2" ALIGN="LEFT">creator</TD><TD PORT="creator.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">updated</TD><TD PORT="updated.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="subject" COLSPAN="2" ALIGN="LEFT">subject</TD><TD PORT="subject.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/conv.implied2degrees.png b/hubzilla_er/diagrams/conv.implied2degrees.png
deleted file mode 100644
index cbe2e3e54..000000000
--- a/hubzilla_er/diagrams/conv.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/event.1degree.dot b/hubzilla_er/diagrams/event.1degree.dot
deleted file mode 100644
index 6abcaaf8c..000000000
--- a/hubzilla_er/diagrams/event.1degree.dot
+++ /dev/null
@@ -1,56 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="event_xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">event_xchan</TD><TD PORT="event_xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="event_hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">event_hash</TD><TD PORT="event_hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="2" ALIGN="LEFT">edited</TD><TD PORT="edited.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="start" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">start</TD><TD PORT="start.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="finish" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">finish</TD><TD PORT="finish.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="summary" COLSPAN="2" ALIGN="LEFT">summary</TD><TD PORT="summary.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT">description</TD><TD PORT="description.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="location" COLSPAN="2" ALIGN="LEFT">location</TD><TD PORT="location.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD><TD PORT="type.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="nofinish" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">nofinish</TD><TD PORT="nofinish.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="adjust" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">adjust</TD><TD PORT="adjust.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="ignore" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">ignore</TD><TD PORT="ignore.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="2" ALIGN="LEFT">allow_cid</TD><TD PORT="allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="2" ALIGN="LEFT">allow_gid</TD><TD PORT="allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="2" ALIGN="LEFT">deny_cid</TD><TD PORT="deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="2" ALIGN="LEFT">deny_gid</TD><TD PORT="deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="event_status" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">event_status</TD><TD PORT="event_status.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="event_status_date" COLSPAN="2" ALIGN="LEFT">event_status_date</TD><TD PORT="event_status_date.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="event_percent" COLSPAN="2" ALIGN="LEFT">event_percent</TD><TD PORT="event_percent.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="event_repeat" COLSPAN="2" ALIGN="LEFT">event_repeat</TD><TD PORT="event_repeat.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="event_sequence" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">event_sequence</TD><TD PORT="event_sequence.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="event.html"
-    tooltip="event"
-  ];
-}
diff --git a/hubzilla_er/diagrams/event.1degree.png b/hubzilla_er/diagrams/event.1degree.png
deleted file mode 100644
index d2b6b1b06..000000000
--- a/hubzilla_er/diagrams/event.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/event.implied2degrees.dot b/hubzilla_er/diagrams/event.implied2degrees.dot
deleted file mode 100644
index 084dffec9..000000000
--- a/hubzilla_er/diagrams/event.implied2degrees.dot
+++ /dev/null
@@ -1,180 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "event":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="app.html"
-    tooltip="app"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="event_xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">event_xchan</TD><TD PORT="event_xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="event_hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">event_hash</TD><TD PORT="event_hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="2" ALIGN="LEFT">edited</TD><TD PORT="edited.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="start" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">start</TD><TD PORT="start.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="finish" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">finish</TD><TD PORT="finish.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="summary" COLSPAN="2" ALIGN="LEFT">summary</TD><TD PORT="summary.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT">description</TD><TD PORT="description.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="location" COLSPAN="2" ALIGN="LEFT">location</TD><TD PORT="location.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD><TD PORT="type.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="nofinish" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">nofinish</TD><TD PORT="nofinish.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="adjust" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">adjust</TD><TD PORT="adjust.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="ignore" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">ignore</TD><TD PORT="ignore.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="2" ALIGN="LEFT">allow_cid</TD><TD PORT="allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="2" ALIGN="LEFT">allow_gid</TD><TD PORT="allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="2" ALIGN="LEFT">deny_cid</TD><TD PORT="deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="2" ALIGN="LEFT">deny_gid</TD><TD PORT="deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="event_status" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">event_status</TD><TD PORT="event_status.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="event_status_date" COLSPAN="2" ALIGN="LEFT">event_status_date</TD><TD PORT="event_status_date.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="event_percent" COLSPAN="2" ALIGN="LEFT">event_percent</TD><TD PORT="event_percent.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="event_repeat" COLSPAN="2" ALIGN="LEFT">event_repeat</TD><TD PORT="event_repeat.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="event_sequence" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">event_sequence</TD><TD PORT="event_sequence.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="event.html"
-    tooltip="event"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="hook.html"
-    tooltip="hook"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="3" ALIGN="LEFT">msg</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">10 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile.html"
-    tooltip="profile"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="spam.html"
-    tooltip="spam"
-  ];
-}
diff --git a/hubzilla_er/diagrams/event.implied2degrees.png b/hubzilla_er/diagrams/event.implied2degrees.png
deleted file mode 100644
index 419451590..000000000
--- a/hubzilla_er/diagrams/event.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/fcontact.1degree.dot b/hubzilla_er/diagrams/fcontact.1degree.dot
deleted file mode 100644
index 9f08b3997..000000000
--- a/hubzilla_er/diagrams/fcontact.1degree.dot
+++ /dev/null
@@ -1,47 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="url" COLSPAN="2" ALIGN="LEFT">url</TD><TD PORT="url.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="2" ALIGN="LEFT">photo</TD><TD PORT="photo.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="request" COLSPAN="2" ALIGN="LEFT">request</TD><TD PORT="request.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="nick" COLSPAN="2" ALIGN="LEFT">nick</TD><TD PORT="nick.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="addr" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">addr</TD><TD PORT="addr.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="batch" COLSPAN="2" ALIGN="LEFT">batch</TD><TD PORT="batch.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="notify" COLSPAN="2" ALIGN="LEFT">notify</TD><TD PORT="notify.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="poll" COLSPAN="2" ALIGN="LEFT">poll</TD><TD PORT="poll.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="confirm" COLSPAN="2" ALIGN="LEFT">confirm</TD><TD PORT="confirm.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="priority" COLSPAN="2" ALIGN="LEFT">priority</TD><TD PORT="priority.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="network" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">network</TD><TD PORT="network.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="alias" COLSPAN="2" ALIGN="LEFT">alias</TD><TD PORT="alias.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="pubkey" COLSPAN="2" ALIGN="LEFT">pubkey</TD><TD PORT="pubkey.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="2" ALIGN="LEFT">updated</TD><TD PORT="updated.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-}
diff --git a/hubzilla_er/diagrams/fcontact.1degree.png b/hubzilla_er/diagrams/fcontact.1degree.png
deleted file mode 100644
index 6b86eecc4..000000000
--- a/hubzilla_er/diagrams/fcontact.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/fcontact.implied2degrees.dot b/hubzilla_er/diagrams/fcontact.implied2degrees.dot
deleted file mode 100644
index 6c484340e..000000000
--- a/hubzilla_er/diagrams/fcontact.implied2degrees.dot
+++ /dev/null
@@ -1,272 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="url" COLSPAN="2" ALIGN="LEFT">url</TD><TD PORT="url.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="2" ALIGN="LEFT">photo</TD><TD PORT="photo.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="request" COLSPAN="2" ALIGN="LEFT">request</TD><TD PORT="request.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="nick" COLSPAN="2" ALIGN="LEFT">nick</TD><TD PORT="nick.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="addr" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">addr</TD><TD PORT="addr.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="batch" COLSPAN="2" ALIGN="LEFT">batch</TD><TD PORT="batch.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="notify" COLSPAN="2" ALIGN="LEFT">notify</TD><TD PORT="notify.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="poll" COLSPAN="2" ALIGN="LEFT">poll</TD><TD PORT="poll.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="confirm" COLSPAN="2" ALIGN="LEFT">confirm</TD><TD PORT="confirm.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="priority" COLSPAN="2" ALIGN="LEFT">priority</TD><TD PORT="priority.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="network" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">network</TD><TD PORT="network.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="alias" COLSPAN="2" ALIGN="LEFT">alias</TD><TD PORT="alias.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="pubkey" COLSPAN="2" ALIGN="LEFT">pubkey</TD><TD PORT="pubkey.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="2" ALIGN="LEFT">updated</TD><TD PORT="updated.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/fcontact.implied2degrees.png b/hubzilla_er/diagrams/fcontact.implied2degrees.png
deleted file mode 100644
index 8b7172971..000000000
--- a/hubzilla_er/diagrams/fcontact.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/ffinder.1degree.dot b/hubzilla_er/diagrams/ffinder.1degree.dot
deleted file mode 100644
index 27122be54..000000000
--- a/hubzilla_er/diagrams/ffinder.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">cid</TD><TD PORT="cid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="fid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">fid</TD><TD PORT="fid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-}
diff --git a/hubzilla_er/diagrams/ffinder.1degree.png b/hubzilla_er/diagrams/ffinder.1degree.png
deleted file mode 100644
index 90acccc73..000000000
--- a/hubzilla_er/diagrams/ffinder.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/ffinder.implied2degrees.dot b/hubzilla_er/diagrams/ffinder.implied2degrees.dot
deleted file mode 100644
index fc574ee04..000000000
--- a/hubzilla_er/diagrams/ffinder.implied2degrees.dot
+++ /dev/null
@@ -1,260 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">cid</TD><TD PORT="cid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="fid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">fid</TD><TD PORT="fid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/ffinder.implied2degrees.png b/hubzilla_er/diagrams/ffinder.implied2degrees.png
deleted file mode 100644
index 0176c8756..000000000
--- a/hubzilla_er/diagrams/ffinder.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/fserver.1degree.dot b/hubzilla_er/diagrams/fserver.1degree.dot
deleted file mode 100644
index 1707f92ed..000000000
--- a/hubzilla_er/diagrams/fserver.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="server" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">server</TD><TD PORT="server.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="posturl" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">posturl</TD><TD PORT="posturl.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="key" COLSPAN="2" ALIGN="LEFT">key</TD><TD PORT="key.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="fserver.html"
-    tooltip="fserver"
-  ];
-}
diff --git a/hubzilla_er/diagrams/fserver.1degree.png b/hubzilla_er/diagrams/fserver.1degree.png
deleted file mode 100644
index a5f4202b7..000000000
--- a/hubzilla_er/diagrams/fserver.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/fserver.implied2degrees.dot b/hubzilla_er/diagrams/fserver.implied2degrees.dot
deleted file mode 100644
index a8f8c5c48..000000000
--- a/hubzilla_er/diagrams/fserver.implied2degrees.dot
+++ /dev/null
@@ -1,159 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "event":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="app.html"
-    tooltip="app"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="event.html"
-    tooltip="event"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="server" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">server</TD><TD PORT="server.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="posturl" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">posturl</TD><TD PORT="posturl.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="key" COLSPAN="2" ALIGN="LEFT">key</TD><TD PORT="key.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="hook.html"
-    tooltip="hook"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="3" ALIGN="LEFT">msg</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">10 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile.html"
-    tooltip="profile"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="spam.html"
-    tooltip="spam"
-  ];
-}
diff --git a/hubzilla_er/diagrams/fserver.implied2degrees.png b/hubzilla_er/diagrams/fserver.implied2degrees.png
deleted file mode 100644
index 25cab82df..000000000
--- a/hubzilla_er/diagrams/fserver.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/fsuggest.1degree.dot b/hubzilla_er/diagrams/fsuggest.1degree.dot
deleted file mode 100644
index 9a1e77791..000000000
--- a/hubzilla_er/diagrams/fsuggest.1degree.dot
+++ /dev/null
@@ -1,40 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="2" ALIGN="LEFT">cid</TD><TD PORT="cid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="url" COLSPAN="2" ALIGN="LEFT">url</TD><TD PORT="url.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="request" COLSPAN="2" ALIGN="LEFT">request</TD><TD PORT="request.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="2" ALIGN="LEFT">photo</TD><TD PORT="photo.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="note" COLSPAN="2" ALIGN="LEFT">note</TD><TD PORT="note.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="fsuggest.html"
-    tooltip="fsuggest"
-  ];
-}
diff --git a/hubzilla_er/diagrams/fsuggest.1degree.png b/hubzilla_er/diagrams/fsuggest.1degree.png
deleted file mode 100644
index dbc01894b..000000000
--- a/hubzilla_er/diagrams/fsuggest.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/fsuggest.implied2degrees.dot b/hubzilla_er/diagrams/fsuggest.implied2degrees.dot
deleted file mode 100644
index 1d027d2a1..000000000
--- a/hubzilla_er/diagrams/fsuggest.implied2degrees.dot
+++ /dev/null
@@ -1,164 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "event":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="app.html"
-    tooltip="app"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="event.html"
-    tooltip="event"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="2" ALIGN="LEFT">cid</TD><TD PORT="cid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="url" COLSPAN="2" ALIGN="LEFT">url</TD><TD PORT="url.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="request" COLSPAN="2" ALIGN="LEFT">request</TD><TD PORT="request.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="2" ALIGN="LEFT">photo</TD><TD PORT="photo.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="note" COLSPAN="2" ALIGN="LEFT">note</TD><TD PORT="note.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="hook.html"
-    tooltip="hook"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="3" ALIGN="LEFT">msg</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">10 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile.html"
-    tooltip="profile"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="spam.html"
-    tooltip="spam"
-  ];
-}
diff --git a/hubzilla_er/diagrams/fsuggest.implied2degrees.png b/hubzilla_er/diagrams/fsuggest.implied2degrees.png
deleted file mode 100644
index d43bb1c9e..000000000
--- a/hubzilla_er/diagrams/fsuggest.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/group_member.1degree.dot b/hubzilla_er/diagrams/group_member.1degree.dot
deleted file mode 100644
index d7a0c6cea..000000000
--- a/hubzilla_er/diagrams/group_member.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="gid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">gid</TD><TD PORT="gid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD><TD PORT="xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-}
diff --git a/hubzilla_er/diagrams/group_member.1degree.png b/hubzilla_er/diagrams/group_member.1degree.png
deleted file mode 100644
index 891ccf306..000000000
--- a/hubzilla_er/diagrams/group_member.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/group_member.implied2degrees.dot b/hubzilla_er/diagrams/group_member.implied2degrees.dot
deleted file mode 100644
index d0cb73fd1..000000000
--- a/hubzilla_er/diagrams/group_member.implied2degrees.dot
+++ /dev/null
@@ -1,260 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="gid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">gid</TD><TD PORT="gid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD><TD PORT="xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/group_member.implied2degrees.png b/hubzilla_er/diagrams/group_member.implied2degrees.png
deleted file mode 100644
index fed9f0ca7..000000000
--- a/hubzilla_er/diagrams/group_member.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/groups.1degree.dot b/hubzilla_er/diagrams/groups.1degree.dot
deleted file mode 100644
index dc40f24fc..000000000
--- a/hubzilla_er/diagrams/groups.1degree.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD><TD PORT="hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="visible" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">visible</TD><TD PORT="visible.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="deleted" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">deleted</TD><TD PORT="deleted.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-}
diff --git a/hubzilla_er/diagrams/groups.1degree.png b/hubzilla_er/diagrams/groups.1degree.png
deleted file mode 100644
index cb7b5d51c..000000000
--- a/hubzilla_er/diagrams/groups.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/groups.implied2degrees.dot b/hubzilla_er/diagrams/groups.implied2degrees.dot
deleted file mode 100644
index 315e0d02c..000000000
--- a/hubzilla_er/diagrams/groups.implied2degrees.dot
+++ /dev/null
@@ -1,262 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD><TD PORT="hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="visible" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">visible</TD><TD PORT="visible.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="deleted" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">deleted</TD><TD PORT="deleted.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/groups.implied2degrees.png b/hubzilla_er/diagrams/groups.implied2degrees.png
deleted file mode 100644
index 03df1cc72..000000000
--- a/hubzilla_er/diagrams/groups.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/hook.1degree.dot b/hubzilla_er/diagrams/hook.1degree.dot
deleted file mode 100644
index bd89b278c..000000000
--- a/hubzilla_er/diagrams/hook.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="hook" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hook</TD><TD PORT="hook.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="file" COLSPAN="2" ALIGN="LEFT">file</TD><TD PORT="file.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="function" COLSPAN="2" ALIGN="LEFT">function</TD><TD PORT="function.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="priority" COLSPAN="2" ALIGN="LEFT">priority</TD><TD PORT="priority.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="hook.html"
-    tooltip="hook"
-  ];
-}
diff --git a/hubzilla_er/diagrams/hook.1degree.png b/hubzilla_er/diagrams/hook.1degree.png
deleted file mode 100644
index 47885c040..000000000
--- a/hubzilla_er/diagrams/hook.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/hook.implied2degrees.dot b/hubzilla_er/diagrams/hook.implied2degrees.dot
deleted file mode 100644
index baae61221..000000000
--- a/hubzilla_er/diagrams/hook.implied2degrees.dot
+++ /dev/null
@@ -1,160 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "event":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="app.html"
-    tooltip="app"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="event.html"
-    tooltip="event"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="hook" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hook</TD><TD PORT="hook.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="file" COLSPAN="2" ALIGN="LEFT">file</TD><TD PORT="file.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="function" COLSPAN="2" ALIGN="LEFT">function</TD><TD PORT="function.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="priority" COLSPAN="2" ALIGN="LEFT">priority</TD><TD PORT="priority.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="hook.html"
-    tooltip="hook"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="3" ALIGN="LEFT">msg</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">10 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile.html"
-    tooltip="profile"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="spam.html"
-    tooltip="spam"
-  ];
-}
diff --git a/hubzilla_er/diagrams/hook.implied2degrees.png b/hubzilla_er/diagrams/hook.implied2degrees.png
deleted file mode 100644
index 5b450e481..000000000
--- a/hubzilla_er/diagrams/hook.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/item.1degree.dot b/hubzilla_er/diagrams/item.1degree.dot
deleted file mode 100644
index 5084997f5..000000000
--- a/hubzilla_er/diagrams/item.1degree.dot
+++ /dev/null
@@ -1,104 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD><TD PORT="mid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD><TD PORT="parent.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD><TD PORT="parent_mid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="thr_parent" COLSPAN="2" ALIGN="LEFT">thr_parent</TD><TD PORT="thr_parent.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">edited</TD><TD PORT="edited.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD><TD PORT="expires.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="commented" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">commented</TD><TD PORT="commented.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="received" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">received</TD><TD PORT="received.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="changed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">changed</TD><TD PORT="changed.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="comments_closed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">comments_closed</TD><TD PORT="comments_closed.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="owner_xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">owner_xchan</TD><TD PORT="owner_xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="author_xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">author_xchan</TD><TD PORT="author_xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="source_xchan" COLSPAN="2" ALIGN="LEFT">source_xchan</TD><TD PORT="source_xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="mimetype" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mimetype</TD><TD PORT="mimetype.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="title" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">title</TD><TD PORT="title.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="body" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">body</TD><TD PORT="body.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="html" COLSPAN="2" ALIGN="LEFT">html</TD><TD PORT="html.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="app" COLSPAN="2" ALIGN="LEFT">app</TD><TD PORT="app.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="lang" COLSPAN="2" ALIGN="LEFT">lang</TD><TD PORT="lang.type" ALIGN="LEFT">char[64]</TD></TR>
-      <TR><TD PORT="revision" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">revision</TD><TD PORT="revision.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD><TD PORT="verb.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="obj_type" COLSPAN="2" ALIGN="LEFT">obj_type</TD><TD PORT="obj_type.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="object" COLSPAN="2" ALIGN="LEFT">object</TD><TD PORT="object.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="tgt_type" COLSPAN="2" ALIGN="LEFT">tgt_type</TD><TD PORT="tgt_type.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="target" COLSPAN="2" ALIGN="LEFT">target</TD><TD PORT="target.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="layout_mid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">layout_mid</TD><TD PORT="layout_mid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="postopts" COLSPAN="2" ALIGN="LEFT">postopts</TD><TD PORT="postopts.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="route" COLSPAN="2" ALIGN="LEFT">route</TD><TD PORT="route.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="llink" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">llink</TD><TD PORT="llink.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="plink" COLSPAN="2" ALIGN="LEFT">plink</TD><TD PORT="plink.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="resource_id" COLSPAN="2" ALIGN="LEFT">resource_id</TD><TD PORT="resource_id.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="resource_type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_type</TD><TD PORT="resource_type.type" ALIGN="LEFT">char[16]</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="2" ALIGN="LEFT">attach</TD><TD PORT="attach.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="2" ALIGN="LEFT">sig</TD><TD PORT="sig.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="diaspora_meta" COLSPAN="2" ALIGN="LEFT">diaspora_meta</TD><TD PORT="diaspora_meta.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="location" COLSPAN="2" ALIGN="LEFT">location</TD><TD PORT="location.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="coord" COLSPAN="2" ALIGN="LEFT">coord</TD><TD PORT="coord.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="public_policy" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">public_policy</TD><TD PORT="public_policy.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="comment_policy" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">comment_policy</TD><TD PORT="comment_policy.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">allow_cid</TD><TD PORT="allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">allow_gid</TD><TD PORT="allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">deny_cid</TD><TD PORT="deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">deny_gid</TD><TD PORT="deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="item_restrict" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_restrict</TD><TD PORT="item_restrict.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="item_flags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_flags</TD><TD PORT="item_flags.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="item_private" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_private</TD><TD PORT="item_private.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_origin" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_origin</TD><TD PORT="item_origin.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_unseen" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_unseen</TD><TD PORT="item_unseen.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_starred" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_starred</TD><TD PORT="item_starred.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_uplink" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_uplink</TD><TD PORT="item_uplink.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_consensus" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_consensus</TD><TD PORT="item_consensus.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_wall" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_wall</TD><TD PORT="item_wall.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_thread_top" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_thread_top</TD><TD PORT="item_thread_top.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_notshown" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_notshown</TD><TD PORT="item_notshown.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_nsfw" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_nsfw</TD><TD PORT="item_nsfw.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_relay" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_relay</TD><TD PORT="item_relay.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_mentionsme" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_mentionsme</TD><TD PORT="item_mentionsme.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_nocomment" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_nocomment</TD><TD PORT="item_nocomment.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_obscured" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_obscured</TD><TD PORT="item_obscured.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_verified" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_verified</TD><TD PORT="item_verified.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_retained" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_retained</TD><TD PORT="item_retained.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_rss" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_rss</TD><TD PORT="item_rss.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_deleted" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_deleted</TD><TD PORT="item_deleted.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_type</TD><TD PORT="item_type.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="item_hidden" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_hidden</TD><TD PORT="item_hidden.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_unpublished" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_unpublished</TD><TD PORT="item_unpublished.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_delayed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_delayed</TD><TD PORT="item_delayed.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_pending_remove" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_pending_remove</TD><TD PORT="item_pending_remove.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_blocked" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_blocked</TD><TD PORT="item_blocked.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-}
diff --git a/hubzilla_er/diagrams/item.1degree.png b/hubzilla_er/diagrams/item.1degree.png
deleted file mode 100644
index 9bffc4236..000000000
--- a/hubzilla_er/diagrams/item.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/item.implied2degrees.dot b/hubzilla_er/diagrams/item.implied2degrees.dot
deleted file mode 100644
index d16148576..000000000
--- a/hubzilla_er/diagrams/item.implied2degrees.dot
+++ /dev/null
@@ -1,329 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD><TD PORT="mid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD><TD PORT="parent.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD><TD PORT="parent_mid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="thr_parent" COLSPAN="2" ALIGN="LEFT">thr_parent</TD><TD PORT="thr_parent.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">edited</TD><TD PORT="edited.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD><TD PORT="expires.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="commented" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">commented</TD><TD PORT="commented.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="received" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">received</TD><TD PORT="received.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="changed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">changed</TD><TD PORT="changed.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="comments_closed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">comments_closed</TD><TD PORT="comments_closed.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="owner_xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">owner_xchan</TD><TD PORT="owner_xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="author_xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">author_xchan</TD><TD PORT="author_xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="source_xchan" COLSPAN="2" ALIGN="LEFT">source_xchan</TD><TD PORT="source_xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="mimetype" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mimetype</TD><TD PORT="mimetype.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="title" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">title</TD><TD PORT="title.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="body" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">body</TD><TD PORT="body.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="html" COLSPAN="2" ALIGN="LEFT">html</TD><TD PORT="html.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="app" COLSPAN="2" ALIGN="LEFT">app</TD><TD PORT="app.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="lang" COLSPAN="2" ALIGN="LEFT">lang</TD><TD PORT="lang.type" ALIGN="LEFT">char[64]</TD></TR>
-      <TR><TD PORT="revision" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">revision</TD><TD PORT="revision.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD><TD PORT="verb.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="obj_type" COLSPAN="2" ALIGN="LEFT">obj_type</TD><TD PORT="obj_type.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="object" COLSPAN="2" ALIGN="LEFT">object</TD><TD PORT="object.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="tgt_type" COLSPAN="2" ALIGN="LEFT">tgt_type</TD><TD PORT="tgt_type.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="target" COLSPAN="2" ALIGN="LEFT">target</TD><TD PORT="target.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="layout_mid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">layout_mid</TD><TD PORT="layout_mid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="postopts" COLSPAN="2" ALIGN="LEFT">postopts</TD><TD PORT="postopts.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="route" COLSPAN="2" ALIGN="LEFT">route</TD><TD PORT="route.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="llink" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">llink</TD><TD PORT="llink.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="plink" COLSPAN="2" ALIGN="LEFT">plink</TD><TD PORT="plink.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="resource_id" COLSPAN="2" ALIGN="LEFT">resource_id</TD><TD PORT="resource_id.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="resource_type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_type</TD><TD PORT="resource_type.type" ALIGN="LEFT">char[16]</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="2" ALIGN="LEFT">attach</TD><TD PORT="attach.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="2" ALIGN="LEFT">sig</TD><TD PORT="sig.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="diaspora_meta" COLSPAN="2" ALIGN="LEFT">diaspora_meta</TD><TD PORT="diaspora_meta.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="location" COLSPAN="2" ALIGN="LEFT">location</TD><TD PORT="location.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="coord" COLSPAN="2" ALIGN="LEFT">coord</TD><TD PORT="coord.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="public_policy" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">public_policy</TD><TD PORT="public_policy.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="comment_policy" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">comment_policy</TD><TD PORT="comment_policy.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">allow_cid</TD><TD PORT="allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">allow_gid</TD><TD PORT="allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">deny_cid</TD><TD PORT="deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">deny_gid</TD><TD PORT="deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="item_restrict" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_restrict</TD><TD PORT="item_restrict.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="item_flags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_flags</TD><TD PORT="item_flags.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="item_private" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_private</TD><TD PORT="item_private.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_origin" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_origin</TD><TD PORT="item_origin.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_unseen" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_unseen</TD><TD PORT="item_unseen.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_starred" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_starred</TD><TD PORT="item_starred.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_uplink" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_uplink</TD><TD PORT="item_uplink.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_consensus" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_consensus</TD><TD PORT="item_consensus.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_wall" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_wall</TD><TD PORT="item_wall.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_thread_top" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_thread_top</TD><TD PORT="item_thread_top.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_notshown" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_notshown</TD><TD PORT="item_notshown.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_nsfw" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_nsfw</TD><TD PORT="item_nsfw.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_relay" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_relay</TD><TD PORT="item_relay.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_mentionsme" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_mentionsme</TD><TD PORT="item_mentionsme.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_nocomment" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_nocomment</TD><TD PORT="item_nocomment.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_obscured" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_obscured</TD><TD PORT="item_obscured.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_verified" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_verified</TD><TD PORT="item_verified.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_retained" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_retained</TD><TD PORT="item_retained.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_rss" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_rss</TD><TD PORT="item_rss.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_deleted" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_deleted</TD><TD PORT="item_deleted.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_type</TD><TD PORT="item_type.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="item_hidden" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_hidden</TD><TD PORT="item_hidden.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_unpublished" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_unpublished</TD><TD PORT="item_unpublished.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_delayed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_delayed</TD><TD PORT="item_delayed.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_pending_remove" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_pending_remove</TD><TD PORT="item_pending_remove.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="item_blocked" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">item_blocked</TD><TD PORT="item_blocked.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/item.implied2degrees.png b/hubzilla_er/diagrams/item.implied2degrees.png
deleted file mode 100644
index d909c2e71..000000000
--- a/hubzilla_er/diagrams/item.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/item_id.1degree.dot b/hubzilla_er/diagrams/item_id.1degree.dot
deleted file mode 100644
index f92bfbd20..000000000
--- a/hubzilla_er/diagrams/item_id.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD><TD PORT="iid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="sid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">sid</TD><TD PORT="sid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="service" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">service</TD><TD PORT="service.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-}
diff --git a/hubzilla_er/diagrams/item_id.1degree.png b/hubzilla_er/diagrams/item_id.1degree.png
deleted file mode 100644
index cf3c4a22d..000000000
--- a/hubzilla_er/diagrams/item_id.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/item_id.implied2degrees.dot b/hubzilla_er/diagrams/item_id.implied2degrees.dot
deleted file mode 100644
index 7cdbd3403..000000000
--- a/hubzilla_er/diagrams/item_id.implied2degrees.dot
+++ /dev/null
@@ -1,261 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD><TD PORT="iid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="sid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">sid</TD><TD PORT="sid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="service" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">service</TD><TD PORT="service.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/item_id.implied2degrees.png b/hubzilla_er/diagrams/item_id.implied2degrees.png
deleted file mode 100644
index 3537e624f..000000000
--- a/hubzilla_er/diagrams/item_id.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/likes.1degree.dot b/hubzilla_er/diagrams/likes.1degree.dot
deleted file mode 100644
index 45edc60c1..000000000
--- a/hubzilla_er/diagrams/likes.1degree.dot
+++ /dev/null
@@ -1,40 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD><TD PORT="channel_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="liker" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">liker</TD><TD PORT="liker.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="likee" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">likee</TD><TD PORT="likee.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD><TD PORT="iid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD><TD PORT="verb.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="target_type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">target_type</TD><TD PORT="target_type.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="target_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">target_id</TD><TD PORT="target_id.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="target" COLSPAN="2" ALIGN="LEFT">target</TD><TD PORT="target.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-}
diff --git a/hubzilla_er/diagrams/likes.1degree.png b/hubzilla_er/diagrams/likes.1degree.png
deleted file mode 100644
index 65e60b69c..000000000
--- a/hubzilla_er/diagrams/likes.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/likes.implied2degrees.dot b/hubzilla_er/diagrams/likes.implied2degrees.dot
deleted file mode 100644
index 1eb95efd7..000000000
--- a/hubzilla_er/diagrams/likes.implied2degrees.dot
+++ /dev/null
@@ -1,325 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"channel_id":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "likes":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="channel_account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_account_id</TD></TR>
-      <TR><TD PORT="channel_primary" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_primary</TD></TR>
-      <TR><TD PORT="channel_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_name</TD></TR>
-      <TR><TD PORT="channel_address" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_address</TD></TR>
-      <TR><TD PORT="channel_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_guid</TD></TR>
-      <TR><TD PORT="channel_guid_sig" COLSPAN="3" ALIGN="LEFT">channel_guid_sig</TD></TR>
-      <TR><TD PORT="channel_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_hash</TD></TR>
-      <TR><TD PORT="channel_timezone" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_timezone</TD></TR>
-      <TR><TD PORT="channel_location" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_location</TD></TR>
-      <TR><TD PORT="channel_theme" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_theme</TD></TR>
-      <TR><TD PORT="channel_startpage" COLSPAN="3" ALIGN="LEFT">channel_startpage</TD></TR>
-      <TR><TD PORT="channel_pubkey" COLSPAN="3" ALIGN="LEFT">channel_pubkey</TD></TR>
-      <TR><TD PORT="channel_prvkey" COLSPAN="3" ALIGN="LEFT">channel_prvkey</TD></TR>
-      <TR><TD PORT="channel_notifyflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_notifyflags</TD></TR>
-      <TR><TD PORT="channel_pageflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_pageflags</TD></TR>
-      <TR><TD PORT="channel_dirdate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_dirdate</TD></TR>
-      <TR><TD PORT="channel_lastpost" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_lastpost</TD></TR>
-      <TR><TD PORT="channel_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_deleted</TD></TR>
-      <TR><TD PORT="channel_max_anon_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_anon_mail</TD></TR>
-      <TR><TD PORT="channel_max_friend_req" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_friend_req</TD></TR>
-      <TR><TD PORT="channel_expire_days" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_expire_days</TD></TR>
-      <TR><TD PORT="channel_passwd_reset" COLSPAN="3" ALIGN="LEFT">channel_passwd_reset</TD></TR>
-      <TR><TD PORT="channel_default_group" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_default_group</TD></TR>
-      <TR><TD PORT="channel_allow_cid" COLSPAN="3" ALIGN="LEFT">channel_allow_cid</TD></TR>
-      <TR><TD PORT="channel_allow_gid" COLSPAN="3" ALIGN="LEFT">channel_allow_gid</TD></TR>
-      <TR><TD PORT="channel_deny_cid" COLSPAN="3" ALIGN="LEFT">channel_deny_cid</TD></TR>
-      <TR><TD PORT="channel_deny_gid" COLSPAN="3" ALIGN="LEFT">channel_deny_gid</TD></TR>
-      <TR><TD PORT="channel_r_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_stream</TD></TR>
-      <TR><TD PORT="channel_r_profile" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_profile</TD></TR>
-      <TR><TD PORT="channel_r_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_photos</TD></TR>
-      <TR><TD PORT="channel_r_abook" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_abook</TD></TR>
-      <TR><TD PORT="channel_w_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_stream</TD></TR>
-      <TR><TD PORT="channel_w_wall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_wall</TD></TR>
-      <TR><TD PORT="channel_w_tagwall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_tagwall</TD></TR>
-      <TR><TD PORT="channel_w_comment" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_comment</TD></TR>
-      <TR><TD PORT="channel_w_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_mail</TD></TR>
-      <TR><TD PORT="channel_w_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_photos</TD></TR>
-      <TR><TD PORT="channel_w_chat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_chat</TD></TR>
-      <TR><TD PORT="channel_a_delegate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_delegate</TD></TR>
-      <TR><TD PORT="channel_r_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_storage</TD></TR>
-      <TR><TD PORT="channel_w_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_storage</TD></TR>
-      <TR><TD PORT="channel_r_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_pages</TD></TR>
-      <TR><TD PORT="channel_w_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_pages</TD></TR>
-      <TR><TD PORT="channel_a_republish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_republish</TD></TR>
-      <TR><TD PORT="channel_w_like" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_like</TD></TR>
-      <TR><TD PORT="channel_removed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_removed</TD></TR>
-      <TR><TD PORT="channel_system" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_system</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="channel.html"
-    tooltip="channel"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD><TD PORT="channel_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="liker" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">liker</TD><TD PORT="liker.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="likee" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">likee</TD><TD PORT="likee.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD><TD PORT="iid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD><TD PORT="verb.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="target_type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">target_type</TD><TD PORT="target_type.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="target_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">target_id</TD><TD PORT="target_id.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="target" COLSPAN="2" ALIGN="LEFT">target</TD><TD PORT="target.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/likes.implied2degrees.png b/hubzilla_er/diagrams/likes.implied2degrees.png
deleted file mode 100644
index cbf3ed658..000000000
--- a/hubzilla_er/diagrams/likes.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/mail.1degree.dot b/hubzilla_er/diagrams/mail.1degree.dot
deleted file mode 100644
index 9665d4251..000000000
--- a/hubzilla_er/diagrams/mail.1degree.dot
+++ /dev/null
@@ -1,52 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="convid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">convid</TD><TD PORT="convid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="mail_flags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_flags</TD><TD PORT="mail_flags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="from_xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">from_xchan</TD><TD PORT="from_xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="to_xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">to_xchan</TD><TD PORT="to_xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_id</TD><TD PORT="account_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD><TD PORT="channel_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="title" COLSPAN="2" ALIGN="LEFT">title</TD><TD PORT="title.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="body" COLSPAN="2" ALIGN="LEFT">body</TD><TD PORT="body.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="2" ALIGN="LEFT">sig</TD><TD PORT="sig.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="2" ALIGN="LEFT">attach</TD><TD PORT="attach.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD><TD PORT="mid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD><TD PORT="parent_mid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="mail_deleted" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_deleted</TD><TD PORT="mail_deleted.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="mail_replied" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_replied</TD><TD PORT="mail_replied.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="mail_isreply" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_isreply</TD><TD PORT="mail_isreply.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="mail_seen" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_seen</TD><TD PORT="mail_seen.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="mail_recalled" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_recalled</TD><TD PORT="mail_recalled.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="mail_obscured" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_obscured</TD><TD PORT="mail_obscured.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD><TD PORT="expires.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-}
diff --git a/hubzilla_er/diagrams/mail.1degree.png b/hubzilla_er/diagrams/mail.1degree.png
deleted file mode 100644
index 2250e2540..000000000
--- a/hubzilla_er/diagrams/mail.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/mail.implied2degrees.dot b/hubzilla_er/diagrams/mail.implied2degrees.dot
deleted file mode 100644
index 2142d5d54..000000000
--- a/hubzilla_er/diagrams/mail.implied2degrees.dot
+++ /dev/null
@@ -1,365 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"account_id":w -> "account":"account_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"channel_id":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "account" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">account</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">account_id</TD></TR>
-      <TR><TD PORT="account_parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_parent</TD></TR>
-      <TR><TD PORT="account_default_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_default_channel</TD></TR>
-      <TR><TD PORT="account_salt" COLSPAN="3" ALIGN="LEFT">account_salt</TD></TR>
-      <TR><TD PORT="account_password" COLSPAN="3" ALIGN="LEFT">account_password</TD></TR>
-      <TR><TD PORT="account_email" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_email</TD></TR>
-      <TR><TD PORT="account_external" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_external</TD></TR>
-      <TR><TD PORT="account_language" COLSPAN="3" ALIGN="LEFT">account_language</TD></TR>
-      <TR><TD PORT="account_created" COLSPAN="3" ALIGN="LEFT">account_created</TD></TR>
-      <TR><TD PORT="account_lastlog" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_lastlog</TD></TR>
-      <TR><TD PORT="account_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_flags</TD></TR>
-      <TR><TD PORT="account_roles" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_roles</TD></TR>
-      <TR><TD PORT="account_reset" COLSPAN="3" ALIGN="LEFT">account_reset</TD></TR>
-      <TR><TD PORT="account_expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_expires</TD></TR>
-      <TR><TD PORT="account_expire_notified" COLSPAN="3" ALIGN="LEFT">account_expire_notified</TD></TR>
-      <TR><TD PORT="account_service_class" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_service_class</TD></TR>
-      <TR><TD PORT="account_level" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_level</TD></TR>
-      <TR><TD PORT="account_password_changed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_password_changed</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="account.html"
-    tooltip="account"
-  ];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="channel_account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_account_id</TD></TR>
-      <TR><TD PORT="channel_primary" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_primary</TD></TR>
-      <TR><TD PORT="channel_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_name</TD></TR>
-      <TR><TD PORT="channel_address" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_address</TD></TR>
-      <TR><TD PORT="channel_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_guid</TD></TR>
-      <TR><TD PORT="channel_guid_sig" COLSPAN="3" ALIGN="LEFT">channel_guid_sig</TD></TR>
-      <TR><TD PORT="channel_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_hash</TD></TR>
-      <TR><TD PORT="channel_timezone" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_timezone</TD></TR>
-      <TR><TD PORT="channel_location" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_location</TD></TR>
-      <TR><TD PORT="channel_theme" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_theme</TD></TR>
-      <TR><TD PORT="channel_startpage" COLSPAN="3" ALIGN="LEFT">channel_startpage</TD></TR>
-      <TR><TD PORT="channel_pubkey" COLSPAN="3" ALIGN="LEFT">channel_pubkey</TD></TR>
-      <TR><TD PORT="channel_prvkey" COLSPAN="3" ALIGN="LEFT">channel_prvkey</TD></TR>
-      <TR><TD PORT="channel_notifyflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_notifyflags</TD></TR>
-      <TR><TD PORT="channel_pageflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_pageflags</TD></TR>
-      <TR><TD PORT="channel_dirdate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_dirdate</TD></TR>
-      <TR><TD PORT="channel_lastpost" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_lastpost</TD></TR>
-      <TR><TD PORT="channel_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_deleted</TD></TR>
-      <TR><TD PORT="channel_max_anon_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_anon_mail</TD></TR>
-      <TR><TD PORT="channel_max_friend_req" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_friend_req</TD></TR>
-      <TR><TD PORT="channel_expire_days" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_expire_days</TD></TR>
-      <TR><TD PORT="channel_passwd_reset" COLSPAN="3" ALIGN="LEFT">channel_passwd_reset</TD></TR>
-      <TR><TD PORT="channel_default_group" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_default_group</TD></TR>
-      <TR><TD PORT="channel_allow_cid" COLSPAN="3" ALIGN="LEFT">channel_allow_cid</TD></TR>
-      <TR><TD PORT="channel_allow_gid" COLSPAN="3" ALIGN="LEFT">channel_allow_gid</TD></TR>
-      <TR><TD PORT="channel_deny_cid" COLSPAN="3" ALIGN="LEFT">channel_deny_cid</TD></TR>
-      <TR><TD PORT="channel_deny_gid" COLSPAN="3" ALIGN="LEFT">channel_deny_gid</TD></TR>
-      <TR><TD PORT="channel_r_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_stream</TD></TR>
-      <TR><TD PORT="channel_r_profile" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_profile</TD></TR>
-      <TR><TD PORT="channel_r_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_photos</TD></TR>
-      <TR><TD PORT="channel_r_abook" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_abook</TD></TR>
-      <TR><TD PORT="channel_w_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_stream</TD></TR>
-      <TR><TD PORT="channel_w_wall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_wall</TD></TR>
-      <TR><TD PORT="channel_w_tagwall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_tagwall</TD></TR>
-      <TR><TD PORT="channel_w_comment" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_comment</TD></TR>
-      <TR><TD PORT="channel_w_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_mail</TD></TR>
-      <TR><TD PORT="channel_w_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_photos</TD></TR>
-      <TR><TD PORT="channel_w_chat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_chat</TD></TR>
-      <TR><TD PORT="channel_a_delegate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_delegate</TD></TR>
-      <TR><TD PORT="channel_r_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_storage</TD></TR>
-      <TR><TD PORT="channel_w_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_storage</TD></TR>
-      <TR><TD PORT="channel_r_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_pages</TD></TR>
-      <TR><TD PORT="channel_w_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_pages</TD></TR>
-      <TR><TD PORT="channel_a_republish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_republish</TD></TR>
-      <TR><TD PORT="channel_w_like" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_like</TD></TR>
-      <TR><TD PORT="channel_removed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_removed</TD></TR>
-      <TR><TD PORT="channel_system" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_system</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="channel.html"
-    tooltip="channel"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="convid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">convid</TD><TD PORT="convid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="mail_flags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_flags</TD><TD PORT="mail_flags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="from_xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">from_xchan</TD><TD PORT="from_xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="to_xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">to_xchan</TD><TD PORT="to_xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">account_id</TD><TD PORT="account_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD><TD PORT="channel_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="title" COLSPAN="2" ALIGN="LEFT">title</TD><TD PORT="title.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="body" COLSPAN="2" ALIGN="LEFT">body</TD><TD PORT="body.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="2" ALIGN="LEFT">sig</TD><TD PORT="sig.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="2" ALIGN="LEFT">attach</TD><TD PORT="attach.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD><TD PORT="mid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD><TD PORT="parent_mid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="mail_deleted" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_deleted</TD><TD PORT="mail_deleted.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="mail_replied" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_replied</TD><TD PORT="mail_replied.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="mail_isreply" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_isreply</TD><TD PORT="mail_isreply.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="mail_seen" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_seen</TD><TD PORT="mail_seen.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="mail_recalled" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_recalled</TD><TD PORT="mail_recalled.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="mail_obscured" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_obscured</TD><TD PORT="mail_obscured.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD><TD PORT="expires.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/mail.implied2degrees.png b/hubzilla_er/diagrams/mail.implied2degrees.png
deleted file mode 100644
index 6f16faf16..000000000
--- a/hubzilla_er/diagrams/mail.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/manage.1degree.dot b/hubzilla_er/diagrams/manage.1degree.dot
deleted file mode 100644
index 477448c84..000000000
--- a/hubzilla_er/diagrams/manage.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD><TD PORT="xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="manage.html"
-    tooltip="manage"
-  ];
-}
diff --git a/hubzilla_er/diagrams/manage.1degree.png b/hubzilla_er/diagrams/manage.1degree.png
deleted file mode 100644
index cd1703abb..000000000
--- a/hubzilla_er/diagrams/manage.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/manage.implied2degrees.dot b/hubzilla_er/diagrams/manage.implied2degrees.dot
deleted file mode 100644
index 73ee44cc6..000000000
--- a/hubzilla_er/diagrams/manage.implied2degrees.dot
+++ /dev/null
@@ -1,158 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "event":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="app.html"
-    tooltip="app"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="event.html"
-    tooltip="event"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="hook.html"
-    tooltip="hook"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD><TD PORT="xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="3" ALIGN="LEFT">msg</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">10 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile.html"
-    tooltip="profile"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="spam.html"
-    tooltip="spam"
-  ];
-}
diff --git a/hubzilla_er/diagrams/manage.implied2degrees.png b/hubzilla_er/diagrams/manage.implied2degrees.png
deleted file mode 100644
index 04027b5d8..000000000
--- a/hubzilla_er/diagrams/manage.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/notify.1degree.dot b/hubzilla_er/diagrams/notify.1degree.dot
deleted file mode 100644
index aedb0a968..000000000
--- a/hubzilla_er/diagrams/notify.1degree.dot
+++ /dev/null
@@ -1,46 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD><TD PORT="hash.type" ALIGN="LEFT">char[64]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="url" COLSPAN="2" ALIGN="LEFT">url</TD><TD PORT="url.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="2" ALIGN="LEFT">photo</TD><TD PORT="photo.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="date" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD><TD PORT="date.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="2" ALIGN="LEFT">msg</TD><TD PORT="msg.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="link" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD><TD PORT="link.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD><TD PORT="parent.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD><TD PORT="seen.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD><TD PORT="type.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="2" ALIGN="LEFT">verb</TD><TD PORT="verb.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD><TD PORT="otype.type" ALIGN="LEFT">char[16]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-}
diff --git a/hubzilla_er/diagrams/notify.1degree.png b/hubzilla_er/diagrams/notify.1degree.png
deleted file mode 100644
index c0ed622d5..000000000
--- a/hubzilla_er/diagrams/notify.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/notify.implied2degrees.dot b/hubzilla_er/diagrams/notify.implied2degrees.dot
deleted file mode 100644
index 9c4626bdb..000000000
--- a/hubzilla_er/diagrams/notify.implied2degrees.dot
+++ /dev/null
@@ -1,279 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon":"id":w -> "notify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"id":w -> "notify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "event":"id":w -> "notify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"id":w -> "notify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"id":w -> "notify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"id":w -> "notify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"id":w -> "notify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"id":w -> "notify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"k":w -> "cache":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profile":"id":w -> "notify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"id":w -> "notify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="version" COLSPAN="3" ALIGN="LEFT">version</TD></TR>
-      <TR><TD PORT="installed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">installed</TD></TR>
-      <TR><TD PORT="hidden" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hidden</TD></TR>
-      <TR><TD PORT="timestamp" COLSPAN="3" ALIGN="LEFT">timestamp</TD></TR>
-      <TR><TD PORT="plugin_admin" COLSPAN="3" ALIGN="LEFT">plugin_admin</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="app_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_id</TD></TR>
-      <TR><TD PORT="app_sig" COLSPAN="3" ALIGN="LEFT">app_sig</TD></TR>
-      <TR><TD PORT="app_author" COLSPAN="3" ALIGN="LEFT">app_author</TD></TR>
-      <TR><TD PORT="app_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_name</TD></TR>
-      <TR><TD PORT="app_desc" COLSPAN="3" ALIGN="LEFT">app_desc</TD></TR>
-      <TR><TD PORT="app_url" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_url</TD></TR>
-      <TR><TD PORT="app_photo" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_photo</TD></TR>
-      <TR><TD PORT="app_version" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_version</TD></TR>
-      <TR><TD PORT="app_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_channel</TD></TR>
-      <TR><TD PORT="app_addr" COLSPAN="3" ALIGN="LEFT">app_addr</TD></TR>
-      <TR><TD PORT="app_price" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_price</TD></TR>
-      <TR><TD PORT="app_page" COLSPAN="3" ALIGN="LEFT">app_page</TD></TR>
-      <TR><TD PORT="app_requires" COLSPAN="3" ALIGN="LEFT">app_requires</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="app.html"
-    tooltip="app"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 &gt;</TD></TR>
-    </TABLE>>
-    URL="cache.html"
-    tooltip="cache"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="event_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_xchan</TD></TR>
-      <TR><TD PORT="event_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_hash</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="start" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">start</TD></TR>
-      <TR><TD PORT="finish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">finish</TD></TR>
-      <TR><TD PORT="summary" COLSPAN="3" ALIGN="LEFT">summary</TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT">description</TD></TR>
-      <TR><TD PORT="location" COLSPAN="3" ALIGN="LEFT">location</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="nofinish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">nofinish</TD></TR>
-      <TR><TD PORT="adjust" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">adjust</TD></TR>
-      <TR><TD PORT="ignore" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ignore</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD PORT="event_status" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_status</TD></TR>
-      <TR><TD PORT="event_status_date" COLSPAN="3" ALIGN="LEFT">event_status_date</TD></TR>
-      <TR><TD PORT="event_percent" COLSPAN="3" ALIGN="LEFT">event_percent</TD></TR>
-      <TR><TD PORT="event_repeat" COLSPAN="3" ALIGN="LEFT">event_repeat</TD></TR>
-      <TR><TD PORT="event_sequence" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_sequence</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="event.html"
-    tooltip="event"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="server" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">server</TD></TR>
-      <TR><TD PORT="posturl" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">posturl</TD></TR>
-      <TR><TD PORT="key" COLSPAN="3" ALIGN="LEFT">key</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="3" ALIGN="LEFT">cid</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="request" COLSPAN="3" ALIGN="LEFT">request</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="note" COLSPAN="3" ALIGN="LEFT">note</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hook" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hook</TD></TR>
-      <TR><TD PORT="file" COLSPAN="3" ALIGN="LEFT">file</TD></TR>
-      <TR><TD PORT="function" COLSPAN="3" ALIGN="LEFT">function</TD></TR>
-      <TR><TD PORT="priority" COLSPAN="3" ALIGN="LEFT">priority</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="hook.html"
-    tooltip="hook"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD><TD PORT="hash.type" ALIGN="LEFT">char[64]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="url" COLSPAN="2" ALIGN="LEFT">url</TD><TD PORT="url.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="2" ALIGN="LEFT">photo</TD><TD PORT="photo.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="date" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD><TD PORT="date.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="2" ALIGN="LEFT">msg</TD><TD PORT="msg.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="link" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD><TD PORT="link.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD><TD PORT="parent.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD><TD PORT="seen.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD><TD PORT="type.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="2" ALIGN="LEFT">verb</TD><TD PORT="verb.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD><TD PORT="otype.type" ALIGN="LEFT">char[16]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">10 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="profile_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">profile_guid</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="profile_name" COLSPAN="3" ALIGN="LEFT">profile_name</TD></TR>
-      <TR><TD PORT="is_default" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_default</TD></TR>
-      <TR><TD PORT="hide_friends" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hide_friends</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="pdesc" COLSPAN="3" ALIGN="LEFT">pdesc</TD></TR>
-      <TR><TD PORT="chandesc" COLSPAN="3" ALIGN="LEFT">chandesc</TD></TR>
-      <TR><TD PORT="dob" COLSPAN="3" ALIGN="LEFT">dob</TD></TR>
-      <TR><TD PORT="dob_tz" COLSPAN="3" ALIGN="LEFT">dob_tz</TD></TR>
-      <TR><TD PORT="address" COLSPAN="3" ALIGN="LEFT">address</TD></TR>
-      <TR><TD PORT="locality" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">locality</TD></TR>
-      <TR><TD PORT="region" COLSPAN="3" ALIGN="LEFT">region</TD></TR>
-      <TR><TD PORT="postal_code" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">postal_code</TD></TR>
-      <TR><TD PORT="country_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">country_name</TD></TR>
-      <TR><TD PORT="hometown" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hometown</TD></TR>
-      <TR><TD PORT="gender" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">gender</TD></TR>
-      <TR><TD PORT="marital" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">marital</TD></TR>
-      <TR><TD PORT="with" COLSPAN="3" ALIGN="LEFT">with</TD></TR>
-      <TR><TD PORT="howlong" COLSPAN="3" ALIGN="LEFT">howlong</TD></TR>
-      <TR><TD PORT="sexual" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sexual</TD></TR>
-      <TR><TD PORT="politic" COLSPAN="3" ALIGN="LEFT">politic</TD></TR>
-      <TR><TD PORT="religion" COLSPAN="3" ALIGN="LEFT">religion</TD></TR>
-      <TR><TD PORT="keywords" COLSPAN="3" ALIGN="LEFT">keywords</TD></TR>
-      <TR><TD PORT="likes" COLSPAN="3" ALIGN="LEFT">likes</TD></TR>
-      <TR><TD PORT="dislikes" COLSPAN="3" ALIGN="LEFT">dislikes</TD></TR>
-      <TR><TD PORT="about" COLSPAN="3" ALIGN="LEFT">about</TD></TR>
-      <TR><TD PORT="summary" COLSPAN="3" ALIGN="LEFT">summary</TD></TR>
-      <TR><TD PORT="music" COLSPAN="3" ALIGN="LEFT">music</TD></TR>
-      <TR><TD PORT="book" COLSPAN="3" ALIGN="LEFT">book</TD></TR>
-      <TR><TD PORT="tv" COLSPAN="3" ALIGN="LEFT">tv</TD></TR>
-      <TR><TD PORT="film" COLSPAN="3" ALIGN="LEFT">film</TD></TR>
-      <TR><TD PORT="interest" COLSPAN="3" ALIGN="LEFT">interest</TD></TR>
-      <TR><TD PORT="romance" COLSPAN="3" ALIGN="LEFT">romance</TD></TR>
-      <TR><TD PORT="work" COLSPAN="3" ALIGN="LEFT">work</TD></TR>
-      <TR><TD PORT="education" COLSPAN="3" ALIGN="LEFT">education</TD></TR>
-      <TR><TD PORT="contact" COLSPAN="3" ALIGN="LEFT">contact</TD></TR>
-      <TR><TD PORT="channels" COLSPAN="3" ALIGN="LEFT">channels</TD></TR>
-      <TR><TD PORT="homepage" COLSPAN="3" ALIGN="LEFT">homepage</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="thumb" COLSPAN="3" ALIGN="LEFT">thumb</TD></TR>
-      <TR><TD PORT="publish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">publish</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile.html"
-    tooltip="profile"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="spam" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">spam</TD></TR>
-      <TR><TD PORT="ham" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ham</TD></TR>
-      <TR><TD PORT="term" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">term</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" ALIGN="LEFT">date</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="spam.html"
-    tooltip="spam"
-  ];
-}
diff --git a/hubzilla_er/diagrams/notify.implied2degrees.png b/hubzilla_er/diagrams/notify.implied2degrees.png
deleted file mode 100644
index a511439f3..000000000
--- a/hubzilla_er/diagrams/notify.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/pconfig.1degree.dot b/hubzilla_er/diagrams/pconfig.1degree.dot
deleted file mode 100644
index 298a46ff6..000000000
--- a/hubzilla_er/diagrams/pconfig.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD><TD PORT="cat.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="k" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD><TD PORT="k.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="v" COLSPAN="2" ALIGN="LEFT">v</TD><TD PORT="v.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-}
diff --git a/hubzilla_er/diagrams/pconfig.1degree.png b/hubzilla_er/diagrams/pconfig.1degree.png
deleted file mode 100644
index bdd28696e..000000000
--- a/hubzilla_er/diagrams/pconfig.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/pconfig.implied2degrees.dot b/hubzilla_er/diagrams/pconfig.implied2degrees.dot
deleted file mode 100644
index ceef2e2c3..000000000
--- a/hubzilla_er/diagrams/pconfig.implied2degrees.dot
+++ /dev/null
@@ -1,217 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "event":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profext":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profile":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xconfig":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="app.html"
-    tooltip="app"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 &gt;</TD></TR>
-    </TABLE>>
-    URL="cache.html"
-    tooltip="cache"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="event.html"
-    tooltip="event"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="hook.html"
-    tooltip="hook"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="3" ALIGN="LEFT">msg</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">10 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD><TD PORT="cat.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="k" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD><TD PORT="k.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="v" COLSPAN="2" ALIGN="LEFT">v</TD><TD PORT="v.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile.html"
-    tooltip="profile"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="spam.html"
-    tooltip="spam"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-}
diff --git a/hubzilla_er/diagrams/pconfig.implied2degrees.png b/hubzilla_er/diagrams/pconfig.implied2degrees.png
deleted file mode 100644
index 2ca04a341..000000000
--- a/hubzilla_er/diagrams/pconfig.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/photo.1degree.dot b/hubzilla_er/diagrams/photo.1degree.dot
deleted file mode 100644
index b648a58e6..000000000
--- a/hubzilla_er/diagrams/photo.1degree.dot
+++ /dev/null
@@ -1,59 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD><TD PORT="xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="resource_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_id</TD><TD PORT="resource_id.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="2" ALIGN="LEFT">edited</TD><TD PORT="edited.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="title" COLSPAN="2" ALIGN="LEFT">title</TD><TD PORT="title.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT">description</TD><TD PORT="description.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="album" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">album</TD><TD PORT="album.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="filename" COLSPAN="2" ALIGN="LEFT">filename</TD><TD PORT="filename.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD><TD PORT="type.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="height" COLSPAN="2" ALIGN="LEFT">height</TD><TD PORT="height.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="width" COLSPAN="2" ALIGN="LEFT">width</TD><TD PORT="width.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="size" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">size</TD><TD PORT="size.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="data" COLSPAN="2" ALIGN="LEFT">data</TD><TD PORT="data.type" ALIGN="LEFT">mediumblob[16777215]</TD></TR>
-      <TR><TD PORT="scale" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">scale</TD><TD PORT="scale.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="photo_usage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_usage</TD><TD PORT="photo_usage.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="profile" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">profile</TD><TD PORT="profile.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="is_nsfw" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">is_nsfw</TD><TD PORT="is_nsfw.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD><TD PORT="os_storage.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="os_path" COLSPAN="2" ALIGN="LEFT">os_path</TD><TD PORT="os_path.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="display_path" COLSPAN="2" ALIGN="LEFT">display_path</TD><TD PORT="display_path.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="photo_flags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_flags</TD><TD PORT="photo_flags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="2" ALIGN="LEFT">allow_cid</TD><TD PORT="allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="2" ALIGN="LEFT">allow_gid</TD><TD PORT="allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="2" ALIGN="LEFT">deny_cid</TD><TD PORT="deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="2" ALIGN="LEFT">deny_gid</TD><TD PORT="deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-}
diff --git a/hubzilla_er/diagrams/photo.1degree.png b/hubzilla_er/diagrams/photo.1degree.png
deleted file mode 100644
index 34bb4f9ba..000000000
--- a/hubzilla_er/diagrams/photo.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/photo.implied2degrees.dot b/hubzilla_er/diagrams/photo.implied2degrees.dot
deleted file mode 100644
index 728150afd..000000000
--- a/hubzilla_er/diagrams/photo.implied2degrees.dot
+++ /dev/null
@@ -1,284 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD><TD PORT="xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="resource_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_id</TD><TD PORT="resource_id.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="2" ALIGN="LEFT">edited</TD><TD PORT="edited.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="title" COLSPAN="2" ALIGN="LEFT">title</TD><TD PORT="title.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT">description</TD><TD PORT="description.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="album" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">album</TD><TD PORT="album.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="filename" COLSPAN="2" ALIGN="LEFT">filename</TD><TD PORT="filename.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD><TD PORT="type.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="height" COLSPAN="2" ALIGN="LEFT">height</TD><TD PORT="height.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="width" COLSPAN="2" ALIGN="LEFT">width</TD><TD PORT="width.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="size" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">size</TD><TD PORT="size.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="data" COLSPAN="2" ALIGN="LEFT">data</TD><TD PORT="data.type" ALIGN="LEFT">mediumblob[16777215]</TD></TR>
-      <TR><TD PORT="scale" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">scale</TD><TD PORT="scale.type" ALIGN="LEFT">tinyint[3]</TD></TR>
-      <TR><TD PORT="photo_usage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_usage</TD><TD PORT="photo_usage.type" ALIGN="LEFT">smallint[5]</TD></TR>
-      <TR><TD PORT="profile" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">profile</TD><TD PORT="profile.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="is_nsfw" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">is_nsfw</TD><TD PORT="is_nsfw.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD><TD PORT="os_storage.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="os_path" COLSPAN="2" ALIGN="LEFT">os_path</TD><TD PORT="os_path.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="display_path" COLSPAN="2" ALIGN="LEFT">display_path</TD><TD PORT="display_path.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="photo_flags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_flags</TD><TD PORT="photo_flags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="2" ALIGN="LEFT">allow_cid</TD><TD PORT="allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="2" ALIGN="LEFT">allow_gid</TD><TD PORT="allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="2" ALIGN="LEFT">deny_cid</TD><TD PORT="deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="2" ALIGN="LEFT">deny_gid</TD><TD PORT="deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/photo.implied2degrees.png b/hubzilla_er/diagrams/photo.implied2degrees.png
deleted file mode 100644
index cfa6d0d2e..000000000
--- a/hubzilla_er/diagrams/photo.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/profdef.1degree.dot b/hubzilla_er/diagrams/profdef.1degree.dot
deleted file mode 100644
index d01868b36..000000000
--- a/hubzilla_er/diagrams/profdef.1degree.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="field_name" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">field_name</TD><TD PORT="field_name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="field_type" COLSPAN="2" ALIGN="LEFT">field_type</TD><TD PORT="field_type.type" ALIGN="LEFT">char[16]</TD></TR>
-      <TR><TD PORT="field_desc" COLSPAN="2" ALIGN="LEFT">field_desc</TD><TD PORT="field_desc.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="field_help" COLSPAN="2" ALIGN="LEFT">field_help</TD><TD PORT="field_help.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="field_inputs" COLSPAN="2" ALIGN="LEFT">field_inputs</TD><TD PORT="field_inputs.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-}
diff --git a/hubzilla_er/diagrams/profdef.1degree.png b/hubzilla_er/diagrams/profdef.1degree.png
deleted file mode 100644
index 5fd0a8cc3..000000000
--- a/hubzilla_er/diagrams/profdef.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/profdef.implied2degrees.dot b/hubzilla_er/diagrams/profdef.implied2degrees.dot
deleted file mode 100644
index 6d908944e..000000000
--- a/hubzilla_er/diagrams/profdef.implied2degrees.dot
+++ /dev/null
@@ -1,262 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="field_name" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">field_name</TD><TD PORT="field_name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="field_type" COLSPAN="2" ALIGN="LEFT">field_type</TD><TD PORT="field_type.type" ALIGN="LEFT">char[16]</TD></TR>
-      <TR><TD PORT="field_desc" COLSPAN="2" ALIGN="LEFT">field_desc</TD><TD PORT="field_desc.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="field_help" COLSPAN="2" ALIGN="LEFT">field_help</TD><TD PORT="field_help.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="field_inputs" COLSPAN="2" ALIGN="LEFT">field_inputs</TD><TD PORT="field_inputs.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/profdef.implied2degrees.png b/hubzilla_er/diagrams/profdef.implied2degrees.png
deleted file mode 100644
index 1083c2515..000000000
--- a/hubzilla_er/diagrams/profdef.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/profext.1degree.dot b/hubzilla_er/diagrams/profext.1degree.dot
deleted file mode 100644
index 5384100bd..000000000
--- a/hubzilla_er/diagrams/profext.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD><TD PORT="channel_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD><TD PORT="hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="k" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD><TD PORT="k.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="v" COLSPAN="2" ALIGN="LEFT">v</TD><TD PORT="v.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-}
diff --git a/hubzilla_er/diagrams/profext.1degree.png b/hubzilla_er/diagrams/profext.1degree.png
deleted file mode 100644
index b7da3b97c..000000000
--- a/hubzilla_er/diagrams/profext.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/profext.implied2degrees.dot b/hubzilla_er/diagrams/profext.implied2degrees.dot
deleted file mode 100644
index 01b382c52..000000000
--- a/hubzilla_er/diagrams/profext.implied2degrees.dot
+++ /dev/null
@@ -1,348 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"channel_id":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profext":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 &gt;</TD></TR>
-    </TABLE>>
-    URL="cache.html"
-    tooltip="cache"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="channel_account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_account_id</TD></TR>
-      <TR><TD PORT="channel_primary" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_primary</TD></TR>
-      <TR><TD PORT="channel_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_name</TD></TR>
-      <TR><TD PORT="channel_address" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_address</TD></TR>
-      <TR><TD PORT="channel_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_guid</TD></TR>
-      <TR><TD PORT="channel_guid_sig" COLSPAN="3" ALIGN="LEFT">channel_guid_sig</TD></TR>
-      <TR><TD PORT="channel_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_hash</TD></TR>
-      <TR><TD PORT="channel_timezone" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_timezone</TD></TR>
-      <TR><TD PORT="channel_location" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_location</TD></TR>
-      <TR><TD PORT="channel_theme" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_theme</TD></TR>
-      <TR><TD PORT="channel_startpage" COLSPAN="3" ALIGN="LEFT">channel_startpage</TD></TR>
-      <TR><TD PORT="channel_pubkey" COLSPAN="3" ALIGN="LEFT">channel_pubkey</TD></TR>
-      <TR><TD PORT="channel_prvkey" COLSPAN="3" ALIGN="LEFT">channel_prvkey</TD></TR>
-      <TR><TD PORT="channel_notifyflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_notifyflags</TD></TR>
-      <TR><TD PORT="channel_pageflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_pageflags</TD></TR>
-      <TR><TD PORT="channel_dirdate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_dirdate</TD></TR>
-      <TR><TD PORT="channel_lastpost" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_lastpost</TD></TR>
-      <TR><TD PORT="channel_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_deleted</TD></TR>
-      <TR><TD PORT="channel_max_anon_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_anon_mail</TD></TR>
-      <TR><TD PORT="channel_max_friend_req" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_friend_req</TD></TR>
-      <TR><TD PORT="channel_expire_days" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_expire_days</TD></TR>
-      <TR><TD PORT="channel_passwd_reset" COLSPAN="3" ALIGN="LEFT">channel_passwd_reset</TD></TR>
-      <TR><TD PORT="channel_default_group" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_default_group</TD></TR>
-      <TR><TD PORT="channel_allow_cid" COLSPAN="3" ALIGN="LEFT">channel_allow_cid</TD></TR>
-      <TR><TD PORT="channel_allow_gid" COLSPAN="3" ALIGN="LEFT">channel_allow_gid</TD></TR>
-      <TR><TD PORT="channel_deny_cid" COLSPAN="3" ALIGN="LEFT">channel_deny_cid</TD></TR>
-      <TR><TD PORT="channel_deny_gid" COLSPAN="3" ALIGN="LEFT">channel_deny_gid</TD></TR>
-      <TR><TD PORT="channel_r_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_stream</TD></TR>
-      <TR><TD PORT="channel_r_profile" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_profile</TD></TR>
-      <TR><TD PORT="channel_r_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_photos</TD></TR>
-      <TR><TD PORT="channel_r_abook" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_abook</TD></TR>
-      <TR><TD PORT="channel_w_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_stream</TD></TR>
-      <TR><TD PORT="channel_w_wall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_wall</TD></TR>
-      <TR><TD PORT="channel_w_tagwall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_tagwall</TD></TR>
-      <TR><TD PORT="channel_w_comment" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_comment</TD></TR>
-      <TR><TD PORT="channel_w_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_mail</TD></TR>
-      <TR><TD PORT="channel_w_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_photos</TD></TR>
-      <TR><TD PORT="channel_w_chat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_chat</TD></TR>
-      <TR><TD PORT="channel_a_delegate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_delegate</TD></TR>
-      <TR><TD PORT="channel_r_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_storage</TD></TR>
-      <TR><TD PORT="channel_w_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_storage</TD></TR>
-      <TR><TD PORT="channel_r_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_pages</TD></TR>
-      <TR><TD PORT="channel_w_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_pages</TD></TR>
-      <TR><TD PORT="channel_a_republish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_republish</TD></TR>
-      <TR><TD PORT="channel_w_like" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_like</TD></TR>
-      <TR><TD PORT="channel_removed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_removed</TD></TR>
-      <TR><TD PORT="channel_system" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_system</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="channel.html"
-    tooltip="channel"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD><TD PORT="channel_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD><TD PORT="hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="k" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD><TD PORT="k.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="v" COLSPAN="2" ALIGN="LEFT">v</TD><TD PORT="v.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/profext.implied2degrees.png b/hubzilla_er/diagrams/profext.implied2degrees.png
deleted file mode 100644
index 718c54b76..000000000
--- a/hubzilla_er/diagrams/profext.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/profile.1degree.dot b/hubzilla_er/diagrams/profile.1degree.dot
deleted file mode 100644
index c66c50b52..000000000
--- a/hubzilla_er/diagrams/profile.1degree.dot
+++ /dev/null
@@ -1,75 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="profile_guid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">profile_guid</TD><TD PORT="profile_guid.type" ALIGN="LEFT">char[64]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="profile_name" COLSPAN="2" ALIGN="LEFT">profile_name</TD><TD PORT="profile_name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="is_default" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">is_default</TD><TD PORT="is_default.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="hide_friends" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hide_friends</TD><TD PORT="hide_friends.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="pdesc" COLSPAN="2" ALIGN="LEFT">pdesc</TD><TD PORT="pdesc.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="chandesc" COLSPAN="2" ALIGN="LEFT">chandesc</TD><TD PORT="chandesc.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="dob" COLSPAN="2" ALIGN="LEFT">dob</TD><TD PORT="dob.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="dob_tz" COLSPAN="2" ALIGN="LEFT">dob_tz</TD><TD PORT="dob_tz.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="address" COLSPAN="2" ALIGN="LEFT">address</TD><TD PORT="address.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="locality" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">locality</TD><TD PORT="locality.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="region" COLSPAN="2" ALIGN="LEFT">region</TD><TD PORT="region.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="postal_code" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">postal_code</TD><TD PORT="postal_code.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="country_name" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">country_name</TD><TD PORT="country_name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="hometown" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hometown</TD><TD PORT="hometown.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="gender" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">gender</TD><TD PORT="gender.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="marital" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">marital</TD><TD PORT="marital.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="with" COLSPAN="2" ALIGN="LEFT">with</TD><TD PORT="with.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="howlong" COLSPAN="2" ALIGN="LEFT">howlong</TD><TD PORT="howlong.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="sexual" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">sexual</TD><TD PORT="sexual.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="politic" COLSPAN="2" ALIGN="LEFT">politic</TD><TD PORT="politic.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="religion" COLSPAN="2" ALIGN="LEFT">religion</TD><TD PORT="religion.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="keywords" COLSPAN="2" ALIGN="LEFT">keywords</TD><TD PORT="keywords.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="likes" COLSPAN="2" ALIGN="LEFT">likes</TD><TD PORT="likes.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="dislikes" COLSPAN="2" ALIGN="LEFT">dislikes</TD><TD PORT="dislikes.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="about" COLSPAN="2" ALIGN="LEFT">about</TD><TD PORT="about.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="summary" COLSPAN="2" ALIGN="LEFT">summary</TD><TD PORT="summary.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="music" COLSPAN="2" ALIGN="LEFT">music</TD><TD PORT="music.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="book" COLSPAN="2" ALIGN="LEFT">book</TD><TD PORT="book.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="tv" COLSPAN="2" ALIGN="LEFT">tv</TD><TD PORT="tv.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="film" COLSPAN="2" ALIGN="LEFT">film</TD><TD PORT="film.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="interest" COLSPAN="2" ALIGN="LEFT">interest</TD><TD PORT="interest.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="romance" COLSPAN="2" ALIGN="LEFT">romance</TD><TD PORT="romance.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="work" COLSPAN="2" ALIGN="LEFT">work</TD><TD PORT="work.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="education" COLSPAN="2" ALIGN="LEFT">education</TD><TD PORT="education.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="contact" COLSPAN="2" ALIGN="LEFT">contact</TD><TD PORT="contact.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channels" COLSPAN="2" ALIGN="LEFT">channels</TD><TD PORT="channels.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="homepage" COLSPAN="2" ALIGN="LEFT">homepage</TD><TD PORT="homepage.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="2" ALIGN="LEFT">photo</TD><TD PORT="photo.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="thumb" COLSPAN="2" ALIGN="LEFT">thumb</TD><TD PORT="thumb.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="publish" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">publish</TD><TD PORT="publish.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="profile.html"
-    tooltip="profile"
-  ];
-}
diff --git a/hubzilla_er/diagrams/profile.1degree.png b/hubzilla_er/diagrams/profile.1degree.png
deleted file mode 100644
index 00b7ce7c8..000000000
--- a/hubzilla_er/diagrams/profile.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/profile.implied2degrees.dot b/hubzilla_er/diagrams/profile.implied2degrees.dot
deleted file mode 100644
index 6dd37a33a..000000000
--- a/hubzilla_er/diagrams/profile.implied2degrees.dot
+++ /dev/null
@@ -1,199 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "event":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="app.html"
-    tooltip="app"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="event.html"
-    tooltip="event"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="hook.html"
-    tooltip="hook"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="3" ALIGN="LEFT">msg</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">10 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="profile_guid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">profile_guid</TD><TD PORT="profile_guid.type" ALIGN="LEFT">char[64]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="profile_name" COLSPAN="2" ALIGN="LEFT">profile_name</TD><TD PORT="profile_name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="is_default" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">is_default</TD><TD PORT="is_default.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="hide_friends" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hide_friends</TD><TD PORT="hide_friends.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="name" COLSPAN="2" ALIGN="LEFT">name</TD><TD PORT="name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="pdesc" COLSPAN="2" ALIGN="LEFT">pdesc</TD><TD PORT="pdesc.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="chandesc" COLSPAN="2" ALIGN="LEFT">chandesc</TD><TD PORT="chandesc.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="dob" COLSPAN="2" ALIGN="LEFT">dob</TD><TD PORT="dob.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="dob_tz" COLSPAN="2" ALIGN="LEFT">dob_tz</TD><TD PORT="dob_tz.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="address" COLSPAN="2" ALIGN="LEFT">address</TD><TD PORT="address.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="locality" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">locality</TD><TD PORT="locality.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="region" COLSPAN="2" ALIGN="LEFT">region</TD><TD PORT="region.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="postal_code" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">postal_code</TD><TD PORT="postal_code.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="country_name" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">country_name</TD><TD PORT="country_name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="hometown" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hometown</TD><TD PORT="hometown.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="gender" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">gender</TD><TD PORT="gender.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="marital" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">marital</TD><TD PORT="marital.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="with" COLSPAN="2" ALIGN="LEFT">with</TD><TD PORT="with.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="howlong" COLSPAN="2" ALIGN="LEFT">howlong</TD><TD PORT="howlong.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="sexual" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">sexual</TD><TD PORT="sexual.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="politic" COLSPAN="2" ALIGN="LEFT">politic</TD><TD PORT="politic.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="religion" COLSPAN="2" ALIGN="LEFT">religion</TD><TD PORT="religion.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="keywords" COLSPAN="2" ALIGN="LEFT">keywords</TD><TD PORT="keywords.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="likes" COLSPAN="2" ALIGN="LEFT">likes</TD><TD PORT="likes.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="dislikes" COLSPAN="2" ALIGN="LEFT">dislikes</TD><TD PORT="dislikes.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="about" COLSPAN="2" ALIGN="LEFT">about</TD><TD PORT="about.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="summary" COLSPAN="2" ALIGN="LEFT">summary</TD><TD PORT="summary.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="music" COLSPAN="2" ALIGN="LEFT">music</TD><TD PORT="music.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="book" COLSPAN="2" ALIGN="LEFT">book</TD><TD PORT="book.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="tv" COLSPAN="2" ALIGN="LEFT">tv</TD><TD PORT="tv.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="film" COLSPAN="2" ALIGN="LEFT">film</TD><TD PORT="film.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="interest" COLSPAN="2" ALIGN="LEFT">interest</TD><TD PORT="interest.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="romance" COLSPAN="2" ALIGN="LEFT">romance</TD><TD PORT="romance.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="work" COLSPAN="2" ALIGN="LEFT">work</TD><TD PORT="work.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="education" COLSPAN="2" ALIGN="LEFT">education</TD><TD PORT="education.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="contact" COLSPAN="2" ALIGN="LEFT">contact</TD><TD PORT="contact.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channels" COLSPAN="2" ALIGN="LEFT">channels</TD><TD PORT="channels.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="homepage" COLSPAN="2" ALIGN="LEFT">homepage</TD><TD PORT="homepage.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="2" ALIGN="LEFT">photo</TD><TD PORT="photo.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="thumb" COLSPAN="2" ALIGN="LEFT">thumb</TD><TD PORT="thumb.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="publish" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">publish</TD><TD PORT="publish.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="profile.html"
-    tooltip="profile"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="spam.html"
-    tooltip="spam"
-  ];
-}
diff --git a/hubzilla_er/diagrams/profile.implied2degrees.png b/hubzilla_er/diagrams/profile.implied2degrees.png
deleted file mode 100644
index ceace167d..000000000
--- a/hubzilla_er/diagrams/profile.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/profile_check.1degree.dot b/hubzilla_er/diagrams/profile_check.1degree.dot
deleted file mode 100644
index 37bf28c85..000000000
--- a/hubzilla_er/diagrams/profile_check.1degree.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">cid</TD><TD PORT="cid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="dfrn_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">dfrn_id</TD><TD PORT="dfrn_id.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="sec" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">sec</TD><TD PORT="sec.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="expire" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">expire</TD><TD PORT="expire.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-}
diff --git a/hubzilla_er/diagrams/profile_check.1degree.png b/hubzilla_er/diagrams/profile_check.1degree.png
deleted file mode 100644
index 4b6b9df8f..000000000
--- a/hubzilla_er/diagrams/profile_check.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/profile_check.implied2degrees.dot b/hubzilla_er/diagrams/profile_check.implied2degrees.dot
deleted file mode 100644
index 2c5d1d1c2..000000000
--- a/hubzilla_er/diagrams/profile_check.implied2degrees.dot
+++ /dev/null
@@ -1,262 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">cid</TD><TD PORT="cid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="dfrn_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">dfrn_id</TD><TD PORT="dfrn_id.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="sec" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">sec</TD><TD PORT="sec.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="expire" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">expire</TD><TD PORT="expire.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/profile_check.implied2degrees.png b/hubzilla_er/diagrams/profile_check.implied2degrees.png
deleted file mode 100644
index c035d7c69..000000000
--- a/hubzilla_er/diagrams/profile_check.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/register.1degree.dot b/hubzilla_er/diagrams/register.1degree.dot
deleted file mode 100644
index 658d82448..000000000
--- a/hubzilla_er/diagrams/register.1degree.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD><TD PORT="hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="password" COLSPAN="2" ALIGN="LEFT">password</TD><TD PORT="password.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="language" COLSPAN="2" ALIGN="LEFT">language</TD><TD PORT="language.type" ALIGN="LEFT">char[16]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-}
diff --git a/hubzilla_er/diagrams/register.1degree.png b/hubzilla_er/diagrams/register.1degree.png
deleted file mode 100644
index 6cdb8bc86..000000000
--- a/hubzilla_er/diagrams/register.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/register.implied2degrees.dot b/hubzilla_er/diagrams/register.implied2degrees.dot
deleted file mode 100644
index efa6e5b65..000000000
--- a/hubzilla_er/diagrams/register.implied2degrees.dot
+++ /dev/null
@@ -1,262 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD><TD PORT="hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="password" COLSPAN="2" ALIGN="LEFT">password</TD><TD PORT="password.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="language" COLSPAN="2" ALIGN="LEFT">language</TD><TD PORT="language.type" ALIGN="LEFT">char[16]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/register.implied2degrees.png b/hubzilla_er/diagrams/register.implied2degrees.png
deleted file mode 100644
index 0bb580784..000000000
--- a/hubzilla_er/diagrams/register.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/sign.1degree.dot b/hubzilla_er/diagrams/sign.1degree.dot
deleted file mode 100644
index 954731b37..000000000
--- a/hubzilla_er/diagrams/sign.1degree.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD><TD PORT="iid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="retract_iid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">retract_iid</TD><TD PORT="retract_iid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="signed_text" COLSPAN="2" ALIGN="LEFT">signed_text</TD><TD PORT="signed_text.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="signature" COLSPAN="2" ALIGN="LEFT">signature</TD><TD PORT="signature.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="signer" COLSPAN="2" ALIGN="LEFT">signer</TD><TD PORT="signer.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/sign.1degree.png b/hubzilla_er/diagrams/sign.1degree.png
deleted file mode 100644
index 6175d4e3a..000000000
--- a/hubzilla_er/diagrams/sign.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/sign.implied2degrees.dot b/hubzilla_er/diagrams/sign.implied2degrees.dot
deleted file mode 100644
index 44bd2e2f8..000000000
--- a/hubzilla_er/diagrams/sign.implied2degrees.dot
+++ /dev/null
@@ -1,262 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD><TD PORT="iid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="retract_iid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">retract_iid</TD><TD PORT="retract_iid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="signed_text" COLSPAN="2" ALIGN="LEFT">signed_text</TD><TD PORT="signed_text.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="signature" COLSPAN="2" ALIGN="LEFT">signature</TD><TD PORT="signature.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="signer" COLSPAN="2" ALIGN="LEFT">signer</TD><TD PORT="signer.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/sign.implied2degrees.png b/hubzilla_er/diagrams/sign.implied2degrees.png
deleted file mode 100644
index 268e2d472..000000000
--- a/hubzilla_er/diagrams/sign.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/spam.1degree.dot b/hubzilla_er/diagrams/spam.1degree.dot
deleted file mode 100644
index da56f67e1..000000000
--- a/hubzilla_er/diagrams/spam.1degree.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="spam" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">spam</TD><TD PORT="spam.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="ham" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">ham</TD><TD PORT="ham.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="term" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">term</TD><TD PORT="term.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="date" COLSPAN="2" ALIGN="LEFT">date</TD><TD PORT="date.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="spam.html"
-    tooltip="spam"
-  ];
-}
diff --git a/hubzilla_er/diagrams/spam.1degree.png b/hubzilla_er/diagrams/spam.1degree.png
deleted file mode 100644
index 3141bc57e..000000000
--- a/hubzilla_er/diagrams/spam.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/spam.implied2degrees.dot b/hubzilla_er/diagrams/spam.implied2degrees.dot
deleted file mode 100644
index 6a235ceae..000000000
--- a/hubzilla_er/diagrams/spam.implied2degrees.dot
+++ /dev/null
@@ -1,161 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "event":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile":"elipses":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="app.html"
-    tooltip="app"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="event.html"
-    tooltip="event"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="hook.html"
-    tooltip="hook"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="3" ALIGN="LEFT">msg</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">10 &gt;</TD></TR>
-    </TABLE>>
-    URL="notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile.html"
-    tooltip="profile"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="spam" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">spam</TD><TD PORT="spam.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="ham" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">ham</TD><TD PORT="ham.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="term" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">term</TD><TD PORT="term.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="date" COLSPAN="2" ALIGN="LEFT">date</TD><TD PORT="date.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="spam.html"
-    tooltip="spam"
-  ];
-}
diff --git a/hubzilla_er/diagrams/spam.implied2degrees.png b/hubzilla_er/diagrams/spam.implied2degrees.png
deleted file mode 100644
index 8b61a8888..000000000
--- a/hubzilla_er/diagrams/spam.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/abook.1degree.dot b/hubzilla_er/diagrams/summary/abook.1degree.dot
deleted file mode 100644
index 662cb811f..000000000
--- a/hubzilla_er/diagrams/summary/abook.1degree.dot
+++ /dev/null
@@ -1,52 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "abook" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "abook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">abook</TD></TR>
-      <TR><TD PORT="abook_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">abook_id</TD></TR>
-      <TR><TD PORT="abook_account" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_account</TD></TR>
-      <TR><TD PORT="abook_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_channel</TD></TR>
-      <TR><TD PORT="abook_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_xchan</TD></TR>
-      <TR><TD PORT="abook_my_perms" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_my_perms</TD></TR>
-      <TR><TD PORT="abook_their_perms" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_their_perms</TD></TR>
-      <TR><TD PORT="abook_closeness" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_closeness</TD></TR>
-      <TR><TD PORT="abook_created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_created</TD></TR>
-      <TR><TD PORT="abook_updated" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_updated</TD></TR>
-      <TR><TD PORT="abook_connected" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_connected</TD></TR>
-      <TR><TD PORT="abook_dob" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_dob</TD></TR>
-      <TR><TD PORT="abook_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_flags</TD></TR>
-      <TR><TD PORT="abook_blocked" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_blocked</TD></TR>
-      <TR><TD PORT="abook_ignored" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_ignored</TD></TR>
-      <TR><TD PORT="abook_hidden" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_hidden</TD></TR>
-      <TR><TD PORT="abook_archived" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_archived</TD></TR>
-      <TR><TD PORT="abook_pending" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_pending</TD></TR>
-      <TR><TD PORT="abook_unconnected" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_unconnected</TD></TR>
-      <TR><TD PORT="abook_self" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_self</TD></TR>
-      <TR><TD PORT="abook_feed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_feed</TD></TR>
-      <TR><TD PORT="abook_profile" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">abook_profile</TD></TR>
-      <TR><TD PORT="abook_incl" COLSPAN="3" ALIGN="LEFT">abook_incl</TD></TR>
-      <TR><TD PORT="abook_excl" COLSPAN="3" ALIGN="LEFT">abook_excl</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">12 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/abook.html"
-    tooltip="abook"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/abook.1degree.png b/hubzilla_er/diagrams/summary/abook.1degree.png
deleted file mode 100644
index 8626b50e8..000000000
--- a/hubzilla_er/diagrams/summary/abook.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/account.1degree.dot b/hubzilla_er/diagrams/summary/account.1degree.dot
deleted file mode 100644
index 399777f74..000000000
--- a/hubzilla_er/diagrams/summary/account.1degree.dot
+++ /dev/null
@@ -1,47 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "account" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "account" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">account</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">account_id</TD></TR>
-      <TR><TD PORT="account_parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_parent</TD></TR>
-      <TR><TD PORT="account_default_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_default_channel</TD></TR>
-      <TR><TD PORT="account_salt" COLSPAN="3" ALIGN="LEFT">account_salt</TD></TR>
-      <TR><TD PORT="account_password" COLSPAN="3" ALIGN="LEFT">account_password</TD></TR>
-      <TR><TD PORT="account_email" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_email</TD></TR>
-      <TR><TD PORT="account_external" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_external</TD></TR>
-      <TR><TD PORT="account_language" COLSPAN="3" ALIGN="LEFT">account_language</TD></TR>
-      <TR><TD PORT="account_created" COLSPAN="3" ALIGN="LEFT">account_created</TD></TR>
-      <TR><TD PORT="account_lastlog" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_lastlog</TD></TR>
-      <TR><TD PORT="account_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_flags</TD></TR>
-      <TR><TD PORT="account_roles" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_roles</TD></TR>
-      <TR><TD PORT="account_reset" COLSPAN="3" ALIGN="LEFT">account_reset</TD></TR>
-      <TR><TD PORT="account_expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_expires</TD></TR>
-      <TR><TD PORT="account_expire_notified" COLSPAN="3" ALIGN="LEFT">account_expire_notified</TD></TR>
-      <TR><TD PORT="account_service_class" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_service_class</TD></TR>
-      <TR><TD PORT="account_level" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_level</TD></TR>
-      <TR><TD PORT="account_password_changed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_password_changed</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/account.html"
-    tooltip="account"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/account.1degree.png b/hubzilla_er/diagrams/summary/account.1degree.png
deleted file mode 100644
index 7bed11ef1..000000000
--- a/hubzilla_er/diagrams/summary/account.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/addon.1degree.dot b/hubzilla_er/diagrams/summary/addon.1degree.dot
deleted file mode 100644
index fce4097d2..000000000
--- a/hubzilla_er/diagrams/summary/addon.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "addon" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="version" COLSPAN="3" ALIGN="LEFT">version</TD></TR>
-      <TR><TD PORT="installed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">installed</TD></TR>
-      <TR><TD PORT="hidden" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hidden</TD></TR>
-      <TR><TD PORT="timestamp" COLSPAN="3" ALIGN="LEFT">timestamp</TD></TR>
-      <TR><TD PORT="plugin_admin" COLSPAN="3" ALIGN="LEFT">plugin_admin</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/addon.html"
-    tooltip="addon"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/addon.1degree.png b/hubzilla_er/diagrams/summary/addon.1degree.png
deleted file mode 100644
index 06b0a66e1..000000000
--- a/hubzilla_er/diagrams/summary/addon.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/app.1degree.dot b/hubzilla_er/diagrams/summary/app.1degree.dot
deleted file mode 100644
index 7a6f245e8..000000000
--- a/hubzilla_er/diagrams/summary/app.1degree.dot
+++ /dev/null
@@ -1,43 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "app" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="app_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_id</TD></TR>
-      <TR><TD PORT="app_sig" COLSPAN="3" ALIGN="LEFT">app_sig</TD></TR>
-      <TR><TD PORT="app_author" COLSPAN="3" ALIGN="LEFT">app_author</TD></TR>
-      <TR><TD PORT="app_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_name</TD></TR>
-      <TR><TD PORT="app_desc" COLSPAN="3" ALIGN="LEFT">app_desc</TD></TR>
-      <TR><TD PORT="app_url" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_url</TD></TR>
-      <TR><TD PORT="app_photo" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_photo</TD></TR>
-      <TR><TD PORT="app_version" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_version</TD></TR>
-      <TR><TD PORT="app_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_channel</TD></TR>
-      <TR><TD PORT="app_addr" COLSPAN="3" ALIGN="LEFT">app_addr</TD></TR>
-      <TR><TD PORT="app_price" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_price</TD></TR>
-      <TR><TD PORT="app_page" COLSPAN="3" ALIGN="LEFT">app_page</TD></TR>
-      <TR><TD PORT="app_requires" COLSPAN="3" ALIGN="LEFT">app_requires</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/app.html"
-    tooltip="app"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/app.1degree.png b/hubzilla_er/diagrams/summary/app.1degree.png
deleted file mode 100644
index 1850c4b6f..000000000
--- a/hubzilla_er/diagrams/summary/app.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/attach.1degree.dot b/hubzilla_er/diagrams/summary/attach.1degree.dot
deleted file mode 100644
index 8fc2e8360..000000000
--- a/hubzilla_er/diagrams/summary/attach.1degree.dot
+++ /dev/null
@@ -1,52 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "attach" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="creator" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">creator</TD></TR>
-      <TR><TD PORT="filename" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">filename</TD></TR>
-      <TR><TD PORT="filetype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">filetype</TD></TR>
-      <TR><TD PORT="filesize" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">filesize</TD></TR>
-      <TR><TD PORT="revision" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">revision</TD></TR>
-      <TR><TD PORT="folder" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">folder</TD></TR>
-      <TR><TD PORT="flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">flags</TD></TR>
-      <TR><TD PORT="is_dir" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_dir</TD></TR>
-      <TR><TD PORT="is_photo" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_photo</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD></TR>
-      <TR><TD PORT="os_path" COLSPAN="3" ALIGN="LEFT">os_path</TD></TR>
-      <TR><TD PORT="display_path" COLSPAN="3" ALIGN="LEFT">display_path</TD></TR>
-      <TR><TD PORT="data" COLSPAN="3" ALIGN="LEFT">data</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/attach.html"
-    tooltip="attach"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/attach.1degree.png b/hubzilla_er/diagrams/summary/attach.1degree.png
deleted file mode 100644
index 508f509cf..000000000
--- a/hubzilla_er/diagrams/summary/attach.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/auth_codes.1degree.dot b/hubzilla_er/diagrams/summary/auth_codes.1degree.dot
deleted file mode 100644
index 40001241f..000000000
--- a/hubzilla_er/diagrams/summary/auth_codes.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "auth_codes" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "auth_codes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">auth_codes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="redirect_uri" COLSPAN="3" ALIGN="LEFT">redirect_uri</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="scope" COLSPAN="3" ALIGN="LEFT">scope</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/auth_codes.html"
-    tooltip="auth_codes"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/auth_codes.1degree.png b/hubzilla_er/diagrams/summary/auth_codes.1degree.png
deleted file mode 100644
index 4df2878b4..000000000
--- a/hubzilla_er/diagrams/summary/auth_codes.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/cache.1degree.dot b/hubzilla_er/diagrams/summary/cache.1degree.dot
deleted file mode 100644
index c081187ce..000000000
--- a/hubzilla_er/diagrams/summary/cache.1degree.dot
+++ /dev/null
@@ -1,32 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "cache" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/cache.html"
-    tooltip="cache"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/cache.1degree.png b/hubzilla_er/diagrams/summary/cache.1degree.png
deleted file mode 100644
index d20fc1ed8..000000000
--- a/hubzilla_er/diagrams/summary/cache.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/channel.1degree.dot b/hubzilla_er/diagrams/summary/channel.1degree.dot
deleted file mode 100644
index 4056732d7..000000000
--- a/hubzilla_er/diagrams/summary/channel.1degree.dot
+++ /dev/null
@@ -1,77 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "channel" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="channel_account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_account_id</TD></TR>
-      <TR><TD PORT="channel_primary" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_primary</TD></TR>
-      <TR><TD PORT="channel_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_name</TD></TR>
-      <TR><TD PORT="channel_address" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_address</TD></TR>
-      <TR><TD PORT="channel_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_guid</TD></TR>
-      <TR><TD PORT="channel_guid_sig" COLSPAN="3" ALIGN="LEFT">channel_guid_sig</TD></TR>
-      <TR><TD PORT="channel_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_hash</TD></TR>
-      <TR><TD PORT="channel_timezone" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_timezone</TD></TR>
-      <TR><TD PORT="channel_location" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_location</TD></TR>
-      <TR><TD PORT="channel_theme" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_theme</TD></TR>
-      <TR><TD PORT="channel_startpage" COLSPAN="3" ALIGN="LEFT">channel_startpage</TD></TR>
-      <TR><TD PORT="channel_pubkey" COLSPAN="3" ALIGN="LEFT">channel_pubkey</TD></TR>
-      <TR><TD PORT="channel_prvkey" COLSPAN="3" ALIGN="LEFT">channel_prvkey</TD></TR>
-      <TR><TD PORT="channel_notifyflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_notifyflags</TD></TR>
-      <TR><TD PORT="channel_pageflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_pageflags</TD></TR>
-      <TR><TD PORT="channel_dirdate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_dirdate</TD></TR>
-      <TR><TD PORT="channel_lastpost" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_lastpost</TD></TR>
-      <TR><TD PORT="channel_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_deleted</TD></TR>
-      <TR><TD PORT="channel_max_anon_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_anon_mail</TD></TR>
-      <TR><TD PORT="channel_max_friend_req" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_friend_req</TD></TR>
-      <TR><TD PORT="channel_expire_days" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_expire_days</TD></TR>
-      <TR><TD PORT="channel_passwd_reset" COLSPAN="3" ALIGN="LEFT">channel_passwd_reset</TD></TR>
-      <TR><TD PORT="channel_default_group" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_default_group</TD></TR>
-      <TR><TD PORT="channel_allow_cid" COLSPAN="3" ALIGN="LEFT">channel_allow_cid</TD></TR>
-      <TR><TD PORT="channel_allow_gid" COLSPAN="3" ALIGN="LEFT">channel_allow_gid</TD></TR>
-      <TR><TD PORT="channel_deny_cid" COLSPAN="3" ALIGN="LEFT">channel_deny_cid</TD></TR>
-      <TR><TD PORT="channel_deny_gid" COLSPAN="3" ALIGN="LEFT">channel_deny_gid</TD></TR>
-      <TR><TD PORT="channel_r_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_stream</TD></TR>
-      <TR><TD PORT="channel_r_profile" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_profile</TD></TR>
-      <TR><TD PORT="channel_r_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_photos</TD></TR>
-      <TR><TD PORT="channel_r_abook" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_abook</TD></TR>
-      <TR><TD PORT="channel_w_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_stream</TD></TR>
-      <TR><TD PORT="channel_w_wall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_wall</TD></TR>
-      <TR><TD PORT="channel_w_tagwall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_tagwall</TD></TR>
-      <TR><TD PORT="channel_w_comment" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_comment</TD></TR>
-      <TR><TD PORT="channel_w_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_mail</TD></TR>
-      <TR><TD PORT="channel_w_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_photos</TD></TR>
-      <TR><TD PORT="channel_w_chat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_chat</TD></TR>
-      <TR><TD PORT="channel_a_delegate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_delegate</TD></TR>
-      <TR><TD PORT="channel_r_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_storage</TD></TR>
-      <TR><TD PORT="channel_w_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_storage</TD></TR>
-      <TR><TD PORT="channel_r_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_pages</TD></TR>
-      <TR><TD PORT="channel_w_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_pages</TD></TR>
-      <TR><TD PORT="channel_a_republish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_republish</TD></TR>
-      <TR><TD PORT="channel_w_like" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_like</TD></TR>
-      <TR><TD PORT="channel_removed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_removed</TD></TR>
-      <TR><TD PORT="channel_system" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_system</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/channel.html"
-    tooltip="channel"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/channel.1degree.png b/hubzilla_er/diagrams/summary/channel.1degree.png
deleted file mode 100644
index 466310783..000000000
--- a/hubzilla_er/diagrams/summary/channel.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/chat.1degree.dot b/hubzilla_er/diagrams/summary/chat.1degree.dot
deleted file mode 100644
index 2a62819d3..000000000
--- a/hubzilla_er/diagrams/summary/chat.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "chat" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "chat" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">chat</TD></TR>
-      <TR><TD PORT="chat_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">chat_id</TD></TR>
-      <TR><TD PORT="chat_room" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">chat_room</TD></TR>
-      <TR><TD PORT="chat_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">chat_xchan</TD></TR>
-      <TR><TD PORT="chat_text" COLSPAN="3" ALIGN="LEFT">chat_text</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/chat.html"
-    tooltip="chat"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/chat.1degree.png b/hubzilla_er/diagrams/summary/chat.1degree.png
deleted file mode 100644
index 177ea5e5a..000000000
--- a/hubzilla_er/diagrams/summary/chat.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/chatpresence.1degree.dot b/hubzilla_er/diagrams/summary/chatpresence.1degree.dot
deleted file mode 100644
index 52b841626..000000000
--- a/hubzilla_er/diagrams/summary/chatpresence.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "chatpresence" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "chatpresence" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">chatpresence</TD></TR>
-      <TR><TD PORT="cp_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">cp_id</TD></TR>
-      <TR><TD PORT="cp_room" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cp_room</TD></TR>
-      <TR><TD PORT="cp_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cp_xchan</TD></TR>
-      <TR><TD PORT="cp_last" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cp_last</TD></TR>
-      <TR><TD PORT="cp_status" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cp_status</TD></TR>
-      <TR><TD PORT="cp_client" COLSPAN="3" ALIGN="LEFT">cp_client</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/chatpresence.html"
-    tooltip="chatpresence"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/chatpresence.1degree.png b/hubzilla_er/diagrams/summary/chatpresence.1degree.png
deleted file mode 100644
index 68e491e00..000000000
--- a/hubzilla_er/diagrams/summary/chatpresence.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/chatroom.1degree.dot b/hubzilla_er/diagrams/summary/chatroom.1degree.dot
deleted file mode 100644
index 80024a5bf..000000000
--- a/hubzilla_er/diagrams/summary/chatroom.1degree.dot
+++ /dev/null
@@ -1,40 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "chatroom" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "chatroom" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">chatroom</TD></TR>
-      <TR><TD PORT="cr_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">cr_id</TD></TR>
-      <TR><TD PORT="cr_aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cr_aid</TD></TR>
-      <TR><TD PORT="cr_uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cr_uid</TD></TR>
-      <TR><TD PORT="cr_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cr_name</TD></TR>
-      <TR><TD PORT="cr_created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cr_created</TD></TR>
-      <TR><TD PORT="cr_edited" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cr_edited</TD></TR>
-      <TR><TD PORT="cr_expire" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cr_expire</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/chatroom.html"
-    tooltip="chatroom"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/chatroom.1degree.png b/hubzilla_er/diagrams/summary/chatroom.1degree.png
deleted file mode 100644
index 21dd031e2..000000000
--- a/hubzilla_er/diagrams/summary/chatroom.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/clients.1degree.dot b/hubzilla_er/diagrams/summary/clients.1degree.dot
deleted file mode 100644
index 6a0dc8452..000000000
--- a/hubzilla_er/diagrams/summary/clients.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "clients" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "clients" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">clients</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="pw" COLSPAN="3" ALIGN="LEFT">pw</TD></TR>
-      <TR><TD PORT="redirect_uri" COLSPAN="3" ALIGN="LEFT">redirect_uri</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="icon" COLSPAN="3" ALIGN="LEFT">icon</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/clients.html"
-    tooltip="clients"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/clients.1degree.png b/hubzilla_er/diagrams/summary/clients.1degree.png
deleted file mode 100644
index 31dedaf3b..000000000
--- a/hubzilla_er/diagrams/summary/clients.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/config.1degree.dot b/hubzilla_er/diagrams/summary/config.1degree.dot
deleted file mode 100644
index 671abddcc..000000000
--- a/hubzilla_er/diagrams/summary/config.1degree.dot
+++ /dev/null
@@ -1,33 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "config" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/config.html"
-    tooltip="config"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/config.1degree.png b/hubzilla_er/diagrams/summary/config.1degree.png
deleted file mode 100644
index 032b7d541..000000000
--- a/hubzilla_er/diagrams/summary/config.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/conv.1degree.dot b/hubzilla_er/diagrams/summary/conv.1degree.dot
deleted file mode 100644
index 67e972217..000000000
--- a/hubzilla_er/diagrams/summary/conv.1degree.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "conv" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="guid" COLSPAN="3" ALIGN="LEFT">guid</TD></TR>
-      <TR><TD PORT="recips" COLSPAN="3" ALIGN="LEFT">recips</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="creator" COLSPAN="3" ALIGN="LEFT">creator</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD PORT="subject" COLSPAN="3" ALIGN="LEFT">subject</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/conv.html"
-    tooltip="conv"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/conv.1degree.png b/hubzilla_er/diagrams/summary/conv.1degree.png
deleted file mode 100644
index 20358a938..000000000
--- a/hubzilla_er/diagrams/summary/conv.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/event.1degree.dot b/hubzilla_er/diagrams/summary/event.1degree.dot
deleted file mode 100644
index 3a16771dd..000000000
--- a/hubzilla_er/diagrams/summary/event.1degree.dot
+++ /dev/null
@@ -1,54 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "event" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="event_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_xchan</TD></TR>
-      <TR><TD PORT="event_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_hash</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="start" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">start</TD></TR>
-      <TR><TD PORT="finish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">finish</TD></TR>
-      <TR><TD PORT="summary" COLSPAN="3" ALIGN="LEFT">summary</TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT">description</TD></TR>
-      <TR><TD PORT="location" COLSPAN="3" ALIGN="LEFT">location</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="nofinish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">nofinish</TD></TR>
-      <TR><TD PORT="adjust" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">adjust</TD></TR>
-      <TR><TD PORT="ignore" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ignore</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD PORT="event_status" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_status</TD></TR>
-      <TR><TD PORT="event_status_date" COLSPAN="3" ALIGN="LEFT">event_status_date</TD></TR>
-      <TR><TD PORT="event_percent" COLSPAN="3" ALIGN="LEFT">event_percent</TD></TR>
-      <TR><TD PORT="event_repeat" COLSPAN="3" ALIGN="LEFT">event_repeat</TD></TR>
-      <TR><TD PORT="event_sequence" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_sequence</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/event.html"
-    tooltip="event"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/event.1degree.png b/hubzilla_er/diagrams/summary/event.1degree.png
deleted file mode 100644
index c365ee3bd..000000000
--- a/hubzilla_er/diagrams/summary/event.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/fcontact.1degree.dot b/hubzilla_er/diagrams/summary/fcontact.1degree.dot
deleted file mode 100644
index be19692ad..000000000
--- a/hubzilla_er/diagrams/summary/fcontact.1degree.dot
+++ /dev/null
@@ -1,45 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "fcontact" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="request" COLSPAN="3" ALIGN="LEFT">request</TD></TR>
-      <TR><TD PORT="nick" COLSPAN="3" ALIGN="LEFT">nick</TD></TR>
-      <TR><TD PORT="addr" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">addr</TD></TR>
-      <TR><TD PORT="batch" COLSPAN="3" ALIGN="LEFT">batch</TD></TR>
-      <TR><TD PORT="notify" COLSPAN="3" ALIGN="LEFT">notify</TD></TR>
-      <TR><TD PORT="poll" COLSPAN="3" ALIGN="LEFT">poll</TD></TR>
-      <TR><TD PORT="confirm" COLSPAN="3" ALIGN="LEFT">confirm</TD></TR>
-      <TR><TD PORT="priority" COLSPAN="3" ALIGN="LEFT">priority</TD></TR>
-      <TR><TD PORT="network" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">network</TD></TR>
-      <TR><TD PORT="alias" COLSPAN="3" ALIGN="LEFT">alias</TD></TR>
-      <TR><TD PORT="pubkey" COLSPAN="3" ALIGN="LEFT">pubkey</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/fcontact.html"
-    tooltip="fcontact"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/fcontact.1degree.png b/hubzilla_er/diagrams/summary/fcontact.1degree.png
deleted file mode 100644
index 9515a9e08..000000000
--- a/hubzilla_er/diagrams/summary/fcontact.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/ffinder.1degree.dot b/hubzilla_er/diagrams/summary/ffinder.1degree.dot
deleted file mode 100644
index 59dd33748..000000000
--- a/hubzilla_er/diagrams/summary/ffinder.1degree.dot
+++ /dev/null
@@ -1,33 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "ffinder" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cid</TD></TR>
-      <TR><TD PORT="fid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">fid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/ffinder.html"
-    tooltip="ffinder"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/ffinder.1degree.png b/hubzilla_er/diagrams/summary/ffinder.1degree.png
deleted file mode 100644
index 9a11d3e0c..000000000
--- a/hubzilla_er/diagrams/summary/ffinder.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/fserver.1degree.dot b/hubzilla_er/diagrams/summary/fserver.1degree.dot
deleted file mode 100644
index 95dd14248..000000000
--- a/hubzilla_er/diagrams/summary/fserver.1degree.dot
+++ /dev/null
@@ -1,33 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "fserver" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="server" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">server</TD></TR>
-      <TR><TD PORT="posturl" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">posturl</TD></TR>
-      <TR><TD PORT="key" COLSPAN="3" ALIGN="LEFT">key</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/fserver.html"
-    tooltip="fserver"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/fserver.1degree.png b/hubzilla_er/diagrams/summary/fserver.1degree.png
deleted file mode 100644
index 8be8c4dfa..000000000
--- a/hubzilla_er/diagrams/summary/fserver.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/fsuggest.1degree.dot b/hubzilla_er/diagrams/summary/fsuggest.1degree.dot
deleted file mode 100644
index 047c8d8cf..000000000
--- a/hubzilla_er/diagrams/summary/fsuggest.1degree.dot
+++ /dev/null
@@ -1,38 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "fsuggest" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="3" ALIGN="LEFT">cid</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="request" COLSPAN="3" ALIGN="LEFT">request</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="note" COLSPAN="3" ALIGN="LEFT">note</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/fsuggest.html"
-    tooltip="fsuggest"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/fsuggest.1degree.png b/hubzilla_er/diagrams/summary/fsuggest.1degree.png
deleted file mode 100644
index 3575cc7ce..000000000
--- a/hubzilla_er/diagrams/summary/fsuggest.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/group_member.1degree.dot b/hubzilla_er/diagrams/summary/group_member.1degree.dot
deleted file mode 100644
index dbbb9f855..000000000
--- a/hubzilla_er/diagrams/summary/group_member.1degree.dot
+++ /dev/null
@@ -1,33 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "group_member" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="gid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">gid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/group_member.html"
-    tooltip="group_member"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/group_member.1degree.png b/hubzilla_er/diagrams/summary/group_member.1degree.png
deleted file mode 100644
index f15d36668..000000000
--- a/hubzilla_er/diagrams/summary/group_member.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/groups.1degree.dot b/hubzilla_er/diagrams/summary/groups.1degree.dot
deleted file mode 100644
index efcd7b388..000000000
--- a/hubzilla_er/diagrams/summary/groups.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "groups" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="visible" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">visible</TD></TR>
-      <TR><TD PORT="deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">deleted</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/groups.html"
-    tooltip="groups"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/groups.1degree.png b/hubzilla_er/diagrams/summary/groups.1degree.png
deleted file mode 100644
index 143d6b2aa..000000000
--- a/hubzilla_er/diagrams/summary/groups.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/hook.1degree.dot b/hubzilla_er/diagrams/summary/hook.1degree.dot
deleted file mode 100644
index 95a8d9566..000000000
--- a/hubzilla_er/diagrams/summary/hook.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "hook" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hook" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hook</TD></TR>
-      <TR><TD PORT="file" COLSPAN="3" ALIGN="LEFT">file</TD></TR>
-      <TR><TD PORT="function" COLSPAN="3" ALIGN="LEFT">function</TD></TR>
-      <TR><TD PORT="priority" COLSPAN="3" ALIGN="LEFT">priority</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/hook.html"
-    tooltip="hook"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/hook.1degree.png b/hubzilla_er/diagrams/summary/hook.1degree.png
deleted file mode 100644
index 80de3991a..000000000
--- a/hubzilla_er/diagrams/summary/hook.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/hubloc.1degree.dot b/hubzilla_er/diagrams/summary/hubloc.1degree.dot
deleted file mode 100644
index a19857c0b..000000000
--- a/hubzilla_er/diagrams/summary/hubloc.1degree.dot
+++ /dev/null
@@ -1,49 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "hubloc" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "hubloc" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hubloc</TD></TR>
-      <TR><TD PORT="hubloc_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">hubloc_id</TD></TR>
-      <TR><TD PORT="hubloc_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_guid</TD></TR>
-      <TR><TD PORT="hubloc_guid_sig" COLSPAN="3" ALIGN="LEFT">hubloc_guid_sig</TD></TR>
-      <TR><TD PORT="hubloc_hash" COLSPAN="3" ALIGN="LEFT">hubloc_hash</TD></TR>
-      <TR><TD PORT="hubloc_addr" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_addr</TD></TR>
-      <TR><TD PORT="hubloc_network" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_network</TD></TR>
-      <TR><TD PORT="hubloc_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_flags</TD></TR>
-      <TR><TD PORT="hubloc_status" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_status</TD></TR>
-      <TR><TD PORT="hubloc_url" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_url</TD></TR>
-      <TR><TD PORT="hubloc_url_sig" COLSPAN="3" ALIGN="LEFT">hubloc_url_sig</TD></TR>
-      <TR><TD PORT="hubloc_host" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_host</TD></TR>
-      <TR><TD PORT="hubloc_callback" COLSPAN="3" ALIGN="LEFT">hubloc_callback</TD></TR>
-      <TR><TD PORT="hubloc_connect" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_connect</TD></TR>
-      <TR><TD PORT="hubloc_sitekey" COLSPAN="3" ALIGN="LEFT">hubloc_sitekey</TD></TR>
-      <TR><TD PORT="hubloc_updated" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_updated</TD></TR>
-      <TR><TD PORT="hubloc_connected" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_connected</TD></TR>
-      <TR><TD PORT="hubloc_primary" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_primary</TD></TR>
-      <TR><TD PORT="hubloc_orphancheck" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_orphancheck</TD></TR>
-      <TR><TD PORT="hubloc_error" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_error</TD></TR>
-      <TR><TD PORT="hubloc_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_deleted</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 513 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/hubloc.html"
-    tooltip="hubloc"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/hubloc.1degree.png b/hubzilla_er/diagrams/summary/hubloc.1degree.png
deleted file mode 100644
index a61dadc51..000000000
--- a/hubzilla_er/diagrams/summary/hubloc.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/issue.1degree.dot b/hubzilla_er/diagrams/summary/issue.1degree.dot
deleted file mode 100644
index 8ae8dc0c2..000000000
--- a/hubzilla_er/diagrams/summary/issue.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "issue" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "issue" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">issue</TD></TR>
-      <TR><TD PORT="issue_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">issue_id</TD></TR>
-      <TR><TD PORT="issue_created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">issue_created</TD></TR>
-      <TR><TD PORT="issue_updated" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">issue_updated</TD></TR>
-      <TR><TD PORT="issue_assigned" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">issue_assigned</TD></TR>
-      <TR><TD PORT="issue_priority" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">issue_priority</TD></TR>
-      <TR><TD PORT="issue_status" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">issue_status</TD></TR>
-      <TR><TD PORT="issue_component" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">issue_component</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/issue.html"
-    tooltip="issue"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/issue.1degree.png b/hubzilla_er/diagrams/summary/issue.1degree.png
deleted file mode 100644
index 5be927192..000000000
--- a/hubzilla_er/diagrams/summary/issue.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/item.1degree.dot b/hubzilla_er/diagrams/summary/item.1degree.dot
deleted file mode 100644
index e902a9724..000000000
--- a/hubzilla_er/diagrams/summary/item.1degree.dot
+++ /dev/null
@@ -1,102 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "item" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD></TR>
-      <TR><TD PORT="thr_parent" COLSPAN="3" ALIGN="LEFT">thr_parent</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="commented" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">commented</TD></TR>
-      <TR><TD PORT="received" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">received</TD></TR>
-      <TR><TD PORT="changed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">changed</TD></TR>
-      <TR><TD PORT="comments_closed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">comments_closed</TD></TR>
-      <TR><TD PORT="owner_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">owner_xchan</TD></TR>
-      <TR><TD PORT="author_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">author_xchan</TD></TR>
-      <TR><TD PORT="source_xchan" COLSPAN="3" ALIGN="LEFT">source_xchan</TD></TR>
-      <TR><TD PORT="mimetype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mimetype</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="body" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">body</TD></TR>
-      <TR><TD PORT="html" COLSPAN="3" ALIGN="LEFT">html</TD></TR>
-      <TR><TD PORT="app" COLSPAN="3" ALIGN="LEFT">app</TD></TR>
-      <TR><TD PORT="lang" COLSPAN="3" ALIGN="LEFT">lang</TD></TR>
-      <TR><TD PORT="revision" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">revision</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="obj_type" COLSPAN="3" ALIGN="LEFT">obj_type</TD></TR>
-      <TR><TD PORT="object" COLSPAN="3" ALIGN="LEFT">object</TD></TR>
-      <TR><TD PORT="tgt_type" COLSPAN="3" ALIGN="LEFT">tgt_type</TD></TR>
-      <TR><TD PORT="target" COLSPAN="3" ALIGN="LEFT">target</TD></TR>
-      <TR><TD PORT="layout_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">layout_mid</TD></TR>
-      <TR><TD PORT="postopts" COLSPAN="3" ALIGN="LEFT">postopts</TD></TR>
-      <TR><TD PORT="route" COLSPAN="3" ALIGN="LEFT">route</TD></TR>
-      <TR><TD PORT="llink" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">llink</TD></TR>
-      <TR><TD PORT="plink" COLSPAN="3" ALIGN="LEFT">plink</TD></TR>
-      <TR><TD PORT="resource_id" COLSPAN="3" ALIGN="LEFT">resource_id</TD></TR>
-      <TR><TD PORT="resource_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_type</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="3" ALIGN="LEFT">attach</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="3" ALIGN="LEFT">sig</TD></TR>
-      <TR><TD PORT="diaspora_meta" COLSPAN="3" ALIGN="LEFT">diaspora_meta</TD></TR>
-      <TR><TD PORT="location" COLSPAN="3" ALIGN="LEFT">location</TD></TR>
-      <TR><TD PORT="coord" COLSPAN="3" ALIGN="LEFT">coord</TD></TR>
-      <TR><TD PORT="public_policy" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">public_policy</TD></TR>
-      <TR><TD PORT="comment_policy" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">comment_policy</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD PORT="item_restrict" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_restrict</TD></TR>
-      <TR><TD PORT="item_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_flags</TD></TR>
-      <TR><TD PORT="item_private" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_private</TD></TR>
-      <TR><TD PORT="item_origin" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_origin</TD></TR>
-      <TR><TD PORT="item_unseen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_unseen</TD></TR>
-      <TR><TD PORT="item_starred" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_starred</TD></TR>
-      <TR><TD PORT="item_uplink" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_uplink</TD></TR>
-      <TR><TD PORT="item_consensus" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_consensus</TD></TR>
-      <TR><TD PORT="item_wall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_wall</TD></TR>
-      <TR><TD PORT="item_thread_top" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_thread_top</TD></TR>
-      <TR><TD PORT="item_notshown" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_notshown</TD></TR>
-      <TR><TD PORT="item_nsfw" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_nsfw</TD></TR>
-      <TR><TD PORT="item_relay" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_relay</TD></TR>
-      <TR><TD PORT="item_mentionsme" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_mentionsme</TD></TR>
-      <TR><TD PORT="item_nocomment" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_nocomment</TD></TR>
-      <TR><TD PORT="item_obscured" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_obscured</TD></TR>
-      <TR><TD PORT="item_verified" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_verified</TD></TR>
-      <TR><TD PORT="item_retained" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_retained</TD></TR>
-      <TR><TD PORT="item_rss" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_rss</TD></TR>
-      <TR><TD PORT="item_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_deleted</TD></TR>
-      <TR><TD PORT="item_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_type</TD></TR>
-      <TR><TD PORT="item_hidden" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_hidden</TD></TR>
-      <TR><TD PORT="item_unpublished" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_unpublished</TD></TR>
-      <TR><TD PORT="item_delayed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_delayed</TD></TR>
-      <TR><TD PORT="item_pending_remove" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_pending_remove</TD></TR>
-      <TR><TD PORT="item_blocked" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_blocked</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/item.html"
-    tooltip="item"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/item.1degree.png b/hubzilla_er/diagrams/summary/item.1degree.png
deleted file mode 100644
index dd6b8c220..000000000
--- a/hubzilla_er/diagrams/summary/item.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/item_id.1degree.dot b/hubzilla_er/diagrams/summary/item_id.1degree.dot
deleted file mode 100644
index 7bc27c28c..000000000
--- a/hubzilla_er/diagrams/summary/item_id.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "item_id" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="sid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sid</TD></TR>
-      <TR><TD PORT="service" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">service</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/item_id.html"
-    tooltip="item_id"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/item_id.1degree.png b/hubzilla_er/diagrams/summary/item_id.1degree.png
deleted file mode 100644
index e20303410..000000000
--- a/hubzilla_er/diagrams/summary/item_id.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/likes.1degree.dot b/hubzilla_er/diagrams/summary/likes.1degree.dot
deleted file mode 100644
index 9f9f99fb3..000000000
--- a/hubzilla_er/diagrams/summary/likes.1degree.dot
+++ /dev/null
@@ -1,38 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "likes" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="liker" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">liker</TD></TR>
-      <TR><TD PORT="likee" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">likee</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="target_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">target_type</TD></TR>
-      <TR><TD PORT="target_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">target_id</TD></TR>
-      <TR><TD PORT="target" COLSPAN="3" ALIGN="LEFT">target</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/likes.html"
-    tooltip="likes"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/likes.1degree.png b/hubzilla_er/diagrams/summary/likes.1degree.png
deleted file mode 100644
index f1f61f285..000000000
--- a/hubzilla_er/diagrams/summary/likes.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/mail.1degree.dot b/hubzilla_er/diagrams/summary/mail.1degree.dot
deleted file mode 100644
index fd88f30c9..000000000
--- a/hubzilla_er/diagrams/summary/mail.1degree.dot
+++ /dev/null
@@ -1,50 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "mail" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="convid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">convid</TD></TR>
-      <TR><TD PORT="mail_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_flags</TD></TR>
-      <TR><TD PORT="from_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">from_xchan</TD></TR>
-      <TR><TD PORT="to_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">to_xchan</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="body" COLSPAN="3" ALIGN="LEFT">body</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="3" ALIGN="LEFT">sig</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="3" ALIGN="LEFT">attach</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD></TR>
-      <TR><TD PORT="mail_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_deleted</TD></TR>
-      <TR><TD PORT="mail_replied" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_replied</TD></TR>
-      <TR><TD PORT="mail_isreply" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_isreply</TD></TR>
-      <TR><TD PORT="mail_seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_seen</TD></TR>
-      <TR><TD PORT="mail_recalled" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_recalled</TD></TR>
-      <TR><TD PORT="mail_obscured" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_obscured</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/mail.html"
-    tooltip="mail"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/mail.1degree.png b/hubzilla_er/diagrams/summary/mail.1degree.png
deleted file mode 100644
index 9d6eb0de6..000000000
--- a/hubzilla_er/diagrams/summary/mail.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/manage.1degree.dot b/hubzilla_er/diagrams/summary/manage.1degree.dot
deleted file mode 100644
index 767aecc1a..000000000
--- a/hubzilla_er/diagrams/summary/manage.1degree.dot
+++ /dev/null
@@ -1,32 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "manage" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/manage.html"
-    tooltip="manage"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/manage.1degree.png b/hubzilla_er/diagrams/summary/manage.1degree.png
deleted file mode 100644
index 1d7d82e34..000000000
--- a/hubzilla_er/diagrams/summary/manage.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/menu.1degree.dot b/hubzilla_er/diagrams/summary/menu.1degree.dot
deleted file mode 100644
index ec8d5fe7f..000000000
--- a/hubzilla_er/diagrams/summary/menu.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "menu" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "menu" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">menu</TD></TR>
-      <TR><TD PORT="menu_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">menu_id</TD></TR>
-      <TR><TD PORT="menu_channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">menu_channel_id</TD></TR>
-      <TR><TD PORT="menu_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">menu_name</TD></TR>
-      <TR><TD PORT="menu_desc" COLSPAN="3" ALIGN="LEFT">menu_desc</TD></TR>
-      <TR><TD PORT="menu_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">menu_flags</TD></TR>
-      <TR><TD PORT="menu_created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">menu_created</TD></TR>
-      <TR><TD PORT="menu_edited" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">menu_edited</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/menu.html"
-    tooltip="menu"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/menu.1degree.png b/hubzilla_er/diagrams/summary/menu.1degree.png
deleted file mode 100644
index c9a694cf2..000000000
--- a/hubzilla_er/diagrams/summary/menu.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/menu_item.1degree.dot b/hubzilla_er/diagrams/summary/menu_item.1degree.dot
deleted file mode 100644
index c0f198f59..000000000
--- a/hubzilla_er/diagrams/summary/menu_item.1degree.dot
+++ /dev/null
@@ -1,40 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "menu_item" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "menu_item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">menu_item</TD></TR>
-      <TR><TD PORT="mitem_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">mitem_id</TD></TR>
-      <TR><TD PORT="mitem_link" COLSPAN="3" ALIGN="LEFT">mitem_link</TD></TR>
-      <TR><TD PORT="mitem_desc" COLSPAN="3" ALIGN="LEFT">mitem_desc</TD></TR>
-      <TR><TD PORT="mitem_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mitem_flags</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD PORT="mitem_channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mitem_channel_id</TD></TR>
-      <TR><TD PORT="mitem_menu_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mitem_menu_id</TD></TR>
-      <TR><TD PORT="mitem_order" COLSPAN="3" ALIGN="LEFT">mitem_order</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/menu_item.html"
-    tooltip="menu_item"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/menu_item.1degree.png b/hubzilla_er/diagrams/summary/menu_item.1degree.png
deleted file mode 100644
index 599a7abda..000000000
--- a/hubzilla_er/diagrams/summary/menu_item.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/notify.1degree.dot b/hubzilla_er/diagrams/summary/notify.1degree.dot
deleted file mode 100644
index 6f3703225..000000000
--- a/hubzilla_er/diagrams/summary/notify.1degree.dot
+++ /dev/null
@@ -1,44 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "notify" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="3" ALIGN="LEFT">msg</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/notify.html"
-    tooltip="notify"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/notify.1degree.png b/hubzilla_er/diagrams/summary/notify.1degree.png
deleted file mode 100644
index 9cb8e29ab..000000000
--- a/hubzilla_er/diagrams/summary/notify.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/obj.1degree.dot b/hubzilla_er/diagrams/summary/obj.1degree.dot
deleted file mode 100644
index 3dd5ba647..000000000
--- a/hubzilla_er/diagrams/summary/obj.1degree.dot
+++ /dev/null
@@ -1,39 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "obj" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "obj" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">obj</TD></TR>
-      <TR><TD PORT="obj_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">obj_id</TD></TR>
-      <TR><TD PORT="obj_page" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">obj_page</TD></TR>
-      <TR><TD PORT="obj_verb" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">obj_verb</TD></TR>
-      <TR><TD PORT="obj_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">obj_type</TD></TR>
-      <TR><TD PORT="obj_obj" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">obj_obj</TD></TR>
-      <TR><TD PORT="obj_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">obj_channel</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/obj.html"
-    tooltip="obj"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/obj.1degree.png b/hubzilla_er/diagrams/summary/obj.1degree.png
deleted file mode 100644
index e458c4334..000000000
--- a/hubzilla_er/diagrams/summary/obj.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/outq.1degree.dot b/hubzilla_er/diagrams/summary/outq.1degree.dot
deleted file mode 100644
index 114717b01..000000000
--- a/hubzilla_er/diagrams/summary/outq.1degree.dot
+++ /dev/null
@@ -1,41 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "outq" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "outq" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">outq</TD></TR>
-      <TR><TD PORT="outq_hash" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">outq_hash</TD></TR>
-      <TR><TD PORT="outq_account" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">outq_account</TD></TR>
-      <TR><TD PORT="outq_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">outq_channel</TD></TR>
-      <TR><TD PORT="outq_driver" COLSPAN="3" ALIGN="LEFT">outq_driver</TD></TR>
-      <TR><TD PORT="outq_posturl" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">outq_posturl</TD></TR>
-      <TR><TD PORT="outq_async" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">outq_async</TD></TR>
-      <TR><TD PORT="outq_delivered" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">outq_delivered</TD></TR>
-      <TR><TD PORT="outq_created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">outq_created</TD></TR>
-      <TR><TD PORT="outq_updated" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">outq_updated</TD></TR>
-      <TR><TD PORT="outq_notify" COLSPAN="3" ALIGN="LEFT">outq_notify</TD></TR>
-      <TR><TD PORT="outq_msg" COLSPAN="3" ALIGN="LEFT">outq_msg</TD></TR>
-      <TR><TD PORT="outq_priority" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">outq_priority</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/outq.html"
-    tooltip="outq"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/outq.1degree.png b/hubzilla_er/diagrams/summary/outq.1degree.png
deleted file mode 100644
index 2cb2b78db..000000000
--- a/hubzilla_er/diagrams/summary/outq.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/pconfig.1degree.dot b/hubzilla_er/diagrams/summary/pconfig.1degree.dot
deleted file mode 100644
index 2c521333e..000000000
--- a/hubzilla_er/diagrams/summary/pconfig.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "pconfig" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/pconfig.html"
-    tooltip="pconfig"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/pconfig.1degree.png b/hubzilla_er/diagrams/summary/pconfig.1degree.png
deleted file mode 100644
index f50965fda..000000000
--- a/hubzilla_er/diagrams/summary/pconfig.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/photo.1degree.dot b/hubzilla_er/diagrams/summary/photo.1degree.dot
deleted file mode 100644
index c0d5d2a32..000000000
--- a/hubzilla_er/diagrams/summary/photo.1degree.dot
+++ /dev/null
@@ -1,57 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "photo" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD PORT="resource_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_id</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT">description</TD></TR>
-      <TR><TD PORT="album" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">album</TD></TR>
-      <TR><TD PORT="filename" COLSPAN="3" ALIGN="LEFT">filename</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="height" COLSPAN="3" ALIGN="LEFT">height</TD></TR>
-      <TR><TD PORT="width" COLSPAN="3" ALIGN="LEFT">width</TD></TR>
-      <TR><TD PORT="size" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">size</TD></TR>
-      <TR><TD PORT="data" COLSPAN="3" ALIGN="LEFT">data</TD></TR>
-      <TR><TD PORT="scale" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">scale</TD></TR>
-      <TR><TD PORT="photo_usage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_usage</TD></TR>
-      <TR><TD PORT="profile" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">profile</TD></TR>
-      <TR><TD PORT="is_nsfw" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_nsfw</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD></TR>
-      <TR><TD PORT="os_path" COLSPAN="3" ALIGN="LEFT">os_path</TD></TR>
-      <TR><TD PORT="display_path" COLSPAN="3" ALIGN="LEFT">display_path</TD></TR>
-      <TR><TD PORT="photo_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_flags</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/photo.html"
-    tooltip="photo"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/photo.1degree.png b/hubzilla_er/diagrams/summary/photo.1degree.png
deleted file mode 100644
index 52e8b3eb8..000000000
--- a/hubzilla_er/diagrams/summary/photo.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/poll.1degree.dot b/hubzilla_er/diagrams/summary/poll.1degree.dot
deleted file mode 100644
index 9c6334d6b..000000000
--- a/hubzilla_er/diagrams/summary/poll.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "poll" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "poll" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">poll</TD></TR>
-      <TR><TD PORT="poll_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">poll_id</TD></TR>
-      <TR><TD PORT="poll_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">poll_channel</TD></TR>
-      <TR><TD PORT="poll_desc" COLSPAN="3" ALIGN="LEFT">poll_desc</TD></TR>
-      <TR><TD PORT="poll_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">poll_flags</TD></TR>
-      <TR><TD PORT="poll_votes" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">poll_votes</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/poll.html"
-    tooltip="poll"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/poll.1degree.png b/hubzilla_er/diagrams/summary/poll.1degree.png
deleted file mode 100644
index 1d917cf23..000000000
--- a/hubzilla_er/diagrams/summary/poll.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/poll_elm.1degree.dot b/hubzilla_er/diagrams/summary/poll_elm.1degree.dot
deleted file mode 100644
index f93572da9..000000000
--- a/hubzilla_er/diagrams/summary/poll_elm.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "poll_elm" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "poll_elm" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">poll_elm</TD></TR>
-      <TR><TD PORT="pelm_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">pelm_id</TD></TR>
-      <TR><TD PORT="pelm_poll" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">pelm_poll</TD></TR>
-      <TR><TD PORT="pelm_desc" COLSPAN="3" ALIGN="LEFT">pelm_desc</TD></TR>
-      <TR><TD PORT="pelm_flags" COLSPAN="3" ALIGN="LEFT">pelm_flags</TD></TR>
-      <TR><TD PORT="pelm_result" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">pelm_result</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/poll_elm.html"
-    tooltip="poll_elm"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/poll_elm.1degree.png b/hubzilla_er/diagrams/summary/poll_elm.1degree.png
deleted file mode 100644
index 167e14828..000000000
--- a/hubzilla_er/diagrams/summary/poll_elm.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/profdef.1degree.dot b/hubzilla_er/diagrams/summary/profdef.1degree.dot
deleted file mode 100644
index 56d3b113a..000000000
--- a/hubzilla_er/diagrams/summary/profdef.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "profdef" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="field_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">field_name</TD></TR>
-      <TR><TD PORT="field_type" COLSPAN="3" ALIGN="LEFT">field_type</TD></TR>
-      <TR><TD PORT="field_desc" COLSPAN="3" ALIGN="LEFT">field_desc</TD></TR>
-      <TR><TD PORT="field_help" COLSPAN="3" ALIGN="LEFT">field_help</TD></TR>
-      <TR><TD PORT="field_inputs" COLSPAN="3" ALIGN="LEFT">field_inputs</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/profdef.html"
-    tooltip="profdef"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/profdef.1degree.png b/hubzilla_er/diagrams/summary/profdef.1degree.png
deleted file mode 100644
index b0818ff0b..000000000
--- a/hubzilla_er/diagrams/summary/profdef.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/profext.1degree.dot b/hubzilla_er/diagrams/summary/profext.1degree.dot
deleted file mode 100644
index 4906df600..000000000
--- a/hubzilla_er/diagrams/summary/profext.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "profext" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/profext.html"
-    tooltip="profext"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/profext.1degree.png b/hubzilla_er/diagrams/summary/profext.1degree.png
deleted file mode 100644
index 0c4a78f19..000000000
--- a/hubzilla_er/diagrams/summary/profext.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/profile.1degree.dot b/hubzilla_er/diagrams/summary/profile.1degree.dot
deleted file mode 100644
index 09c1fbfc9..000000000
--- a/hubzilla_er/diagrams/summary/profile.1degree.dot
+++ /dev/null
@@ -1,73 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "profile" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="profile_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">profile_guid</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="profile_name" COLSPAN="3" ALIGN="LEFT">profile_name</TD></TR>
-      <TR><TD PORT="is_default" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_default</TD></TR>
-      <TR><TD PORT="hide_friends" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hide_friends</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="pdesc" COLSPAN="3" ALIGN="LEFT">pdesc</TD></TR>
-      <TR><TD PORT="chandesc" COLSPAN="3" ALIGN="LEFT">chandesc</TD></TR>
-      <TR><TD PORT="dob" COLSPAN="3" ALIGN="LEFT">dob</TD></TR>
-      <TR><TD PORT="dob_tz" COLSPAN="3" ALIGN="LEFT">dob_tz</TD></TR>
-      <TR><TD PORT="address" COLSPAN="3" ALIGN="LEFT">address</TD></TR>
-      <TR><TD PORT="locality" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">locality</TD></TR>
-      <TR><TD PORT="region" COLSPAN="3" ALIGN="LEFT">region</TD></TR>
-      <TR><TD PORT="postal_code" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">postal_code</TD></TR>
-      <TR><TD PORT="country_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">country_name</TD></TR>
-      <TR><TD PORT="hometown" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hometown</TD></TR>
-      <TR><TD PORT="gender" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">gender</TD></TR>
-      <TR><TD PORT="marital" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">marital</TD></TR>
-      <TR><TD PORT="with" COLSPAN="3" ALIGN="LEFT">with</TD></TR>
-      <TR><TD PORT="howlong" COLSPAN="3" ALIGN="LEFT">howlong</TD></TR>
-      <TR><TD PORT="sexual" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sexual</TD></TR>
-      <TR><TD PORT="politic" COLSPAN="3" ALIGN="LEFT">politic</TD></TR>
-      <TR><TD PORT="religion" COLSPAN="3" ALIGN="LEFT">religion</TD></TR>
-      <TR><TD PORT="keywords" COLSPAN="3" ALIGN="LEFT">keywords</TD></TR>
-      <TR><TD PORT="likes" COLSPAN="3" ALIGN="LEFT">likes</TD></TR>
-      <TR><TD PORT="dislikes" COLSPAN="3" ALIGN="LEFT">dislikes</TD></TR>
-      <TR><TD PORT="about" COLSPAN="3" ALIGN="LEFT">about</TD></TR>
-      <TR><TD PORT="summary" COLSPAN="3" ALIGN="LEFT">summary</TD></TR>
-      <TR><TD PORT="music" COLSPAN="3" ALIGN="LEFT">music</TD></TR>
-      <TR><TD PORT="book" COLSPAN="3" ALIGN="LEFT">book</TD></TR>
-      <TR><TD PORT="tv" COLSPAN="3" ALIGN="LEFT">tv</TD></TR>
-      <TR><TD PORT="film" COLSPAN="3" ALIGN="LEFT">film</TD></TR>
-      <TR><TD PORT="interest" COLSPAN="3" ALIGN="LEFT">interest</TD></TR>
-      <TR><TD PORT="romance" COLSPAN="3" ALIGN="LEFT">romance</TD></TR>
-      <TR><TD PORT="work" COLSPAN="3" ALIGN="LEFT">work</TD></TR>
-      <TR><TD PORT="education" COLSPAN="3" ALIGN="LEFT">education</TD></TR>
-      <TR><TD PORT="contact" COLSPAN="3" ALIGN="LEFT">contact</TD></TR>
-      <TR><TD PORT="channels" COLSPAN="3" ALIGN="LEFT">channels</TD></TR>
-      <TR><TD PORT="homepage" COLSPAN="3" ALIGN="LEFT">homepage</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="thumb" COLSPAN="3" ALIGN="LEFT">thumb</TD></TR>
-      <TR><TD PORT="publish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">publish</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/profile.html"
-    tooltip="profile"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/profile.1degree.png b/hubzilla_er/diagrams/summary/profile.1degree.png
deleted file mode 100644
index e738b627f..000000000
--- a/hubzilla_er/diagrams/summary/profile.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/profile_check.1degree.dot b/hubzilla_er/diagrams/summary/profile_check.1degree.dot
deleted file mode 100644
index 762580419..000000000
--- a/hubzilla_er/diagrams/summary/profile_check.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "profile_check" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cid</TD></TR>
-      <TR><TD PORT="dfrn_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">dfrn_id</TD></TR>
-      <TR><TD PORT="sec" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sec</TD></TR>
-      <TR><TD PORT="expire" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expire</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/profile_check.html"
-    tooltip="profile_check"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/profile_check.1degree.png b/hubzilla_er/diagrams/summary/profile_check.1degree.png
deleted file mode 100644
index 7f074e851..000000000
--- a/hubzilla_er/diagrams/summary/profile_check.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/register.1degree.dot b/hubzilla_er/diagrams/summary/register.1degree.dot
deleted file mode 100644
index 6d3259a33..000000000
--- a/hubzilla_er/diagrams/summary/register.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "register" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="password" COLSPAN="3" ALIGN="LEFT">password</TD></TR>
-      <TR><TD PORT="language" COLSPAN="3" ALIGN="LEFT">language</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/register.html"
-    tooltip="register"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/register.1degree.png b/hubzilla_er/diagrams/summary/register.1degree.png
deleted file mode 100644
index 099684117..000000000
--- a/hubzilla_er/diagrams/summary/register.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/relationships.implied.compact.dot b/hubzilla_er/diagrams/summary/relationships.implied.compact.dot
deleted file mode 100644
index dade9cf5b..000000000
--- a/hubzilla_er/diagrams/summary/relationships.implied.compact.dot
+++ /dev/null
@@ -1,734 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "compactImpliedRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "account" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">account</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">account_id</TD></TR>
-      <TR><TD PORT="account_parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_parent</TD></TR>
-      <TR><TD PORT="account_default_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_default_channel</TD></TR>
-      <TR><TD PORT="account_email" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_email</TD></TR>
-      <TR><TD PORT="account_external" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_external</TD></TR>
-      <TR><TD PORT="account_lastlog" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_lastlog</TD></TR>
-      <TR><TD PORT="account_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_flags</TD></TR>
-      <TR><TD PORT="account_roles" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_roles</TD></TR>
-      <TR><TD PORT="account_expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_expires</TD></TR>
-      <TR><TD PORT="account_service_class" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_service_class</TD></TR>
-      <TR><TD PORT="account_level" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_level</TD></TR>
-      <TR><TD PORT="account_password_changed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_password_changed</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/account.html"
-    tooltip="account"
-  ];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="installed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">installed</TD></TR>
-      <TR><TD PORT="hidden" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hidden</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="app_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_id</TD></TR>
-      <TR><TD PORT="app_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_name</TD></TR>
-      <TR><TD PORT="app_url" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_url</TD></TR>
-      <TR><TD PORT="app_photo" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_photo</TD></TR>
-      <TR><TD PORT="app_version" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_version</TD></TR>
-      <TR><TD PORT="app_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_channel</TD></TR>
-      <TR><TD PORT="app_price" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_price</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/app.html"
-    tooltip="app"
-  ];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="creator" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">creator</TD></TR>
-      <TR><TD PORT="filename" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">filename</TD></TR>
-      <TR><TD PORT="filetype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">filetype</TD></TR>
-      <TR><TD PORT="filesize" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">filesize</TD></TR>
-      <TR><TD PORT="revision" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">revision</TD></TR>
-      <TR><TD PORT="folder" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">folder</TD></TR>
-      <TR><TD PORT="flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">flags</TD></TR>
-      <TR><TD PORT="is_dir" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_dir</TD></TR>
-      <TR><TD PORT="is_photo" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_photo</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/attach.html"
-    tooltip="attach"
-  ];
-  "auth_codes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">auth_codes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/auth_codes.html"
-    tooltip="auth_codes"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/cache.html"
-    tooltip="cache"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="channel_account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_account_id</TD></TR>
-      <TR><TD PORT="channel_primary" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_primary</TD></TR>
-      <TR><TD PORT="channel_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_name</TD></TR>
-      <TR><TD PORT="channel_address" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_address</TD></TR>
-      <TR><TD PORT="channel_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_guid</TD></TR>
-      <TR><TD PORT="channel_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_hash</TD></TR>
-      <TR><TD PORT="channel_timezone" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_timezone</TD></TR>
-      <TR><TD PORT="channel_location" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_location</TD></TR>
-      <TR><TD PORT="channel_theme" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_theme</TD></TR>
-      <TR><TD PORT="channel_notifyflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_notifyflags</TD></TR>
-      <TR><TD PORT="channel_pageflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_pageflags</TD></TR>
-      <TR><TD PORT="channel_dirdate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_dirdate</TD></TR>
-      <TR><TD PORT="channel_lastpost" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_lastpost</TD></TR>
-      <TR><TD PORT="channel_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_deleted</TD></TR>
-      <TR><TD PORT="channel_max_anon_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_anon_mail</TD></TR>
-      <TR><TD PORT="channel_max_friend_req" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_friend_req</TD></TR>
-      <TR><TD PORT="channel_expire_days" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_expire_days</TD></TR>
-      <TR><TD PORT="channel_default_group" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_default_group</TD></TR>
-      <TR><TD PORT="channel_r_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_stream</TD></TR>
-      <TR><TD PORT="channel_r_profile" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_profile</TD></TR>
-      <TR><TD PORT="channel_r_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_photos</TD></TR>
-      <TR><TD PORT="channel_r_abook" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_abook</TD></TR>
-      <TR><TD PORT="channel_w_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_stream</TD></TR>
-      <TR><TD PORT="channel_w_wall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_wall</TD></TR>
-      <TR><TD PORT="channel_w_tagwall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_tagwall</TD></TR>
-      <TR><TD PORT="channel_w_comment" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_comment</TD></TR>
-      <TR><TD PORT="channel_w_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_mail</TD></TR>
-      <TR><TD PORT="channel_w_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_photos</TD></TR>
-      <TR><TD PORT="channel_w_chat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_chat</TD></TR>
-      <TR><TD PORT="channel_a_delegate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_delegate</TD></TR>
-      <TR><TD PORT="channel_r_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_storage</TD></TR>
-      <TR><TD PORT="channel_w_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_storage</TD></TR>
-      <TR><TD PORT="channel_r_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_pages</TD></TR>
-      <TR><TD PORT="channel_w_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_pages</TD></TR>
-      <TR><TD PORT="channel_a_republish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_republish</TD></TR>
-      <TR><TD PORT="channel_w_like" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_like</TD></TR>
-      <TR><TD PORT="channel_removed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_removed</TD></TR>
-      <TR><TD PORT="channel_system" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_system</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/channel.html"
-    tooltip="channel"
-  ];
-  "clients" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">clients</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/clients.html"
-    tooltip="clients"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/conv.html"
-    tooltip="conv"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="event_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_xchan</TD></TR>
-      <TR><TD PORT="event_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_hash</TD></TR>
-      <TR><TD PORT="start" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">start</TD></TR>
-      <TR><TD PORT="finish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">finish</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="nofinish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">nofinish</TD></TR>
-      <TR><TD PORT="adjust" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">adjust</TD></TR>
-      <TR><TD PORT="ignore" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ignore</TD></TR>
-      <TR><TD PORT="event_status" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_status</TD></TR>
-      <TR><TD PORT="event_sequence" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_sequence</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/event.html"
-    tooltip="event"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="addr" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">addr</TD></TR>
-      <TR><TD PORT="network" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">network</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cid</TD></TR>
-      <TR><TD PORT="fid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">fid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/ffinder.html"
-    tooltip="ffinder"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="server" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">server</TD></TR>
-      <TR><TD PORT="posturl" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">posturl</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="gid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">gid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="visible" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">visible</TD></TR>
-      <TR><TD PORT="deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">deleted</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/groups.html"
-    tooltip="groups"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hook" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hook</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/hook.html"
-    tooltip="hook"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="commented" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">commented</TD></TR>
-      <TR><TD PORT="received" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">received</TD></TR>
-      <TR><TD PORT="changed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">changed</TD></TR>
-      <TR><TD PORT="comments_closed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">comments_closed</TD></TR>
-      <TR><TD PORT="owner_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">owner_xchan</TD></TR>
-      <TR><TD PORT="author_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">author_xchan</TD></TR>
-      <TR><TD PORT="mimetype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mimetype</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="body" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">body</TD></TR>
-      <TR><TD PORT="revision" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">revision</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="layout_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">layout_mid</TD></TR>
-      <TR><TD PORT="llink" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">llink</TD></TR>
-      <TR><TD PORT="resource_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_type</TD></TR>
-      <TR><TD PORT="public_policy" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">public_policy</TD></TR>
-      <TR><TD PORT="comment_policy" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">comment_policy</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD PORT="item_restrict" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_restrict</TD></TR>
-      <TR><TD PORT="item_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_flags</TD></TR>
-      <TR><TD PORT="item_private" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_private</TD></TR>
-      <TR><TD PORT="item_origin" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_origin</TD></TR>
-      <TR><TD PORT="item_unseen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_unseen</TD></TR>
-      <TR><TD PORT="item_starred" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_starred</TD></TR>
-      <TR><TD PORT="item_uplink" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_uplink</TD></TR>
-      <TR><TD PORT="item_consensus" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_consensus</TD></TR>
-      <TR><TD PORT="item_wall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_wall</TD></TR>
-      <TR><TD PORT="item_thread_top" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_thread_top</TD></TR>
-      <TR><TD PORT="item_notshown" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_notshown</TD></TR>
-      <TR><TD PORT="item_nsfw" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_nsfw</TD></TR>
-      <TR><TD PORT="item_relay" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_relay</TD></TR>
-      <TR><TD PORT="item_mentionsme" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_mentionsme</TD></TR>
-      <TR><TD PORT="item_nocomment" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_nocomment</TD></TR>
-      <TR><TD PORT="item_obscured" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_obscured</TD></TR>
-      <TR><TD PORT="item_verified" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_verified</TD></TR>
-      <TR><TD PORT="item_retained" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_retained</TD></TR>
-      <TR><TD PORT="item_rss" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_rss</TD></TR>
-      <TR><TD PORT="item_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_deleted</TD></TR>
-      <TR><TD PORT="item_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_type</TD></TR>
-      <TR><TD PORT="item_hidden" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_hidden</TD></TR>
-      <TR><TD PORT="item_unpublished" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_unpublished</TD></TR>
-      <TR><TD PORT="item_delayed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_delayed</TD></TR>
-      <TR><TD PORT="item_pending_remove" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_pending_remove</TD></TR>
-      <TR><TD PORT="item_blocked" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_blocked</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="sid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sid</TD></TR>
-      <TR><TD PORT="service" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">service</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="liker" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">liker</TD></TR>
-      <TR><TD PORT="likee" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">likee</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="target_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">target_type</TD></TR>
-      <TR><TD PORT="target_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">target_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="convid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">convid</TD></TR>
-      <TR><TD PORT="mail_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_flags</TD></TR>
-      <TR><TD PORT="from_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">from_xchan</TD></TR>
-      <TR><TD PORT="to_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">to_xchan</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD></TR>
-      <TR><TD PORT="mail_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_deleted</TD></TR>
-      <TR><TD PORT="mail_replied" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_replied</TD></TR>
-      <TR><TD PORT="mail_isreply" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_isreply</TD></TR>
-      <TR><TD PORT="mail_seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_seen</TD></TR>
-      <TR><TD PORT="mail_recalled" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_recalled</TD></TR>
-      <TR><TD PORT="mail_obscured" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_obscured</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/mail.html"
-    tooltip="mail"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/pconfig.html"
-    tooltip="pconfig"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD PORT="resource_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_id</TD></TR>
-      <TR><TD PORT="album" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">album</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="size" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">size</TD></TR>
-      <TR><TD PORT="scale" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">scale</TD></TR>
-      <TR><TD PORT="photo_usage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_usage</TD></TR>
-      <TR><TD PORT="profile" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">profile</TD></TR>
-      <TR><TD PORT="is_nsfw" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_nsfw</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD></TR>
-      <TR><TD PORT="photo_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_flags</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="field_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">field_name</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/profext.html"
-    tooltip="profext"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="profile_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">profile_guid</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="is_default" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_default</TD></TR>
-      <TR><TD PORT="hide_friends" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hide_friends</TD></TR>
-      <TR><TD PORT="locality" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">locality</TD></TR>
-      <TR><TD PORT="postal_code" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">postal_code</TD></TR>
-      <TR><TD PORT="country_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">country_name</TD></TR>
-      <TR><TD PORT="hometown" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hometown</TD></TR>
-      <TR><TD PORT="gender" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">gender</TD></TR>
-      <TR><TD PORT="marital" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">marital</TD></TR>
-      <TR><TD PORT="sexual" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sexual</TD></TR>
-      <TR><TD PORT="publish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">publish</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/profile.html"
-    tooltip="profile"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cid</TD></TR>
-      <TR><TD PORT="dfrn_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">dfrn_id</TD></TR>
-      <TR><TD PORT="sec" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sec</TD></TR>
-      <TR><TD PORT="expire" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expire</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="retract_iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">retract_iid</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/sign.html"
-    tooltip="sign"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="spam" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">spam</TD></TR>
-      <TR><TD PORT="ham" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ham</TD></TR>
-      <TR><TD PORT="term" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">term</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/spam.html"
-    tooltip="spam"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "tokens" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">tokens</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/tokens.html"
-    tooltip="tokens"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/xign.html"
-    tooltip="xign"
-  ];
-  "addon":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "auth_codes":"client_id":w -> "clients":"client_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "auth_codes":"id":w -> "tokens":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "conv":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "event":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"channel_id":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "likes":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"account_id":w -> "account":"account_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"channel_id":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "photo":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"channel_id":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profext":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profile":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "tokens":"client_id":w -> "clients":"client_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xconfig":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xign":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-}
diff --git a/hubzilla_er/diagrams/summary/relationships.implied.compact.png b/hubzilla_er/diagrams/summary/relationships.implied.compact.png
deleted file mode 100644
index dd2a635e9..000000000
--- a/hubzilla_er/diagrams/summary/relationships.implied.compact.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/relationships.implied.large.dot b/hubzilla_er/diagrams/summary/relationships.implied.large.dot
deleted file mode 100644
index 502fc8ad5..000000000
--- a/hubzilla_er/diagrams/summary/relationships.implied.large.dot
+++ /dev/null
@@ -1,878 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "largeImpliedRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "account" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">account</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">account_id</TD></TR>
-      <TR><TD PORT="account_parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_parent</TD></TR>
-      <TR><TD PORT="account_default_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_default_channel</TD></TR>
-      <TR><TD PORT="account_salt" COLSPAN="3" ALIGN="LEFT">account_salt</TD></TR>
-      <TR><TD PORT="account_password" COLSPAN="3" ALIGN="LEFT">account_password</TD></TR>
-      <TR><TD PORT="account_email" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_email</TD></TR>
-      <TR><TD PORT="account_external" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_external</TD></TR>
-      <TR><TD PORT="account_language" COLSPAN="3" ALIGN="LEFT">account_language</TD></TR>
-      <TR><TD PORT="account_created" COLSPAN="3" ALIGN="LEFT">account_created</TD></TR>
-      <TR><TD PORT="account_lastlog" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_lastlog</TD></TR>
-      <TR><TD PORT="account_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_flags</TD></TR>
-      <TR><TD PORT="account_roles" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_roles</TD></TR>
-      <TR><TD PORT="account_reset" COLSPAN="3" ALIGN="LEFT">account_reset</TD></TR>
-      <TR><TD PORT="account_expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_expires</TD></TR>
-      <TR><TD PORT="account_expire_notified" COLSPAN="3" ALIGN="LEFT">account_expire_notified</TD></TR>
-      <TR><TD PORT="account_service_class" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_service_class</TD></TR>
-      <TR><TD PORT="account_level" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_level</TD></TR>
-      <TR><TD PORT="account_password_changed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_password_changed</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/account.html"
-    tooltip="account"
-  ];
-  "addon" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">addon</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="version" COLSPAN="3" ALIGN="LEFT">version</TD></TR>
-      <TR><TD PORT="installed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">installed</TD></TR>
-      <TR><TD PORT="hidden" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hidden</TD></TR>
-      <TR><TD PORT="timestamp" COLSPAN="3" ALIGN="LEFT">timestamp</TD></TR>
-      <TR><TD PORT="plugin_admin" COLSPAN="3" ALIGN="LEFT">plugin_admin</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/addon.html"
-    tooltip="addon"
-  ];
-  "app" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">app</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="app_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_id</TD></TR>
-      <TR><TD PORT="app_sig" COLSPAN="3" ALIGN="LEFT">app_sig</TD></TR>
-      <TR><TD PORT="app_author" COLSPAN="3" ALIGN="LEFT">app_author</TD></TR>
-      <TR><TD PORT="app_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_name</TD></TR>
-      <TR><TD PORT="app_desc" COLSPAN="3" ALIGN="LEFT">app_desc</TD></TR>
-      <TR><TD PORT="app_url" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_url</TD></TR>
-      <TR><TD PORT="app_photo" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_photo</TD></TR>
-      <TR><TD PORT="app_version" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_version</TD></TR>
-      <TR><TD PORT="app_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_channel</TD></TR>
-      <TR><TD PORT="app_addr" COLSPAN="3" ALIGN="LEFT">app_addr</TD></TR>
-      <TR><TD PORT="app_price" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">app_price</TD></TR>
-      <TR><TD PORT="app_page" COLSPAN="3" ALIGN="LEFT">app_page</TD></TR>
-      <TR><TD PORT="app_requires" COLSPAN="3" ALIGN="LEFT">app_requires</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/app.html"
-    tooltip="app"
-  ];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="creator" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">creator</TD></TR>
-      <TR><TD PORT="filename" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">filename</TD></TR>
-      <TR><TD PORT="filetype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">filetype</TD></TR>
-      <TR><TD PORT="filesize" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">filesize</TD></TR>
-      <TR><TD PORT="revision" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">revision</TD></TR>
-      <TR><TD PORT="folder" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">folder</TD></TR>
-      <TR><TD PORT="flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">flags</TD></TR>
-      <TR><TD PORT="is_dir" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_dir</TD></TR>
-      <TR><TD PORT="is_photo" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_photo</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD></TR>
-      <TR><TD PORT="os_path" COLSPAN="3" ALIGN="LEFT">os_path</TD></TR>
-      <TR><TD PORT="display_path" COLSPAN="3" ALIGN="LEFT">display_path</TD></TR>
-      <TR><TD PORT="data" COLSPAN="3" ALIGN="LEFT">data</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/attach.html"
-    tooltip="attach"
-  ];
-  "auth_codes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">auth_codes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="redirect_uri" COLSPAN="3" ALIGN="LEFT">redirect_uri</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="scope" COLSPAN="3" ALIGN="LEFT">scope</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/auth_codes.html"
-    tooltip="auth_codes"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/cache.html"
-    tooltip="cache"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="channel_account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_account_id</TD></TR>
-      <TR><TD PORT="channel_primary" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_primary</TD></TR>
-      <TR><TD PORT="channel_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_name</TD></TR>
-      <TR><TD PORT="channel_address" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_address</TD></TR>
-      <TR><TD PORT="channel_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_guid</TD></TR>
-      <TR><TD PORT="channel_guid_sig" COLSPAN="3" ALIGN="LEFT">channel_guid_sig</TD></TR>
-      <TR><TD PORT="channel_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_hash</TD></TR>
-      <TR><TD PORT="channel_timezone" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_timezone</TD></TR>
-      <TR><TD PORT="channel_location" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_location</TD></TR>
-      <TR><TD PORT="channel_theme" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_theme</TD></TR>
-      <TR><TD PORT="channel_startpage" COLSPAN="3" ALIGN="LEFT">channel_startpage</TD></TR>
-      <TR><TD PORT="channel_pubkey" COLSPAN="3" ALIGN="LEFT">channel_pubkey</TD></TR>
-      <TR><TD PORT="channel_prvkey" COLSPAN="3" ALIGN="LEFT">channel_prvkey</TD></TR>
-      <TR><TD PORT="channel_notifyflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_notifyflags</TD></TR>
-      <TR><TD PORT="channel_pageflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_pageflags</TD></TR>
-      <TR><TD PORT="channel_dirdate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_dirdate</TD></TR>
-      <TR><TD PORT="channel_lastpost" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_lastpost</TD></TR>
-      <TR><TD PORT="channel_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_deleted</TD></TR>
-      <TR><TD PORT="channel_max_anon_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_anon_mail</TD></TR>
-      <TR><TD PORT="channel_max_friend_req" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_friend_req</TD></TR>
-      <TR><TD PORT="channel_expire_days" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_expire_days</TD></TR>
-      <TR><TD PORT="channel_passwd_reset" COLSPAN="3" ALIGN="LEFT">channel_passwd_reset</TD></TR>
-      <TR><TD PORT="channel_default_group" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_default_group</TD></TR>
-      <TR><TD PORT="channel_allow_cid" COLSPAN="3" ALIGN="LEFT">channel_allow_cid</TD></TR>
-      <TR><TD PORT="channel_allow_gid" COLSPAN="3" ALIGN="LEFT">channel_allow_gid</TD></TR>
-      <TR><TD PORT="channel_deny_cid" COLSPAN="3" ALIGN="LEFT">channel_deny_cid</TD></TR>
-      <TR><TD PORT="channel_deny_gid" COLSPAN="3" ALIGN="LEFT">channel_deny_gid</TD></TR>
-      <TR><TD PORT="channel_r_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_stream</TD></TR>
-      <TR><TD PORT="channel_r_profile" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_profile</TD></TR>
-      <TR><TD PORT="channel_r_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_photos</TD></TR>
-      <TR><TD PORT="channel_r_abook" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_abook</TD></TR>
-      <TR><TD PORT="channel_w_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_stream</TD></TR>
-      <TR><TD PORT="channel_w_wall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_wall</TD></TR>
-      <TR><TD PORT="channel_w_tagwall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_tagwall</TD></TR>
-      <TR><TD PORT="channel_w_comment" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_comment</TD></TR>
-      <TR><TD PORT="channel_w_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_mail</TD></TR>
-      <TR><TD PORT="channel_w_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_photos</TD></TR>
-      <TR><TD PORT="channel_w_chat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_chat</TD></TR>
-      <TR><TD PORT="channel_a_delegate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_delegate</TD></TR>
-      <TR><TD PORT="channel_r_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_storage</TD></TR>
-      <TR><TD PORT="channel_w_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_storage</TD></TR>
-      <TR><TD PORT="channel_r_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_pages</TD></TR>
-      <TR><TD PORT="channel_w_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_pages</TD></TR>
-      <TR><TD PORT="channel_a_republish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_republish</TD></TR>
-      <TR><TD PORT="channel_w_like" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_like</TD></TR>
-      <TR><TD PORT="channel_removed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_removed</TD></TR>
-      <TR><TD PORT="channel_system" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_system</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/channel.html"
-    tooltip="channel"
-  ];
-  "clients" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">clients</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="pw" COLSPAN="3" ALIGN="LEFT">pw</TD></TR>
-      <TR><TD PORT="redirect_uri" COLSPAN="3" ALIGN="LEFT">redirect_uri</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="icon" COLSPAN="3" ALIGN="LEFT">icon</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/clients.html"
-    tooltip="clients"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="guid" COLSPAN="3" ALIGN="LEFT">guid</TD></TR>
-      <TR><TD PORT="recips" COLSPAN="3" ALIGN="LEFT">recips</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="creator" COLSPAN="3" ALIGN="LEFT">creator</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD PORT="subject" COLSPAN="3" ALIGN="LEFT">subject</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/conv.html"
-    tooltip="conv"
-  ];
-  "event" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">event</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="event_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_xchan</TD></TR>
-      <TR><TD PORT="event_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_hash</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="start" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">start</TD></TR>
-      <TR><TD PORT="finish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">finish</TD></TR>
-      <TR><TD PORT="summary" COLSPAN="3" ALIGN="LEFT">summary</TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT">description</TD></TR>
-      <TR><TD PORT="location" COLSPAN="3" ALIGN="LEFT">location</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="nofinish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">nofinish</TD></TR>
-      <TR><TD PORT="adjust" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">adjust</TD></TR>
-      <TR><TD PORT="ignore" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ignore</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD PORT="event_status" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_status</TD></TR>
-      <TR><TD PORT="event_status_date" COLSPAN="3" ALIGN="LEFT">event_status_date</TD></TR>
-      <TR><TD PORT="event_percent" COLSPAN="3" ALIGN="LEFT">event_percent</TD></TR>
-      <TR><TD PORT="event_repeat" COLSPAN="3" ALIGN="LEFT">event_repeat</TD></TR>
-      <TR><TD PORT="event_sequence" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">event_sequence</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/event.html"
-    tooltip="event"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="request" COLSPAN="3" ALIGN="LEFT">request</TD></TR>
-      <TR><TD PORT="nick" COLSPAN="3" ALIGN="LEFT">nick</TD></TR>
-      <TR><TD PORT="addr" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">addr</TD></TR>
-      <TR><TD PORT="batch" COLSPAN="3" ALIGN="LEFT">batch</TD></TR>
-      <TR><TD PORT="notify" COLSPAN="3" ALIGN="LEFT">notify</TD></TR>
-      <TR><TD PORT="poll" COLSPAN="3" ALIGN="LEFT">poll</TD></TR>
-      <TR><TD PORT="confirm" COLSPAN="3" ALIGN="LEFT">confirm</TD></TR>
-      <TR><TD PORT="priority" COLSPAN="3" ALIGN="LEFT">priority</TD></TR>
-      <TR><TD PORT="network" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">network</TD></TR>
-      <TR><TD PORT="alias" COLSPAN="3" ALIGN="LEFT">alias</TD></TR>
-      <TR><TD PORT="pubkey" COLSPAN="3" ALIGN="LEFT">pubkey</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cid</TD></TR>
-      <TR><TD PORT="fid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">fid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/ffinder.html"
-    tooltip="ffinder"
-  ];
-  "fserver" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fserver</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="server" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">server</TD></TR>
-      <TR><TD PORT="posturl" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">posturl</TD></TR>
-      <TR><TD PORT="key" COLSPAN="3" ALIGN="LEFT">key</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/fserver.html"
-    tooltip="fserver"
-  ];
-  "fsuggest" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fsuggest</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="3" ALIGN="LEFT">cid</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="request" COLSPAN="3" ALIGN="LEFT">request</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="note" COLSPAN="3" ALIGN="LEFT">note</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/fsuggest.html"
-    tooltip="fsuggest"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="gid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">gid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="visible" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">visible</TD></TR>
-      <TR><TD PORT="deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">deleted</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/groups.html"
-    tooltip="groups"
-  ];
-  "hook" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hook</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hook" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hook</TD></TR>
-      <TR><TD PORT="file" COLSPAN="3" ALIGN="LEFT">file</TD></TR>
-      <TR><TD PORT="function" COLSPAN="3" ALIGN="LEFT">function</TD></TR>
-      <TR><TD PORT="priority" COLSPAN="3" ALIGN="LEFT">priority</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/hook.html"
-    tooltip="hook"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD></TR>
-      <TR><TD PORT="thr_parent" COLSPAN="3" ALIGN="LEFT">thr_parent</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="commented" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">commented</TD></TR>
-      <TR><TD PORT="received" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">received</TD></TR>
-      <TR><TD PORT="changed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">changed</TD></TR>
-      <TR><TD PORT="comments_closed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">comments_closed</TD></TR>
-      <TR><TD PORT="owner_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">owner_xchan</TD></TR>
-      <TR><TD PORT="author_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">author_xchan</TD></TR>
-      <TR><TD PORT="source_xchan" COLSPAN="3" ALIGN="LEFT">source_xchan</TD></TR>
-      <TR><TD PORT="mimetype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mimetype</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="body" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">body</TD></TR>
-      <TR><TD PORT="html" COLSPAN="3" ALIGN="LEFT">html</TD></TR>
-      <TR><TD PORT="app" COLSPAN="3" ALIGN="LEFT">app</TD></TR>
-      <TR><TD PORT="lang" COLSPAN="3" ALIGN="LEFT">lang</TD></TR>
-      <TR><TD PORT="revision" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">revision</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="obj_type" COLSPAN="3" ALIGN="LEFT">obj_type</TD></TR>
-      <TR><TD PORT="object" COLSPAN="3" ALIGN="LEFT">object</TD></TR>
-      <TR><TD PORT="tgt_type" COLSPAN="3" ALIGN="LEFT">tgt_type</TD></TR>
-      <TR><TD PORT="target" COLSPAN="3" ALIGN="LEFT">target</TD></TR>
-      <TR><TD PORT="layout_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">layout_mid</TD></TR>
-      <TR><TD PORT="postopts" COLSPAN="3" ALIGN="LEFT">postopts</TD></TR>
-      <TR><TD PORT="route" COLSPAN="3" ALIGN="LEFT">route</TD></TR>
-      <TR><TD PORT="llink" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">llink</TD></TR>
-      <TR><TD PORT="plink" COLSPAN="3" ALIGN="LEFT">plink</TD></TR>
-      <TR><TD PORT="resource_id" COLSPAN="3" ALIGN="LEFT">resource_id</TD></TR>
-      <TR><TD PORT="resource_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_type</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="3" ALIGN="LEFT">attach</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="3" ALIGN="LEFT">sig</TD></TR>
-      <TR><TD PORT="diaspora_meta" COLSPAN="3" ALIGN="LEFT">diaspora_meta</TD></TR>
-      <TR><TD PORT="location" COLSPAN="3" ALIGN="LEFT">location</TD></TR>
-      <TR><TD PORT="coord" COLSPAN="3" ALIGN="LEFT">coord</TD></TR>
-      <TR><TD PORT="public_policy" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">public_policy</TD></TR>
-      <TR><TD PORT="comment_policy" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">comment_policy</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD PORT="item_restrict" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_restrict</TD></TR>
-      <TR><TD PORT="item_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_flags</TD></TR>
-      <TR><TD PORT="item_private" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_private</TD></TR>
-      <TR><TD PORT="item_origin" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_origin</TD></TR>
-      <TR><TD PORT="item_unseen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_unseen</TD></TR>
-      <TR><TD PORT="item_starred" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_starred</TD></TR>
-      <TR><TD PORT="item_uplink" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_uplink</TD></TR>
-      <TR><TD PORT="item_consensus" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_consensus</TD></TR>
-      <TR><TD PORT="item_wall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_wall</TD></TR>
-      <TR><TD PORT="item_thread_top" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_thread_top</TD></TR>
-      <TR><TD PORT="item_notshown" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_notshown</TD></TR>
-      <TR><TD PORT="item_nsfw" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_nsfw</TD></TR>
-      <TR><TD PORT="item_relay" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_relay</TD></TR>
-      <TR><TD PORT="item_mentionsme" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_mentionsme</TD></TR>
-      <TR><TD PORT="item_nocomment" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_nocomment</TD></TR>
-      <TR><TD PORT="item_obscured" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_obscured</TD></TR>
-      <TR><TD PORT="item_verified" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_verified</TD></TR>
-      <TR><TD PORT="item_retained" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_retained</TD></TR>
-      <TR><TD PORT="item_rss" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_rss</TD></TR>
-      <TR><TD PORT="item_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_deleted</TD></TR>
-      <TR><TD PORT="item_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_type</TD></TR>
-      <TR><TD PORT="item_hidden" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_hidden</TD></TR>
-      <TR><TD PORT="item_unpublished" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_unpublished</TD></TR>
-      <TR><TD PORT="item_delayed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_delayed</TD></TR>
-      <TR><TD PORT="item_pending_remove" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_pending_remove</TD></TR>
-      <TR><TD PORT="item_blocked" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_blocked</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="sid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sid</TD></TR>
-      <TR><TD PORT="service" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">service</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="liker" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">liker</TD></TR>
-      <TR><TD PORT="likee" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">likee</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="target_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">target_type</TD></TR>
-      <TR><TD PORT="target_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">target_id</TD></TR>
-      <TR><TD PORT="target" COLSPAN="3" ALIGN="LEFT">target</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="convid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">convid</TD></TR>
-      <TR><TD PORT="mail_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_flags</TD></TR>
-      <TR><TD PORT="from_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">from_xchan</TD></TR>
-      <TR><TD PORT="to_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">to_xchan</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="body" COLSPAN="3" ALIGN="LEFT">body</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="3" ALIGN="LEFT">sig</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="3" ALIGN="LEFT">attach</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD></TR>
-      <TR><TD PORT="mail_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_deleted</TD></TR>
-      <TR><TD PORT="mail_replied" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_replied</TD></TR>
-      <TR><TD PORT="mail_isreply" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_isreply</TD></TR>
-      <TR><TD PORT="mail_seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_seen</TD></TR>
-      <TR><TD PORT="mail_recalled" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_recalled</TD></TR>
-      <TR><TD PORT="mail_obscured" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_obscured</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/mail.html"
-    tooltip="mail"
-  ];
-  "manage" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">manage</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/manage.html"
-    tooltip="manage"
-  ];
-  "notify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">notify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">date</TD></TR>
-      <TR><TD PORT="msg" COLSPAN="3" ALIGN="LEFT">msg</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">link</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">seen</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">59 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/notify.html"
-    tooltip="notify"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/pconfig.html"
-    tooltip="pconfig"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD PORT="resource_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_id</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT">description</TD></TR>
-      <TR><TD PORT="album" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">album</TD></TR>
-      <TR><TD PORT="filename" COLSPAN="3" ALIGN="LEFT">filename</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="height" COLSPAN="3" ALIGN="LEFT">height</TD></TR>
-      <TR><TD PORT="width" COLSPAN="3" ALIGN="LEFT">width</TD></TR>
-      <TR><TD PORT="size" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">size</TD></TR>
-      <TR><TD PORT="data" COLSPAN="3" ALIGN="LEFT">data</TD></TR>
-      <TR><TD PORT="scale" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">scale</TD></TR>
-      <TR><TD PORT="photo_usage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_usage</TD></TR>
-      <TR><TD PORT="profile" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">profile</TD></TR>
-      <TR><TD PORT="is_nsfw" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_nsfw</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD></TR>
-      <TR><TD PORT="os_path" COLSPAN="3" ALIGN="LEFT">os_path</TD></TR>
-      <TR><TD PORT="display_path" COLSPAN="3" ALIGN="LEFT">display_path</TD></TR>
-      <TR><TD PORT="photo_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_flags</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="field_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">field_name</TD></TR>
-      <TR><TD PORT="field_type" COLSPAN="3" ALIGN="LEFT">field_type</TD></TR>
-      <TR><TD PORT="field_desc" COLSPAN="3" ALIGN="LEFT">field_desc</TD></TR>
-      <TR><TD PORT="field_help" COLSPAN="3" ALIGN="LEFT">field_help</TD></TR>
-      <TR><TD PORT="field_inputs" COLSPAN="3" ALIGN="LEFT">field_inputs</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/profext.html"
-    tooltip="profext"
-  ];
-  "profile" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="profile_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">profile_guid</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="profile_name" COLSPAN="3" ALIGN="LEFT">profile_name</TD></TR>
-      <TR><TD PORT="is_default" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_default</TD></TR>
-      <TR><TD PORT="hide_friends" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hide_friends</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="pdesc" COLSPAN="3" ALIGN="LEFT">pdesc</TD></TR>
-      <TR><TD PORT="chandesc" COLSPAN="3" ALIGN="LEFT">chandesc</TD></TR>
-      <TR><TD PORT="dob" COLSPAN="3" ALIGN="LEFT">dob</TD></TR>
-      <TR><TD PORT="dob_tz" COLSPAN="3" ALIGN="LEFT">dob_tz</TD></TR>
-      <TR><TD PORT="address" COLSPAN="3" ALIGN="LEFT">address</TD></TR>
-      <TR><TD PORT="locality" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">locality</TD></TR>
-      <TR><TD PORT="region" COLSPAN="3" ALIGN="LEFT">region</TD></TR>
-      <TR><TD PORT="postal_code" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">postal_code</TD></TR>
-      <TR><TD PORT="country_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">country_name</TD></TR>
-      <TR><TD PORT="hometown" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hometown</TD></TR>
-      <TR><TD PORT="gender" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">gender</TD></TR>
-      <TR><TD PORT="marital" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">marital</TD></TR>
-      <TR><TD PORT="with" COLSPAN="3" ALIGN="LEFT">with</TD></TR>
-      <TR><TD PORT="howlong" COLSPAN="3" ALIGN="LEFT">howlong</TD></TR>
-      <TR><TD PORT="sexual" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sexual</TD></TR>
-      <TR><TD PORT="politic" COLSPAN="3" ALIGN="LEFT">politic</TD></TR>
-      <TR><TD PORT="religion" COLSPAN="3" ALIGN="LEFT">religion</TD></TR>
-      <TR><TD PORT="keywords" COLSPAN="3" ALIGN="LEFT">keywords</TD></TR>
-      <TR><TD PORT="likes" COLSPAN="3" ALIGN="LEFT">likes</TD></TR>
-      <TR><TD PORT="dislikes" COLSPAN="3" ALIGN="LEFT">dislikes</TD></TR>
-      <TR><TD PORT="about" COLSPAN="3" ALIGN="LEFT">about</TD></TR>
-      <TR><TD PORT="summary" COLSPAN="3" ALIGN="LEFT">summary</TD></TR>
-      <TR><TD PORT="music" COLSPAN="3" ALIGN="LEFT">music</TD></TR>
-      <TR><TD PORT="book" COLSPAN="3" ALIGN="LEFT">book</TD></TR>
-      <TR><TD PORT="tv" COLSPAN="3" ALIGN="LEFT">tv</TD></TR>
-      <TR><TD PORT="film" COLSPAN="3" ALIGN="LEFT">film</TD></TR>
-      <TR><TD PORT="interest" COLSPAN="3" ALIGN="LEFT">interest</TD></TR>
-      <TR><TD PORT="romance" COLSPAN="3" ALIGN="LEFT">romance</TD></TR>
-      <TR><TD PORT="work" COLSPAN="3" ALIGN="LEFT">work</TD></TR>
-      <TR><TD PORT="education" COLSPAN="3" ALIGN="LEFT">education</TD></TR>
-      <TR><TD PORT="contact" COLSPAN="3" ALIGN="LEFT">contact</TD></TR>
-      <TR><TD PORT="channels" COLSPAN="3" ALIGN="LEFT">channels</TD></TR>
-      <TR><TD PORT="homepage" COLSPAN="3" ALIGN="LEFT">homepage</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="thumb" COLSPAN="3" ALIGN="LEFT">thumb</TD></TR>
-      <TR><TD PORT="publish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">publish</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/profile.html"
-    tooltip="profile"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cid</TD></TR>
-      <TR><TD PORT="dfrn_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">dfrn_id</TD></TR>
-      <TR><TD PORT="sec" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sec</TD></TR>
-      <TR><TD PORT="expire" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expire</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="password" COLSPAN="3" ALIGN="LEFT">password</TD></TR>
-      <TR><TD PORT="language" COLSPAN="3" ALIGN="LEFT">language</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="retract_iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">retract_iid</TD></TR>
-      <TR><TD PORT="signed_text" COLSPAN="3" ALIGN="LEFT">signed_text</TD></TR>
-      <TR><TD PORT="signature" COLSPAN="3" ALIGN="LEFT">signature</TD></TR>
-      <TR><TD PORT="signer" COLSPAN="3" ALIGN="LEFT">signer</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/sign.html"
-    tooltip="sign"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="spam" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">spam</TD></TR>
-      <TR><TD PORT="ham" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ham</TD></TR>
-      <TR><TD PORT="term" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">term</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" ALIGN="LEFT">date</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/spam.html"
-    tooltip="spam"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD PORT="public_perm" COLSPAN="3" ALIGN="LEFT">public_perm</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "tokens" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">tokens</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="secret" COLSPAN="3" ALIGN="LEFT">secret</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="scope" COLSPAN="3" ALIGN="LEFT">scope</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/tokens.html"
-    tooltip="tokens"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/xign.html"
-    tooltip="xign"
-  ];
-  "addon":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "app":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "auth_codes":"client_id":w -> "clients":"client_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "auth_codes":"id":w -> "tokens":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "conv":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "event":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fserver":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fsuggest":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "hook":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"channel_id":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "likes":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"account_id":w -> "account":"account_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"channel_id":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "manage":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "photo":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"channel_id":w -> "channel":"channel_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profext":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profile":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "spam":"id":w -> "notify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "tokens":"client_id":w -> "clients":"client_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xconfig":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xign":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-}
diff --git a/hubzilla_er/diagrams/summary/relationships.implied.large.png b/hubzilla_er/diagrams/summary/relationships.implied.large.png
deleted file mode 100644
index cfe93b293..000000000
--- a/hubzilla_er/diagrams/summary/relationships.implied.large.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/relationships.real.compact.dot b/hubzilla_er/diagrams/summary/relationships.real.compact.dot
deleted file mode 100644
index d04941e90..000000000
--- a/hubzilla_er/diagrams/summary/relationships.real.compact.dot
+++ /dev/null
@@ -1,22 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "compactRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/session.1degree.dot b/hubzilla_er/diagrams/summary/session.1degree.dot
deleted file mode 100644
index 9d4db1b13..000000000
--- a/hubzilla_er/diagrams/summary/session.1degree.dot
+++ /dev/null
@@ -1,33 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "session" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "session" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">session</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="sid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sid</TD></TR>
-      <TR><TD PORT="data" COLSPAN="3" ALIGN="LEFT">data</TD></TR>
-      <TR><TD PORT="expire" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expire</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">23 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/session.html"
-    tooltip="session"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/session.1degree.png b/hubzilla_er/diagrams/summary/session.1degree.png
deleted file mode 100644
index cdb8b2c6b..000000000
--- a/hubzilla_er/diagrams/summary/session.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/shares.1degree.dot b/hubzilla_er/diagrams/summary/shares.1degree.dot
deleted file mode 100644
index 903d6bf1c..000000000
--- a/hubzilla_er/diagrams/summary/shares.1degree.dot
+++ /dev/null
@@ -1,33 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "shares" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "shares" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">shares</TD></TR>
-      <TR><TD PORT="share_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">share_id</TD></TR>
-      <TR><TD PORT="share_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">share_type</TD></TR>
-      <TR><TD PORT="share_target" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">share_target</TD></TR>
-      <TR><TD PORT="share_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">share_xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/shares.html"
-    tooltip="shares"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/shares.1degree.png b/hubzilla_er/diagrams/summary/shares.1degree.png
deleted file mode 100644
index b74cbe601..000000000
--- a/hubzilla_er/diagrams/summary/shares.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/sign.1degree.dot b/hubzilla_er/diagrams/summary/sign.1degree.dot
deleted file mode 100644
index f3eac7028..000000000
--- a/hubzilla_er/diagrams/summary/sign.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "sign" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="retract_iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">retract_iid</TD></TR>
-      <TR><TD PORT="signed_text" COLSPAN="3" ALIGN="LEFT">signed_text</TD></TR>
-      <TR><TD PORT="signature" COLSPAN="3" ALIGN="LEFT">signature</TD></TR>
-      <TR><TD PORT="signer" COLSPAN="3" ALIGN="LEFT">signer</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/sign.html"
-    tooltip="sign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/sign.1degree.png b/hubzilla_er/diagrams/summary/sign.1degree.png
deleted file mode 100644
index 5b23d795c..000000000
--- a/hubzilla_er/diagrams/summary/sign.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/site.1degree.dot b/hubzilla_er/diagrams/summary/site.1degree.dot
deleted file mode 100644
index 0720837c7..000000000
--- a/hubzilla_er/diagrams/summary/site.1degree.dot
+++ /dev/null
@@ -1,42 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "site" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "site" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">site</TD></TR>
-      <TR><TD PORT="site_url" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">site_url</TD></TR>
-      <TR><TD PORT="site_access" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">site_access</TD></TR>
-      <TR><TD PORT="site_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">site_flags</TD></TR>
-      <TR><TD PORT="site_update" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">site_update</TD></TR>
-      <TR><TD PORT="site_pull" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">site_pull</TD></TR>
-      <TR><TD PORT="site_sync" COLSPAN="3" ALIGN="LEFT">site_sync</TD></TR>
-      <TR><TD PORT="site_directory" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">site_directory</TD></TR>
-      <TR><TD PORT="site_register" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">site_register</TD></TR>
-      <TR><TD PORT="site_sellpage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">site_sellpage</TD></TR>
-      <TR><TD PORT="site_location" COLSPAN="3" ALIGN="LEFT">site_location</TD></TR>
-      <TR><TD PORT="site_realm" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">site_realm</TD></TR>
-      <TR><TD PORT="site_valid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">site_valid</TD></TR>
-      <TR><TD PORT="site_dead" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">site_dead</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">117 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/site.html"
-    tooltip="site"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/site.1degree.png b/hubzilla_er/diagrams/summary/site.1degree.png
deleted file mode 100644
index ce32c84b9..000000000
--- a/hubzilla_er/diagrams/summary/site.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/source.1degree.dot b/hubzilla_er/diagrams/summary/source.1degree.dot
deleted file mode 100644
index fa656d7df..000000000
--- a/hubzilla_er/diagrams/summary/source.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "source" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "source" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">source</TD></TR>
-      <TR><TD PORT="src_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">src_id</TD></TR>
-      <TR><TD PORT="src_channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">src_channel_id</TD></TR>
-      <TR><TD PORT="src_channel_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">src_channel_xchan</TD></TR>
-      <TR><TD PORT="src_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">src_xchan</TD></TR>
-      <TR><TD PORT="src_patt" COLSPAN="3" ALIGN="LEFT">src_patt</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/source.html"
-    tooltip="source"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/source.1degree.png b/hubzilla_er/diagrams/summary/source.1degree.png
deleted file mode 100644
index fda7de5b6..000000000
--- a/hubzilla_er/diagrams/summary/source.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/spam.1degree.dot b/hubzilla_er/diagrams/summary/spam.1degree.dot
deleted file mode 100644
index d8a7e8b67..000000000
--- a/hubzilla_er/diagrams/summary/spam.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "spam" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "spam" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">spam</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="spam" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">spam</TD></TR>
-      <TR><TD PORT="ham" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ham</TD></TR>
-      <TR><TD PORT="term" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">term</TD></TR>
-      <TR><TD PORT="date" COLSPAN="3" ALIGN="LEFT">date</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/spam.html"
-    tooltip="spam"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/spam.1degree.png b/hubzilla_er/diagrams/summary/spam.1degree.png
deleted file mode 100644
index 705472eea..000000000
--- a/hubzilla_er/diagrams/summary/spam.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/sys_perms.1degree.dot b/hubzilla_er/diagrams/summary/sys_perms.1degree.dot
deleted file mode 100644
index caea5abe8..000000000
--- a/hubzilla_er/diagrams/summary/sys_perms.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "sys_perms" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD PORT="public_perm" COLSPAN="3" ALIGN="LEFT">public_perm</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/sys_perms.html"
-    tooltip="sys_perms"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/sys_perms.1degree.png b/hubzilla_er/diagrams/summary/sys_perms.1degree.png
deleted file mode 100644
index c3c9fd415..000000000
--- a/hubzilla_er/diagrams/summary/sys_perms.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/term.1degree.dot b/hubzilla_er/diagrams/summary/term.1degree.dot
deleted file mode 100644
index 99f75cb2e..000000000
--- a/hubzilla_er/diagrams/summary/term.1degree.dot
+++ /dev/null
@@ -1,40 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "term" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "term" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">term</TD></TR>
-      <TR><TD PORT="tid" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">tid</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="oid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">oid</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="term" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">term</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="imgurl" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">imgurl</TD></TR>
-      <TR><TD PORT="term_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">term_hash</TD></TR>
-      <TR><TD PORT="parent_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_hash</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 585 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/term.html"
-    tooltip="term"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/term.1degree.png b/hubzilla_er/diagrams/summary/term.1degree.png
deleted file mode 100644
index 1ed65fee6..000000000
--- a/hubzilla_er/diagrams/summary/term.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/tokens.1degree.dot b/hubzilla_er/diagrams/summary/tokens.1degree.dot
deleted file mode 100644
index 5efc34ca1..000000000
--- a/hubzilla_er/diagrams/summary/tokens.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "tokens" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "tokens" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">tokens</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="secret" COLSPAN="3" ALIGN="LEFT">secret</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="scope" COLSPAN="3" ALIGN="LEFT">scope</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/tokens.html"
-    tooltip="tokens"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/tokens.1degree.png b/hubzilla_er/diagrams/summary/tokens.1degree.png
deleted file mode 100644
index c2bd336dc..000000000
--- a/hubzilla_er/diagrams/summary/tokens.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/updates.1degree.dot b/hubzilla_er/diagrams/summary/updates.1degree.dot
deleted file mode 100644
index e779f8247..000000000
--- a/hubzilla_er/diagrams/summary/updates.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "updates" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "updates" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">updates</TD></TR>
-      <TR><TD PORT="ud_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">ud_id</TD></TR>
-      <TR><TD PORT="ud_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ud_hash</TD></TR>
-      <TR><TD PORT="ud_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ud_guid</TD></TR>
-      <TR><TD PORT="ud_date" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ud_date</TD></TR>
-      <TR><TD PORT="ud_last" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ud_last</TD></TR>
-      <TR><TD PORT="ud_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ud_flags</TD></TR>
-      <TR><TD PORT="ud_addr" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">ud_addr</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/updates.html"
-    tooltip="updates"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/updates.1degree.png b/hubzilla_er/diagrams/summary/updates.1degree.png
deleted file mode 100644
index 7d5990ca1..000000000
--- a/hubzilla_er/diagrams/summary/updates.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/verify.1degree.dot b/hubzilla_er/diagrams/summary/verify.1degree.dot
deleted file mode 100644
index f991cf6c5..000000000
--- a/hubzilla_er/diagrams/summary/verify.1degree.dot
+++ /dev/null
@@ -1,35 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "verify" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/verify.html"
-    tooltip="verify"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/verify.1degree.png b/hubzilla_er/diagrams/summary/verify.1degree.png
deleted file mode 100644
index 9813ddaaf..000000000
--- a/hubzilla_er/diagrams/summary/verify.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/vote.1degree.dot b/hubzilla_er/diagrams/summary/vote.1degree.dot
deleted file mode 100644
index b0a0a3aac..000000000
--- a/hubzilla_er/diagrams/summary/vote.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "vote" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "vote" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">vote</TD></TR>
-      <TR><TD PORT="vote_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">vote_id</TD></TR>
-      <TR><TD PORT="vote_poll" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">vote_poll</TD></TR>
-      <TR><TD PORT="vote_element" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">vote_element</TD></TR>
-      <TR><TD PORT="vote_result" COLSPAN="3" ALIGN="LEFT">vote_result</TD></TR>
-      <TR><TD PORT="vote_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">vote_xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/vote.html"
-    tooltip="vote"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/vote.1degree.png b/hubzilla_er/diagrams/summary/vote.1degree.png
deleted file mode 100644
index ae4a552bc..000000000
--- a/hubzilla_er/diagrams/summary/vote.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/xchan.1degree.dot b/hubzilla_er/diagrams/summary/xchan.1degree.dot
deleted file mode 100644
index 6fcaf34fa..000000000
--- a/hubzilla_er/diagrams/summary/xchan.1degree.dot
+++ /dev/null
@@ -1,55 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "xchan" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "xchan" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xchan</TD></TR>
-      <TR><TD PORT="xchan_hash" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">xchan_hash</TD></TR>
-      <TR><TD PORT="xchan_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_guid</TD></TR>
-      <TR><TD PORT="xchan_guid_sig" COLSPAN="3" ALIGN="LEFT">xchan_guid_sig</TD></TR>
-      <TR><TD PORT="xchan_pubkey" COLSPAN="3" ALIGN="LEFT">xchan_pubkey</TD></TR>
-      <TR><TD PORT="xchan_photo_mimetype" COLSPAN="3" ALIGN="LEFT">xchan_photo_mimetype</TD></TR>
-      <TR><TD PORT="xchan_photo_l" COLSPAN="3" ALIGN="LEFT">xchan_photo_l</TD></TR>
-      <TR><TD PORT="xchan_photo_m" COLSPAN="3" ALIGN="LEFT">xchan_photo_m</TD></TR>
-      <TR><TD PORT="xchan_photo_s" COLSPAN="3" ALIGN="LEFT">xchan_photo_s</TD></TR>
-      <TR><TD PORT="xchan_addr" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_addr</TD></TR>
-      <TR><TD PORT="xchan_url" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_url</TD></TR>
-      <TR><TD PORT="xchan_connurl" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_connurl</TD></TR>
-      <TR><TD PORT="xchan_follow" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_follow</TD></TR>
-      <TR><TD PORT="xchan_connpage" COLSPAN="3" ALIGN="LEFT">xchan_connpage</TD></TR>
-      <TR><TD PORT="xchan_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_name</TD></TR>
-      <TR><TD PORT="xchan_network" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_network</TD></TR>
-      <TR><TD PORT="xchan_instance_url" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_instance_url</TD></TR>
-      <TR><TD PORT="xchan_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_flags</TD></TR>
-      <TR><TD PORT="xchan_photo_date" COLSPAN="3" ALIGN="LEFT">xchan_photo_date</TD></TR>
-      <TR><TD PORT="xchan_name_date" COLSPAN="3" ALIGN="LEFT">xchan_name_date</TD></TR>
-      <TR><TD PORT="xchan_hidden" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_hidden</TD></TR>
-      <TR><TD PORT="xchan_orphan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_orphan</TD></TR>
-      <TR><TD PORT="xchan_censored" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_censored</TD></TR>
-      <TR><TD PORT="xchan_selfcensored" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_selfcensored</TD></TR>
-      <TR><TD PORT="xchan_system" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_system</TD></TR>
-      <TR><TD PORT="xchan_pubforum" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_pubforum</TD></TR>
-      <TR><TD PORT="xchan_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_deleted</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 168 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/xchan.html"
-    tooltip="xchan"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/xchan.1degree.png b/hubzilla_er/diagrams/summary/xchan.1degree.png
deleted file mode 100644
index 1fa074f88..000000000
--- a/hubzilla_er/diagrams/summary/xchan.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/xchat.1degree.dot b/hubzilla_er/diagrams/summary/xchat.1degree.dot
deleted file mode 100644
index 515ac658d..000000000
--- a/hubzilla_er/diagrams/summary/xchat.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "xchat" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "xchat" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xchat</TD></TR>
-      <TR><TD PORT="xchat_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">xchat_id</TD></TR>
-      <TR><TD PORT="xchat_url" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchat_url</TD></TR>
-      <TR><TD PORT="xchat_desc" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchat_desc</TD></TR>
-      <TR><TD PORT="xchat_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchat_xchan</TD></TR>
-      <TR><TD PORT="xchat_edited" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchat_edited</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/xchat.html"
-    tooltip="xchat"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/xchat.1degree.png b/hubzilla_er/diagrams/summary/xchat.1degree.png
deleted file mode 100644
index 0de11e872..000000000
--- a/hubzilla_er/diagrams/summary/xchat.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/xconfig.1degree.dot b/hubzilla_er/diagrams/summary/xconfig.1degree.dot
deleted file mode 100644
index 2c9ce236e..000000000
--- a/hubzilla_er/diagrams/summary/xconfig.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "xconfig" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/xconfig.html"
-    tooltip="xconfig"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/xconfig.1degree.png b/hubzilla_er/diagrams/summary/xconfig.1degree.png
deleted file mode 100644
index 0233ce01e..000000000
--- a/hubzilla_er/diagrams/summary/xconfig.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/xign.1degree.dot b/hubzilla_er/diagrams/summary/xign.1degree.dot
deleted file mode 100644
index 2642999ab..000000000
--- a/hubzilla_er/diagrams/summary/xign.1degree.dot
+++ /dev/null
@@ -1,32 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "xign" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/xign.1degree.png b/hubzilla_er/diagrams/summary/xign.1degree.png
deleted file mode 100644
index a0990cb2e..000000000
--- a/hubzilla_er/diagrams/summary/xign.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/xlink.1degree.dot b/hubzilla_er/diagrams/summary/xlink.1degree.dot
deleted file mode 100644
index de98407c2..000000000
--- a/hubzilla_er/diagrams/summary/xlink.1degree.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "xlink" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "xlink" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xlink</TD></TR>
-      <TR><TD PORT="xlink_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">xlink_id</TD></TR>
-      <TR><TD PORT="xlink_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xlink_xchan</TD></TR>
-      <TR><TD PORT="xlink_link" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xlink_link</TD></TR>
-      <TR><TD PORT="xlink_rating" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xlink_rating</TD></TR>
-      <TR><TD PORT="xlink_rating_text" COLSPAN="3" ALIGN="LEFT">xlink_rating_text</TD></TR>
-      <TR><TD PORT="xlink_updated" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xlink_updated</TD></TR>
-      <TR><TD PORT="xlink_static" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xlink_static</TD></TR>
-      <TR><TD PORT="xlink_sig" COLSPAN="3" ALIGN="LEFT">xlink_sig</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">244 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/xlink.html"
-    tooltip="xlink"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/xlink.1degree.png b/hubzilla_er/diagrams/summary/xlink.1degree.png
deleted file mode 100644
index 81eb1b6ce..000000000
--- a/hubzilla_er/diagrams/summary/xlink.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/xperm.1degree.dot b/hubzilla_er/diagrams/summary/xperm.1degree.dot
deleted file mode 100644
index bc73e1def..000000000
--- a/hubzilla_er/diagrams/summary/xperm.1degree.dot
+++ /dev/null
@@ -1,33 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "xperm" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "xperm" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xperm</TD></TR>
-      <TR><TD PORT="xp_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">xp_id</TD></TR>
-      <TR><TD PORT="xp_client" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xp_client</TD></TR>
-      <TR><TD PORT="xp_channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xp_channel</TD></TR>
-      <TR><TD PORT="xp_perm" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xp_perm</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/xperm.html"
-    tooltip="xperm"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/xperm.1degree.png b/hubzilla_er/diagrams/summary/xperm.1degree.png
deleted file mode 100644
index 43e0429c3..000000000
--- a/hubzilla_er/diagrams/summary/xperm.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/xprof.1degree.dot b/hubzilla_er/diagrams/summary/xprof.1degree.dot
deleted file mode 100644
index 21a9a95d4..000000000
--- a/hubzilla_er/diagrams/summary/xprof.1degree.dot
+++ /dev/null
@@ -1,44 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "xprof" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "xprof" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xprof</TD></TR>
-      <TR><TD PORT="xprof_hash" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">xprof_hash</TD></TR>
-      <TR><TD PORT="xprof_age" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xprof_age</TD></TR>
-      <TR><TD PORT="xprof_desc" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xprof_desc</TD></TR>
-      <TR><TD PORT="xprof_dob" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xprof_dob</TD></TR>
-      <TR><TD PORT="xprof_gender" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xprof_gender</TD></TR>
-      <TR><TD PORT="xprof_marital" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xprof_marital</TD></TR>
-      <TR><TD PORT="xprof_sexual" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xprof_sexual</TD></TR>
-      <TR><TD PORT="xprof_locale" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xprof_locale</TD></TR>
-      <TR><TD PORT="xprof_region" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xprof_region</TD></TR>
-      <TR><TD PORT="xprof_postcode" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xprof_postcode</TD></TR>
-      <TR><TD PORT="xprof_country" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xprof_country</TD></TR>
-      <TR><TD PORT="xprof_keywords" COLSPAN="3" ALIGN="LEFT">xprof_keywords</TD></TR>
-      <TR><TD PORT="xprof_about" COLSPAN="3" ALIGN="LEFT">xprof_about</TD></TR>
-      <TR><TD PORT="xprof_homepage" COLSPAN="3" ALIGN="LEFT">xprof_homepage</TD></TR>
-      <TR><TD PORT="xprof_hometown" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xprof_hometown</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/xprof.html"
-    tooltip="xprof"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/xprof.1degree.png b/hubzilla_er/diagrams/summary/xprof.1degree.png
deleted file mode 100644
index deba49a1f..000000000
--- a/hubzilla_er/diagrams/summary/xprof.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/summary/xtag.1degree.dot b/hubzilla_er/diagrams/summary/xtag.1degree.dot
deleted file mode 100644
index d258c8875..000000000
--- a/hubzilla_er/diagrams/summary/xtag.1degree.dot
+++ /dev/null
@@ -1,33 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "xtag" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "xtag" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xtag</TD></TR>
-      <TR><TD PORT="xtag_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">xtag_id</TD></TR>
-      <TR><TD PORT="xtag_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xtag_hash</TD></TR>
-      <TR><TD PORT="xtag_term" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xtag_term</TD></TR>
-      <TR><TD PORT="xtag_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xtag_flags</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="tables/xtag.html"
-    tooltip="xtag"
-  ];
-}
diff --git a/hubzilla_er/diagrams/summary/xtag.1degree.png b/hubzilla_er/diagrams/summary/xtag.1degree.png
deleted file mode 100644
index def67569d..000000000
--- a/hubzilla_er/diagrams/summary/xtag.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/sys_perms.1degree.dot b/hubzilla_er/diagrams/sys_perms.1degree.dot
deleted file mode 100644
index 5d1b68501..000000000
--- a/hubzilla_er/diagrams/sys_perms.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="2" ALIGN="LEFT">cat</TD><TD PORT="cat.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="k" COLSPAN="2" ALIGN="LEFT">k</TD><TD PORT="k.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="v" COLSPAN="2" ALIGN="LEFT">v</TD><TD PORT="v.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="public_perm" COLSPAN="2" ALIGN="LEFT">public_perm</TD><TD PORT="public_perm.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-}
diff --git a/hubzilla_er/diagrams/sys_perms.1degree.png b/hubzilla_er/diagrams/sys_perms.1degree.png
deleted file mode 100644
index 8d0d335c7..000000000
--- a/hubzilla_er/diagrams/sys_perms.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/sys_perms.implied2degrees.dot b/hubzilla_er/diagrams/sys_perms.implied2degrees.dot
deleted file mode 100644
index 7e8a6b6ad..000000000
--- a/hubzilla_er/diagrams/sys_perms.implied2degrees.dot
+++ /dev/null
@@ -1,288 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 &gt;</TD></TR>
-    </TABLE>>
-    URL="cache.html"
-    tooltip="cache"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="2" ALIGN="LEFT">cat</TD><TD PORT="cat.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="k" COLSPAN="2" ALIGN="LEFT">k</TD><TD PORT="k.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="v" COLSPAN="2" ALIGN="LEFT">v</TD><TD PORT="v.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="public_perm" COLSPAN="2" ALIGN="LEFT">public_perm</TD><TD PORT="public_perm.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/sys_perms.implied2degrees.png b/hubzilla_er/diagrams/sys_perms.implied2degrees.png
deleted file mode 100644
index e2ffc02f2..000000000
--- a/hubzilla_er/diagrams/sys_perms.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/tokens.1degree.dot b/hubzilla_er/diagrams/tokens.1degree.dot
deleted file mode 100644
index 736431cb1..000000000
--- a/hubzilla_er/diagrams/tokens.1degree.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "tokens" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">tokens</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="secret" COLSPAN="2" ALIGN="LEFT">secret</TD><TD PORT="secret.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">client_id</TD><TD PORT="client_id.type" ALIGN="LEFT">varchar[20]</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD><TD PORT="expires.type" ALIGN="LEFT">bigint unsigned[20]</TD></TR>
-      <TR><TD PORT="scope" COLSPAN="2" ALIGN="LEFT">scope</TD><TD PORT="scope.type" ALIGN="LEFT">varchar[200]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="tokens.html"
-    tooltip="tokens"
-  ];
-}
diff --git a/hubzilla_er/diagrams/tokens.1degree.png b/hubzilla_er/diagrams/tokens.1degree.png
deleted file mode 100644
index e394a4531..000000000
--- a/hubzilla_er/diagrams/tokens.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/tokens.implied2degrees.dot b/hubzilla_er/diagrams/tokens.implied2degrees.dot
deleted file mode 100644
index e5fa204dc..000000000
--- a/hubzilla_er/diagrams/tokens.implied2degrees.dot
+++ /dev/null
@@ -1,69 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "auth_codes":"client_id":w -> "clients":"client_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "auth_codes":"id":w -> "tokens":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "tokens":"client_id":w -> "clients":"client_id":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "auth_codes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">auth_codes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="redirect_uri" COLSPAN="3" ALIGN="LEFT">redirect_uri</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="scope" COLSPAN="3" ALIGN="LEFT">scope</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="auth_codes.html"
-    tooltip="auth_codes"
-  ];
-  "clients" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">clients</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">client_id</TD></TR>
-      <TR><TD PORT="pw" COLSPAN="3" ALIGN="LEFT">pw</TD></TR>
-      <TR><TD PORT="redirect_uri" COLSPAN="3" ALIGN="LEFT">redirect_uri</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="icon" COLSPAN="3" ALIGN="LEFT">icon</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="clients.html"
-    tooltip="clients"
-  ];
-  "tokens" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">tokens</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="secret" COLSPAN="2" ALIGN="LEFT">secret</TD><TD PORT="secret.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="client_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">client_id</TD><TD PORT="client_id.type" ALIGN="LEFT">varchar[20]</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD><TD PORT="expires.type" ALIGN="LEFT">bigint unsigned[20]</TD></TR>
-      <TR><TD PORT="scope" COLSPAN="2" ALIGN="LEFT">scope</TD><TD PORT="scope.type" ALIGN="LEFT">varchar[200]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tokens.html"
-    tooltip="tokens"
-  ];
-}
diff --git a/hubzilla_er/diagrams/tokens.implied2degrees.png b/hubzilla_er/diagrams/tokens.implied2degrees.png
deleted file mode 100644
index 587686310..000000000
--- a/hubzilla_er/diagrams/tokens.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/verify.1degree.dot b/hubzilla_er/diagrams/verify.1degree.dot
deleted file mode 100644
index a9e1d1415..000000000
--- a/hubzilla_er/diagrams/verify.1degree.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD><TD PORT="channel.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD><TD PORT="type.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="token" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD><TD PORT="token.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD><TD PORT="meta.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-}
diff --git a/hubzilla_er/diagrams/verify.1degree.png b/hubzilla_er/diagrams/verify.1degree.png
deleted file mode 100644
index de8104c2a..000000000
--- a/hubzilla_er/diagrams/verify.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/verify.implied2degrees.dot b/hubzilla_er/diagrams/verify.implied2degrees.dot
deleted file mode 100644
index d6af10dde..000000000
--- a/hubzilla_er/diagrams/verify.implied2degrees.dot
+++ /dev/null
@@ -1,518 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"k":w -> "cache":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "conv":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"channel_id":w -> "channel":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "likes":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"account_id":w -> "account":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"channel_id":w -> "channel":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"channel_id":w -> "channel":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profext":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"k":w -> "cache":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profile_check":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"k":w -> "cache":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xconfig":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"k":w -> "cache":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xign":"id":w -> "verify":"id.type":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "account" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">account</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="account.html"
-    tooltip="account"
-  ];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="creator" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">creator</TD></TR>
-      <TR><TD PORT="filename" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">filename</TD></TR>
-      <TR><TD PORT="filetype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">filetype</TD></TR>
-      <TR><TD PORT="filesize" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">filesize</TD></TR>
-      <TR><TD PORT="revision" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">revision</TD></TR>
-      <TR><TD PORT="folder" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">folder</TD></TR>
-      <TR><TD PORT="flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">flags</TD></TR>
-      <TR><TD PORT="is_dir" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_dir</TD></TR>
-      <TR><TD PORT="is_photo" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_photo</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD></TR>
-      <TR><TD PORT="os_path" COLSPAN="3" ALIGN="LEFT">os_path</TD></TR>
-      <TR><TD PORT="display_path" COLSPAN="3" ALIGN="LEFT">display_path</TD></TR>
-      <TR><TD PORT="data" COLSPAN="3" ALIGN="LEFT">data</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 &gt;</TD></TR>
-    </TABLE>>
-    URL="cache.html"
-    tooltip="cache"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="channel.html"
-    tooltip="channel"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="guid" COLSPAN="3" ALIGN="LEFT">guid</TD></TR>
-      <TR><TD PORT="recips" COLSPAN="3" ALIGN="LEFT">recips</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="creator" COLSPAN="3" ALIGN="LEFT">creator</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD PORT="subject" COLSPAN="3" ALIGN="LEFT">subject</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="url" COLSPAN="3" ALIGN="LEFT">url</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD PORT="photo" COLSPAN="3" ALIGN="LEFT">photo</TD></TR>
-      <TR><TD PORT="request" COLSPAN="3" ALIGN="LEFT">request</TD></TR>
-      <TR><TD PORT="nick" COLSPAN="3" ALIGN="LEFT">nick</TD></TR>
-      <TR><TD PORT="addr" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">addr</TD></TR>
-      <TR><TD PORT="batch" COLSPAN="3" ALIGN="LEFT">batch</TD></TR>
-      <TR><TD PORT="notify" COLSPAN="3" ALIGN="LEFT">notify</TD></TR>
-      <TR><TD PORT="poll" COLSPAN="3" ALIGN="LEFT">poll</TD></TR>
-      <TR><TD PORT="confirm" COLSPAN="3" ALIGN="LEFT">confirm</TD></TR>
-      <TR><TD PORT="priority" COLSPAN="3" ALIGN="LEFT">priority</TD></TR>
-      <TR><TD PORT="network" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">network</TD></TR>
-      <TR><TD PORT="alias" COLSPAN="3" ALIGN="LEFT">alias</TD></TR>
-      <TR><TD PORT="pubkey" COLSPAN="3" ALIGN="LEFT">pubkey</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cid</TD></TR>
-      <TR><TD PORT="fid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">fid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="gid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">gid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="visible" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">visible</TD></TR>
-      <TR><TD PORT="deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">deleted</TD></TR>
-      <TR><TD PORT="name" COLSPAN="3" ALIGN="LEFT">name</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="parent" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD></TR>
-      <TR><TD PORT="thr_parent" COLSPAN="3" ALIGN="LEFT">thr_parent</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD PORT="commented" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">commented</TD></TR>
-      <TR><TD PORT="received" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">received</TD></TR>
-      <TR><TD PORT="changed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">changed</TD></TR>
-      <TR><TD PORT="comments_closed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">comments_closed</TD></TR>
-      <TR><TD PORT="owner_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">owner_xchan</TD></TR>
-      <TR><TD PORT="author_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">author_xchan</TD></TR>
-      <TR><TD PORT="source_xchan" COLSPAN="3" ALIGN="LEFT">source_xchan</TD></TR>
-      <TR><TD PORT="mimetype" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mimetype</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="body" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">body</TD></TR>
-      <TR><TD PORT="html" COLSPAN="3" ALIGN="LEFT">html</TD></TR>
-      <TR><TD PORT="app" COLSPAN="3" ALIGN="LEFT">app</TD></TR>
-      <TR><TD PORT="lang" COLSPAN="3" ALIGN="LEFT">lang</TD></TR>
-      <TR><TD PORT="revision" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">revision</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="obj_type" COLSPAN="3" ALIGN="LEFT">obj_type</TD></TR>
-      <TR><TD PORT="object" COLSPAN="3" ALIGN="LEFT">object</TD></TR>
-      <TR><TD PORT="tgt_type" COLSPAN="3" ALIGN="LEFT">tgt_type</TD></TR>
-      <TR><TD PORT="target" COLSPAN="3" ALIGN="LEFT">target</TD></TR>
-      <TR><TD PORT="layout_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">layout_mid</TD></TR>
-      <TR><TD PORT="postopts" COLSPAN="3" ALIGN="LEFT">postopts</TD></TR>
-      <TR><TD PORT="route" COLSPAN="3" ALIGN="LEFT">route</TD></TR>
-      <TR><TD PORT="llink" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">llink</TD></TR>
-      <TR><TD PORT="plink" COLSPAN="3" ALIGN="LEFT">plink</TD></TR>
-      <TR><TD PORT="resource_id" COLSPAN="3" ALIGN="LEFT">resource_id</TD></TR>
-      <TR><TD PORT="resource_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_type</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="3" ALIGN="LEFT">attach</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="3" ALIGN="LEFT">sig</TD></TR>
-      <TR><TD PORT="diaspora_meta" COLSPAN="3" ALIGN="LEFT">diaspora_meta</TD></TR>
-      <TR><TD PORT="location" COLSPAN="3" ALIGN="LEFT">location</TD></TR>
-      <TR><TD PORT="coord" COLSPAN="3" ALIGN="LEFT">coord</TD></TR>
-      <TR><TD PORT="public_policy" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">public_policy</TD></TR>
-      <TR><TD PORT="comment_policy" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">comment_policy</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD PORT="item_restrict" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_restrict</TD></TR>
-      <TR><TD PORT="item_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_flags</TD></TR>
-      <TR><TD PORT="item_private" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_private</TD></TR>
-      <TR><TD PORT="item_origin" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_origin</TD></TR>
-      <TR><TD PORT="item_unseen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_unseen</TD></TR>
-      <TR><TD PORT="item_starred" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_starred</TD></TR>
-      <TR><TD PORT="item_uplink" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_uplink</TD></TR>
-      <TR><TD PORT="item_consensus" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_consensus</TD></TR>
-      <TR><TD PORT="item_wall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_wall</TD></TR>
-      <TR><TD PORT="item_thread_top" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_thread_top</TD></TR>
-      <TR><TD PORT="item_notshown" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_notshown</TD></TR>
-      <TR><TD PORT="item_nsfw" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_nsfw</TD></TR>
-      <TR><TD PORT="item_relay" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_relay</TD></TR>
-      <TR><TD PORT="item_mentionsme" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_mentionsme</TD></TR>
-      <TR><TD PORT="item_nocomment" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_nocomment</TD></TR>
-      <TR><TD PORT="item_obscured" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_obscured</TD></TR>
-      <TR><TD PORT="item_verified" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_verified</TD></TR>
-      <TR><TD PORT="item_retained" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_retained</TD></TR>
-      <TR><TD PORT="item_rss" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_rss</TD></TR>
-      <TR><TD PORT="item_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_deleted</TD></TR>
-      <TR><TD PORT="item_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_type</TD></TR>
-      <TR><TD PORT="item_hidden" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_hidden</TD></TR>
-      <TR><TD PORT="item_unpublished" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_unpublished</TD></TR>
-      <TR><TD PORT="item_delayed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_delayed</TD></TR>
-      <TR><TD PORT="item_pending_remove" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_pending_remove</TD></TR>
-      <TR><TD PORT="item_blocked" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">item_blocked</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="sid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sid</TD></TR>
-      <TR><TD PORT="service" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">service</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="liker" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">liker</TD></TR>
-      <TR><TD PORT="likee" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">likee</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="target_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">target_type</TD></TR>
-      <TR><TD PORT="target_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">target_id</TD></TR>
-      <TR><TD PORT="target" COLSPAN="3" ALIGN="LEFT">target</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="convid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">convid</TD></TR>
-      <TR><TD PORT="mail_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_flags</TD></TR>
-      <TR><TD PORT="from_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">from_xchan</TD></TR>
-      <TR><TD PORT="to_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">to_xchan</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="body" COLSPAN="3" ALIGN="LEFT">body</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="3" ALIGN="LEFT">sig</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="3" ALIGN="LEFT">attach</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD></TR>
-      <TR><TD PORT="mail_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_deleted</TD></TR>
-      <TR><TD PORT="mail_replied" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_replied</TD></TR>
-      <TR><TD PORT="mail_isreply" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_isreply</TD></TR>
-      <TR><TD PORT="mail_seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_seen</TD></TR>
-      <TR><TD PORT="mail_recalled" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_recalled</TD></TR>
-      <TR><TD PORT="mail_obscured" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_obscured</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD PORT="resource_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">resource_id</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="edited" COLSPAN="3" ALIGN="LEFT">edited</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT">description</TD></TR>
-      <TR><TD PORT="album" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">album</TD></TR>
-      <TR><TD PORT="filename" COLSPAN="3" ALIGN="LEFT">filename</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="height" COLSPAN="3" ALIGN="LEFT">height</TD></TR>
-      <TR><TD PORT="width" COLSPAN="3" ALIGN="LEFT">width</TD></TR>
-      <TR><TD PORT="size" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">size</TD></TR>
-      <TR><TD PORT="data" COLSPAN="3" ALIGN="LEFT">data</TD></TR>
-      <TR><TD PORT="scale" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">scale</TD></TR>
-      <TR><TD PORT="photo_usage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_usage</TD></TR>
-      <TR><TD PORT="profile" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">profile</TD></TR>
-      <TR><TD PORT="is_nsfw" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">is_nsfw</TD></TR>
-      <TR><TD PORT="os_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">os_storage</TD></TR>
-      <TR><TD PORT="os_path" COLSPAN="3" ALIGN="LEFT">os_path</TD></TR>
-      <TR><TD PORT="display_path" COLSPAN="3" ALIGN="LEFT">display_path</TD></TR>
-      <TR><TD PORT="photo_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">photo_flags</TD></TR>
-      <TR><TD PORT="allow_cid" COLSPAN="3" ALIGN="LEFT">allow_cid</TD></TR>
-      <TR><TD PORT="allow_gid" COLSPAN="3" ALIGN="LEFT">allow_gid</TD></TR>
-      <TR><TD PORT="deny_cid" COLSPAN="3" ALIGN="LEFT">deny_cid</TD></TR>
-      <TR><TD PORT="deny_gid" COLSPAN="3" ALIGN="LEFT">deny_gid</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="field_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">field_name</TD></TR>
-      <TR><TD PORT="field_type" COLSPAN="3" ALIGN="LEFT">field_type</TD></TR>
-      <TR><TD PORT="field_desc" COLSPAN="3" ALIGN="LEFT">field_desc</TD></TR>
-      <TR><TD PORT="field_help" COLSPAN="3" ALIGN="LEFT">field_help</TD></TR>
-      <TR><TD PORT="field_inputs" COLSPAN="3" ALIGN="LEFT">field_inputs</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="cid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cid</TD></TR>
-      <TR><TD PORT="dfrn_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">dfrn_id</TD></TR>
-      <TR><TD PORT="sec" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">sec</TD></TR>
-      <TR><TD PORT="expire" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expire</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="password" COLSPAN="3" ALIGN="LEFT">password</TD></TR>
-      <TR><TD PORT="language" COLSPAN="3" ALIGN="LEFT">language</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="retract_iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">retract_iid</TD></TR>
-      <TR><TD PORT="signed_text" COLSPAN="3" ALIGN="LEFT">signed_text</TD></TR>
-      <TR><TD PORT="signature" COLSPAN="3" ALIGN="LEFT">signature</TD></TR>
-      <TR><TD PORT="signer" COLSPAN="3" ALIGN="LEFT">signer</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD PORT="public_perm" COLSPAN="3" ALIGN="LEFT">public_perm</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD><TD PORT="channel.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD><TD PORT="type.type" ALIGN="LEFT">char[32]</TD></TR>
-      <TR><TD PORT="token" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD><TD PORT="token.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD><TD PORT="meta.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="created" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD><TD PORT="created.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/verify.implied2degrees.png b/hubzilla_er/diagrams/verify.implied2degrees.png
deleted file mode 100644
index e40a24d7a..000000000
--- a/hubzilla_er/diagrams/verify.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/xconfig.1degree.dot b/hubzilla_er/diagrams/xconfig.1degree.dot
deleted file mode 100644
index 3d09a0fda..000000000
--- a/hubzilla_er/diagrams/xconfig.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD><TD PORT="xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD><TD PORT="cat.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="k" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD><TD PORT="k.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="v" COLSPAN="2" ALIGN="LEFT">v</TD><TD PORT="v.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-}
diff --git a/hubzilla_er/diagrams/xconfig.1degree.png b/hubzilla_er/diagrams/xconfig.1degree.png
deleted file mode 100644
index 97fdf36ae..000000000
--- a/hubzilla_er/diagrams/xconfig.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/xconfig.implied2degrees.dot b/hubzilla_er/diagrams/xconfig.implied2degrees.dot
deleted file mode 100644
index e828a2ba6..000000000
--- a/hubzilla_er/diagrams/xconfig.implied2degrees.dot
+++ /dev/null
@@ -1,288 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "pconfig":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xconfig":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"k":w -> "cache":"k":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "xign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD PORT="updated" COLSPAN="3" ALIGN="LEFT">updated</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 &gt;</TD></TR>
-    </TABLE>>
-    URL="cache.html"
-    tooltip="cache"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "pconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">pconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">232 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="pconfig.html"
-    tooltip="pconfig"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD><TD PORT="xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="cat" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">cat</TD><TD PORT="cat.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="k" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD><TD PORT="k.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="v" COLSPAN="2" ALIGN="LEFT">v</TD><TD PORT="v.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/xconfig.implied2degrees.png b/hubzilla_er/diagrams/xconfig.implied2degrees.png
deleted file mode 100644
index 968e23333..000000000
--- a/hubzilla_er/diagrams/xconfig.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/xign.1degree.dot b/hubzilla_er/diagrams/xign.1degree.dot
deleted file mode 100644
index 5d290bef2..000000000
--- a/hubzilla_er/diagrams/xign.1degree.dot
+++ /dev/null
@@ -1,34 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD><TD PORT="xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/xign.1degree.png b/hubzilla_er/diagrams/xign.1degree.png
deleted file mode 100644
index ac141bfd2..000000000
--- a/hubzilla_er/diagrams/xign.1degree.png
+++ /dev/null
diff --git a/hubzilla_er/diagrams/xign.implied2degrees.dot b/hubzilla_er/diagrams/xign.implied2degrees.dot
deleted file mode 100644
index ec60f1561..000000000
--- a/hubzilla_er/diagrams/xign.implied2degrees.dot
+++ /dev/null
@@ -1,259 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "attach":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "config":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "conv":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "fcontact":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "ffinder":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "group_member":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "groups":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "item_id":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "likes":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "photo":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profdef":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profile_check":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "register":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sign":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "sys_perms":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xconfig":"elipses":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "xign":"id":w -> "verify":"id":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "attach" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">attach</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="attach.html"
-    tooltip="attach"
-  ];
-  "config" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">config</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">52 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="config.html"
-    tooltip="config"
-  ];
-  "conv" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">conv</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="conv.html"
-    tooltip="conv"
-  ];
-  "fcontact" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">fcontact</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="fcontact.html"
-    tooltip="fcontact"
-  ];
-  "ffinder" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">ffinder</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="ffinder.html"
-    tooltip="ffinder"
-  ];
-  "group_member" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">group_member</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="group_member.html"
-    tooltip="group_member"
-  ];
-  "groups" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">groups</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="groups.html"
-    tooltip="groups"
-  ];
-  "item" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">9 613 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item.html"
-    tooltip="item"
-  ];
-  "item_id" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">item_id</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="item_id.html"
-    tooltip="item_id"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "photo" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">photo</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 495 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="photo.html"
-    tooltip="photo"
-  ];
-  "profdef" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profdef</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profdef.html"
-    tooltip="profdef"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "profile_check" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profile_check</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profile_check.html"
-    tooltip="profile_check"
-  ];
-  "register" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">register</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="register.html"
-    tooltip="register"
-  ];
-  "sign" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sign</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sign.html"
-    tooltip="sign"
-  ];
-  "sys_perms" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">sys_perms</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="sys_perms.html"
-    tooltip="sys_perms"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel</TD></TR>
-      <TR><TD PORT="type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD></TR>
-      <TR><TD PORT="token" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">token</TD></TR>
-      <TR><TD PORT="meta" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">meta</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-  "xconfig" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xconfig</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">4 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="xconfig.html"
-    tooltip="xconfig"
-  ];
-  "xign" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xign</TD></TR>
-      <TR><TD PORT="id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD><TD PORT="id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="xchan" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan</TD><TD PORT="xchan.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="xign.html"
-    tooltip="xign"
-  ];
-}
diff --git a/hubzilla_er/diagrams/xign.implied2degrees.png b/hubzilla_er/diagrams/xign.implied2degrees.png
deleted file mode 100644
index ae0e0213a..000000000
--- a/hubzilla_er/diagrams/xign.implied2degrees.png
+++ /dev/null
diff --git a/hubzilla_er/images/background.gif b/hubzilla_er/images/background.gif
deleted file mode 100644
index b97924bbe..000000000
--- a/hubzilla_er/images/background.gif
+++ /dev/null
diff --git a/hubzilla_er/images/tabLeft.gif b/hubzilla_er/images/tabLeft.gif
deleted file mode 100644
index cefb54275..000000000
--- a/hubzilla_er/images/tabLeft.gif
+++ /dev/null
diff --git a/hubzilla_er/images/tabRight.gif b/hubzilla_er/images/tabRight.gif
deleted file mode 100644
index d16d1ba17..000000000
--- a/hubzilla_er/images/tabRight.gif
+++ /dev/null
diff --git a/hubzilla_er/index.html b/hubzilla_er/index.html
deleted file mode 100644
index 584638073..000000000
--- a/hubzilla_er/index.html
+++ /dev/null
@@ -1,573 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - zot</title>
-  <link rel=stylesheet href='schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    $(function(){
-      associate($('#showTables'), $('.tbl'));
-      associate($('#showViews'),  $('.view'));
-      jQuery.fn.alternateRowColors = function() {
-        $('tbody tr:visible').each(function(i) {
-          if (i % 2 == 0) {
-            $(this).removeClass('even').addClass('odd');
-          } else {
-            $(this).removeClass('odd').addClass('even');
-          }
-        });
-        return this;
-      };
-      $('#showTables, #showViews').click(function() {
-        $('table.dataTable').alternateRowColors();
-      });
-      $('table.dataTable').alternateRowColors();
-    })
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li id='current'><a href='index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>SchemaSpy Analysis of <span title='Database'>zot</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%'>
- <tr><td class='container'>
-<span class='container'>Generated by <span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span> on on aug 19 21:08 CEST 2015</span>
- </td></tr>
- <tr>
-  <td class='container'>Database Type: MySQL - 5.5.45  </td>
-  <td class='container' align='right' valign='top' rowspan='3'>
-    <a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a><br>
-    <br><div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-  </td>
- </tr>
- <tr>
-  <td class='container'><br><a href='zot.xml' title='XML Representation'>XML Representation</a><br><a href='insertionOrder.txt' title='Useful for loading data into a database'>Insertion Order</a>&nbsp;<a href='deletionOrder.txt' title='Useful for purging data from a database'>Deletion Order</a>&nbsp;(for database loading/purging scripts)</td>
- </tr>
-</table>
-<div class='indent'>
-<p><b><label for='showTables' style='display:none;'><input type='checkbox' id='showTables' checked></label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
-</b>
-<table class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th valign='bottom'>Table</th>
-  <th align='right' valign='bottom'>Children</th>
-  <th align='right' valign='bottom'>Parents</th>
-  <th align='right' valign='bottom'>Columns</th>
-  <th align='right' valign='bottom'>Rows</th>
-  <th class='comment' align='left' valign='bottom'>Comments</th>
-</tr>
-</thead>
-<tbody>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/abook.html'>abook</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>23</td>
-  <td class='detail' align='right'>12</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/account.html'>account</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>18</td>
-  <td class='detail' align='right'>1</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/addon.html'>addon</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>7</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/app.html'>app</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>14</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/attach.html'>attach</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>23</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/auth_codes.html'>auth_codes</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/cache.html'>cache</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>3</td>
-  <td class='detail' align='right'>21</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/channel.html'>channel</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>48</td>
-  <td class='detail' align='right'>5</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/chat.html'>chat</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/chatpresence.html'>chatpresence</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>6</td>
-  <td class='detail' align='right'>1</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/chatroom.html'>chatroom</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>11</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/clients.html'>clients</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>6</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/config.html'>config</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>4</td>
-  <td class='detail' align='right'>52</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/conv.html'>conv</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>8</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/event.html'>event</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>25</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/fcontact.html'>fcontact</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>16</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/ffinder.html'>ffinder</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>4</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/fserver.html'>fserver</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>4</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/fsuggest.html'>fsuggest</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>9</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/group_member.html'>group_member</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>4</td>
-  <td class='detail' align='right'>2</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/groups.html'>groups</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>6</td>
-  <td class='detail' align='right'>5</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/hook.html'>hook</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/hubloc.html'>hubloc</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>20</td>
-  <td class='detail' align='right'>1 513</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/issue.html'>issue</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>7</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/item.html'>item</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>73</td>
-  <td class='detail' align='right'>9 613</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/item_id.html'>item_id</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>1</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/likes.html'>likes</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>9</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/mail.html'>mail</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>21</td>
-  <td class='detail' align='right'>7</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/manage.html'>manage</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>3</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/menu.html'>menu</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>7</td>
-  <td class='detail' align='right'>1</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/menu_item.html'>menu_item</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>11</td>
-  <td class='detail' align='right'>1</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/notify.html'>notify</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>15</td>
-  <td class='detail' align='right'>59</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/obj.html'>obj</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>10</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/outq.html'>outq</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>12</td>
-  <td class='detail' align='right'>2</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/pconfig.html'>pconfig</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>232</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/photo.html'>photo</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>28</td>
-  <td class='detail' align='right'>3 495</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/poll.html'>poll</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/poll_elm.html'>poll_elm</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/profdef.html'>profdef</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>6</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/profext.html'>profext</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/profile.html'>profile</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>44</td>
-  <td class='detail' align='right'>4</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/profile_check.html'>profile_check</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>6</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/register.html'>register</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>6</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/session.html'>session</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>4</td>
-  <td class='detail' align='right'>23</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/shares.html'>shares</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>4</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/sign.html'>sign</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>6</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/site.html'>site</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>13</td>
-  <td class='detail' align='right'>117</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/source.html'>source</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/spam.html'>spam</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>6</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/sys_perms.html'>sys_perms</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/term.html'>term</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>11</td>
-  <td class='detail' align='right'>7 585</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/tokens.html'>tokens</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>6</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/updates.html'>updates</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>7</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/verify.html'>verify</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>6</td>
-  <td class='detail' align='right'>1</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/vote.html'>vote</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/xchan.html'>xchan</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>26</td>
-  <td class='detail' align='right'>1 168</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/xchat.html'>xchat</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/xconfig.html'>xconfig</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>5</td>
-  <td class='detail' align='right'>4</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/xign.html'>xign</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>3</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/xlink.html'>xlink</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>8</td>
-  <td class='detail' align='right'>244</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/xperm.html'>xperm</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>4</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/xprof.html'>xprof</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>15</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
- <tr class='tbl' valign='top'>  <td class='detail'><a href='tables/xtag.html'>xtag</a></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'></td>
-  <td class='detail' align='right'>4</td>
-  <td class='detail' align='right'>0</td>
-  <td class='comment detail'></td>
-  </tr>
-  <tr>
-    <td class='detail'>&nbsp;</td>
-    <td class='detail'>&nbsp;</td>
-    <td class='detail'>&nbsp;</td>
-    <td class='detail'>&nbsp;</td>
-    <td class='detail'>&nbsp;</td>
-    <td class='comment detail'>&nbsp;</td>
-  </tr>
-  <tr class='tbl'>
-    <td class='detail'><b>63 Tables</b></td>
-    <td class='detail'>&nbsp;</td>
-    <td class='detail'>&nbsp;</td>
-    <td class='detail' align='right'><b>705</b></td>
-    <td class='detail' align='right'><b>24 169</b></td>
-    <td class='comment detail'>&nbsp;</td>
-  </tr>
-  <tr class='view'>
-    <td class='detail'><b>0 Views</b></td>
-    <td class='detail'>&nbsp;</td>
-    <td class='detail'>&nbsp;</td>
-    <td class='detail' align='right'><b>0</b></td>
-    <td class='detail'>&nbsp;</td>
-    <td class='comment detail'>&nbsp;</td>
-  </tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/insertionOrder.txt b/hubzilla_er/insertionOrder.txt
deleted file mode 100644
index d9bce20fd..000000000
--- a/hubzilla_er/insertionOrder.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-verify
-notify
-cache
-channel
-clients
-account
-tokens
-addon
-app
-attach
-conv
-event
-fcontact
-ffinder
-fserver
-fsuggest
-group_member
-groups
-hook
-item
-item_id
-manage
-photo
-profdef
-profile
-profile_check
-register
-sign
-spam
-xign
-auth_codes
-config
-likes
-pconfig
-sys_perms
-xconfig
-mail
-profext
-abook
-chat
-chatpresence
-chatroom
-hubloc
-issue
-menu
-menu_item
-obj
-outq
-poll
-poll_elm
-session
-shares
-site
-source
-term
-updates
-vote
-xchan
-xchat
-xlink
-xperm
-xprof
-xtag
diff --git a/hubzilla_er/jquery.js b/hubzilla_er/jquery.js
deleted file mode 100644
index 7c2430802..000000000
--- a/hubzilla_er/jquery.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.2
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Sat Feb 13 22:33:48 2010 -0500
- */
-(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
-e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
-j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
-"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
-true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
-Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
-(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
-a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
-"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
-function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
-c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
-L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
-"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
-a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
-d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
-a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
-!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
-true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
-parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
-false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
-s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
-applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
-else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
-a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
-w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
-cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
-i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
-" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
-this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
-e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
-c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
-a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
-function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
-k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
-C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
-null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
-e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
-f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
-if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
-d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
-"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
-a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
-isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
-{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
-if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
-e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
-"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
-d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
-!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
-toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
-u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
-function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
-if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
-t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
-g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
-for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
-1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
-relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
-l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
-h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
-CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
-g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
-text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
-setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
-h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
-m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
-"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
-h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
-!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
-h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
-q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
-if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
-(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
-function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
-gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
-c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
-{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
-"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
-d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
-a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
-1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
-a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
-c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
-wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
-prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
-this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
-return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
-""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
-this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
-u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
-1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
-return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
-""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
-c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
-c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
-function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
-Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
-"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
-a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
-a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
-"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
-serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
-function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
-global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
-e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
-"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
-false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
-false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
-c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
-d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
-g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
-1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
-"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
-if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
-this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
-"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
-animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
-j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
-this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
-"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
-c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
-this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
-this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
-e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
-c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
-function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
-this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
-k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
-f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
-c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
-d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
-"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
-e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
diff --git a/hubzilla_er/relationships.html b/hubzilla_er/relationships.html
deleted file mode 100644
index 03ca899ab..000000000
--- a/hubzilla_er/relationships.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - zot - All Relationships</title>
-  <link rel=stylesheet href='schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='schemaSpy.js'></SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li id='current'><a href='relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>SchemaSpy Analysis of <span title='Database'>zot</span> - All Relationships</span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table class='container' width='100%'>
-<tr><td class='container'>
-<span class='container'>Generated by <span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span> on on aug 19 21:08 CEST 2015</span>
-</td>
-<td class='container' align='right' valign='top' rowspan='2'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr class='impliedRelationship'><td class='legendDetail'>Dashed lines show implied relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td></tr>
-<tr><td class='container' align='left' valign='top'>
-No 'real' Foreign Key relationships were detected in the schema.<br>
-Displayed relationships are implied by a column's name/type/size matching another table's primary key.<p>
-</td></tr>
-<tr><td class='container' align='left' valign='top'>
-<form name='options' action=''>
-  <span style="display:none" title="Show relationships implied by column name/type/size matching another table's primary key">
-    <label for='implied'><input type='checkbox' id='implied' checked>Implied relationships</label>
-  </span>
-  <span title="By default only columns that are primary keys, foreign keys or indexes are shown">
-    <label for='showNonKeys'><input type='checkbox' id='showNonKeys'>All columns</label>
-  </span>
-</form>
-</td></tr></table>
-<table width="100%"><tr><td class="container">
-<map id="compactImpliedRelationshipsDiagram" name="compactImpliedRelationshipsDiagram">
-<area shape="rect" id="node1" href="tables/account.html" title="account" alt="" coords="168,328,381,680">
-<area shape="rect" id="node2" href="tables/addon.html" title="addon" alt="" coords="471,5963,588,6133">
-<area shape="rect" id="node24" href="tables/notify.html" title="notify" alt="" coords="216,6903,333,7209">
-<area shape="rect" id="node3" href="tables/app.html" title="app" alt="" coords="461,6151,597,6412">
-<area shape="rect" id="node4" href="tables/attach.html" title="attach" alt="" coords="465,975,593,1417">
-<area shape="rect" id="node36" href="tables/verify.html" title="verify" alt="" coords="221,3159,328,3353">
-<area shape="rect" id="node5" href="tables/auth_codes.html" title="auth_codes" alt="" coords="464,72,595,197">
-<area shape="rect" id="node8" href="tables/clients.html" title="clients" alt="" coords="5,95,123,198">
-<area shape="rect" id="node35" href="tables/tokens.html" title="tokens" alt="" coords="216,5,333,176">
-<area shape="rect" id="node6" href="tables/cache.html" title="cache" alt="" coords="216,5467,333,5570">
-<area shape="rect" id="node7" href="tables/channel.html" title="channel" alt="" coords="180,718,369,1682">
-<area shape="rect" id="node9" href="tables/config.html" title="config" alt="" coords="471,5279,588,5427">
-<area shape="rect" id="node10" href="tables/conv.html" title="conv" alt="" coords="471,1434,588,1582">
-<area shape="rect" id="node11" href="tables/event.html" title="event" alt="" coords="453,6429,605,6803">
-<area shape="rect" id="node12" href="tables/fcontact.html" title="fcontact" alt="" coords="472,1598,587,1746">
-<area shape="rect" id="node13" href="tables/ffinder.html" title="ffinder" alt="" coords="475,1762,584,1910">
-<area shape="rect" id="node14" href="tables/fserver.html" title="fserver" alt="" coords="473,6819,585,6967">
-<area shape="rect" id="node15" href="tables/fsuggest.html" title="fsuggest" alt="" coords="471,6983,588,7086">
-<area shape="rect" id="node16" href="tables/group_member.html" title="group_member" alt="" coords="456,1926,603,2074">
-<area shape="rect" id="node17" href="tables/groups.html" title="groups" alt="" coords="473,2090,585,2283">
-<area shape="rect" id="node18" href="tables/hook.html" title="hook" alt="" coords="475,7103,584,7228">
-<area shape="rect" id="node19" href="tables/item.html" title="item" alt="" coords="428,2487,631,3814">
-<area shape="rect" id="node20" href="tables/item_id.html" title="item_id" alt="" coords="477,3831,581,4001">
-<area shape="rect" id="node21" href="tables/likes.html" title="likes" alt="" coords="464,696,595,957">
-<area shape="rect" id="node22" href="tables/mail.html" title="mail" alt="" coords="457,214,601,679">
-<area shape="rect" id="node23" href="tables/manage.html" title="manage" alt="" coords="471,7245,588,7371">
-<area shape="rect" id="node25" href="tables/pconfig.html" title="pconfig" alt="" coords="465,5775,593,5945">
-<area shape="rect" id="node26" href="tables/photo.html" title="photo" alt="" coords="448,4019,611,4416">
-<area shape="rect" id="node27" href="tables/profdef.html" title="profdef" alt="" coords="465,4433,593,4559">
-<area shape="rect" id="node28" href="tables/profext.html" title="profext" alt="" coords="465,2300,593,2471">
-<area shape="rect" id="node29" href="tables/profile.html" title="profile" alt="" coords="459,7388,600,7785">
-<area shape="rect" id="node30" href="tables/profile_check.html" title="profile_check" alt="" coords="460,4575,599,4769">
-<area shape="rect" id="node31" href="tables/register.html" title="register" alt="" coords="472,4785,587,4956">
-<area shape="rect" id="node32" href="tables/sign.html" title="sign" alt="" coords="468,4973,591,5121">
-<area shape="rect" id="node33" href="tables/spam.html" title="spam" alt="" coords="475,7802,584,7995">
-<area shape="rect" id="node34" href="tables/sys_perms.html" title="sys_perms" alt="" coords="465,5444,593,5569">
-<area shape="rect" id="node37" href="tables/xconfig.html" title="xconfig" alt="" coords="473,5587,585,5757">
-<area shape="rect" id="node38" href="tables/xign.html" title="xign" alt="" coords="475,5137,584,5263">
-</map>
-
-  <a name='diagram'><img id='impliedCompactImg' src='diagrams/summary/relationships.implied.compact.png' usemap='#compactImpliedRelationshipsDiagram' class='diagram' border='0' alt=''></a>
-<map id="largeImpliedRelationshipsDiagram" name="largeImpliedRelationshipsDiagram">
-<area shape="rect" id="node1" href="tables/account.html" title="account" alt="" coords="181,373,395,838">
-<area shape="rect" id="node2" href="tables/addon.html" title="addon" alt="" coords="473,7445,612,7661">
-<area shape="rect" id="node24" href="tables/notify.html" title="notify" alt="" coords="229,8793,347,9191">
-<area shape="rect" id="node3" href="tables/app.html" title="app" alt="" coords="473,7678,612,8053">
-<area shape="rect" id="node4" href="tables/attach.html" title="attach" alt="" coords="475,1100,611,1679">
-<area shape="rect" id="node36" href="tables/verify.html" title="verify" alt="" coords="235,3977,341,4170">
-<area shape="rect" id="node5" href="tables/auth_codes.html" title="auth_codes" alt="" coords="477,83,608,253">
-<area shape="rect" id="node8" href="tables/clients.html" title="clients" alt="" coords="5,117,136,310">
-<area shape="rect" id="node35" href="tables/tokens.html" title="tokens" alt="" coords="229,5,347,198">
-<area shape="rect" id="node6" href="tables/cache.html" title="cache" alt="" coords="225,6928,351,7053">
-<area shape="rect" id="node7" href="tables/channel.html" title="channel" alt="" coords="193,854,383,1999">
-<area shape="rect" id="node9" href="tables/config.html" title="config" alt="" coords="484,6717,601,6865">
-<area shape="rect" id="node10" href="tables/conv.html" title="conv" alt="" coords="484,1695,601,1934">
-<area shape="rect" id="node11" href="tables/event.html" title="event" alt="" coords="463,8069,623,8693">
-<area shape="rect" id="node12" href="tables/fcontact.html" title="fcontact" alt="" coords="484,1950,601,2370">
-<area shape="rect" id="node13" href="tables/ffinder.html" title="ffinder" alt="" coords="488,2386,597,2534">
-<area shape="rect" id="node14" href="tables/fserver.html" title="fserver" alt="" coords="487,8710,599,8858">
-<area shape="rect" id="node15" href="tables/fsuggest.html" title="fsuggest" alt="" coords="484,8875,601,9136">
-<area shape="rect" id="node16" href="tables/group_member.html" title="group_member" alt="" coords="469,2550,616,2698">
-<area shape="rect" id="node17" href="tables/groups.html" title="groups" alt="" coords="487,2714,599,2907">
-<area shape="rect" id="node18" href="tables/hook.html" title="hook" alt="" coords="485,9153,600,9324">
-<area shape="rect" id="node19" href="tables/item.html" title="item" alt="" coords="441,3112,644,4824">
-<area shape="rect" id="node20" href="tables/item_id.html" title="item_id" alt="" coords="491,4841,595,5012">
-<area shape="rect" id="node21" href="tables/likes.html" title="likes" alt="" coords="477,821,608,1083">
-<area shape="rect" id="node22" href="tables/mail.html" title="mail" alt="" coords="471,271,615,804">
-<area shape="rect" id="node23" href="tables/manage.html" title="manage" alt="" coords="484,9341,601,9467">
-<area shape="rect" id="node25" href="tables/pconfig.html" title="pconfig" alt="" coords="479,7257,607,7428">
-<area shape="rect" id="node26" href="tables/photo.html" title="photo" alt="" coords="461,5029,624,5721">
-<area shape="rect" id="node27" href="tables/profdef.html" title="profdef" alt="" coords="477,5737,608,5930">
-<area shape="rect" id="node28" href="tables/profext.html" title="profext" alt="" coords="479,2924,607,3095">
-<area shape="rect" id="node29" href="tables/profile.html" title="profile" alt="" coords="472,9483,613,10538">
-<area shape="rect" id="node30" href="tables/profile_check.html" title="profile_check" alt="" coords="473,5946,612,6139">
-<area shape="rect" id="node31" href="tables/register.html" title="register" alt="" coords="481,6155,604,6349">
-<area shape="rect" id="node32" href="tables/sign.html" title="sign" alt="" coords="477,6365,608,6558">
-<area shape="rect" id="node33" href="tables/spam.html" title="spam" alt="" coords="488,10554,597,10747">
-<area shape="rect" id="node34" href="tables/sys_perms.html" title="sys_perms" alt="" coords="476,6881,609,7052">
-<area shape="rect" id="node37" href="tables/xconfig.html" title="xconfig" alt="" coords="487,7069,599,7240">
-<area shape="rect" id="node38" href="tables/xign.html" title="xign" alt="" coords="488,6575,597,6700">
-</map>
-
-  <a name='diagram'><img id='impliedLargeImg' src='diagrams/summary/relationships.implied.large.png' usemap='#largeImpliedRelationshipsDiagram' class='diagram' border='0' alt=''></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/schemaSpy.css b/hubzilla_er/schemaSpy.css
deleted file mode 100644
index dfb39a713..000000000
--- a/hubzilla_er/schemaSpy.css
+++ /dev/null
@@ -1,277 +0,0 @@
-/* required colors MUST be specified in RGB hex notation or the diagrams won't have correct colors */
-
-body  {
-  color: #000;
-  background-color: #F7F7F7;
-  font-family: arial, geneva, helvetica, lucida, sans-serif;
-  margin: 0 0 0 0;
-  padding: 0px;
-}
-
-/* background must be specified for it to propagate into diagrams */
-.content {
-  margin: 0px;
-  background: #F7F7F7;
-  border: 0 0;
-  padding:.4em;
-}
-
-/* background-color must be specified for th to propagate into diagrams */
-th {
-  background-color: #9BAB96;
-  text-align: left;
-  padding: 0px 4px;
-}
-
-/* background-color must be specified for td to propagate into diagrams */
-td {
-  background-color: #ffffff;
-}
-
-tr.even td.detail {
-}
-
-tr.odd td.detail {
-  background-color: #F7F7F7;
-}
-
-h1 {
-  font-size: 125%;
-}
-
-/* background must be specified for .primaryKey to propagate into diagrams */
-.primaryKey {
-  background: #BED1B8;
-  padding: 0px 4px;
-}
-
-/* background must be specified for .indexedColumn to propagate into diagrams */
-.indexedColumn {
-  background: #F4F7DA;
-  padding: 0px 4px;
-}
-
-/* background must be specified for .excludedColumn to propagate into diagrams */
-.excludedColumn {
-  background: #C0C0C0;
-  padding: 0px 4px;
-}
-
-/* background must be specified for .selectedTable to propagate into diagrams */
-.selectedTable {
-  background: #A9AB96;
-}
-
-.detail {
-  padding: 0px 4px;
-}
-
-table {
-  border-style: none;
-  margin: 0;
-}
-
-.impliedRelationship {
-  display: none;
-  font-style: italic;
-  color: #183118
-}
-
-.dataTable {
-  font-size: 85%;
-  background-color: #F7F7F7;
-}
-
-.heading {
-  background: transparent;
-  padding: 8px 0px;
-}
-
-.header {
-  color: #000000;
-  background: transparent;
-  font-weight: bold;
-  font-size: 130%;
-  text-align: left;
-}
-
-.description {
-  display: block;
-  padding: 8px 0px;
-}
-
-.signature {
-  font-size: 105%;
-  font-weight: bold;
-  font-style: italic;
-}
-
-.container {
-  background-color: #F7F7F7;
-  padding: 0px 0px;
-}
-
-.legend {
-  display: none;
-  text-align: left;
-}
-
-.legendDetail {
-  background-color: #F7F7F7;
-  padding: 0px 4px;
-
-  font-style: normal;
-  color: #000000
-}
-
-.relatedTable {
-  padding: 0px 4px;
-}
-
-.relatedKey {
-  display: none;
-  padding: 0px -4px 0px 4px;
-}
-
-.constraint {
-  display: none;
-  text-align: right;
-  padding: 0px 4px;
-}
-
-.comment {
-  display: none;
-  text-align: left;
-  padding: 0px 4px;
-}
-
-.impliedNotOrphan {
-}
-
-.excludedRelationship {
-  font-size: 85%;
-}
-
-.degrees {
-}
-
-/* don't display the diagrams until we know what to display */
-.diagram {
-  display: none;
-}
-
-.indent {
-  padding: 2px;
-}
-
-a:link {
-  color: #489148;
-}
-
-a:visited {
-  color: #183118;
-}
-
-.sortedByColumn {
-  background-color: #6C7769;
-}
-
-.notSortedByColumn {
-  color: #000000;
-}
-
-.viewDefinition {
-  font-size: 90%;
-  background-color: #ffffff;
-  border-style: solid;
-  border-width: 1px;
-  float: left;
-  padding: 4px;
-  font-family: "Courier New", Courier, monospace
-}
-
-.viewReferences {
-  font-size: 90%;
-  padding: 4px;
-}
-
-/* wrap around divs that float so they "take up space" */
-div.spacer {
-  clear: both;
-}
-
-.preFormatted {
-  white-space: pre;
-}
-
-/* Tabs from http://www.alistapart.com/articles/slidingdoors/ */
-
-/* resolve an issue with always having a scrollbar for #header */
-#headerHolder {
-  width: 100%;
-  margin: 0;
-  border: 1px solid black;
-  border-bottom-style: none;
-}
-
-#header {
-  float:left;
-  width: 100%;
-  background:#BED1B8 url("images/background.gif") repeat-x bottom;
-  font-size:80%;
-  line-height:normal;
-}
-
-#header ul {
-  margin:0;
-  padding:10px 10px 0;
-  list-style:none;
-}
-
-#header li {
-  float:left;
-  background:url("images/tabLeft.gif") no-repeat left top;
-  margin:0;
-  padding:0 0 0 9px;
-  border-bottom:1px solid #000;
-}
-
-#header a {
-  float:left;
-  display:block;
-  width:.1em;
-  background:url("images/tabRight.gif") no-repeat right top;
-  padding:5px 10px 4px 1px;
-  text-decoration:none;
-  font-weight:bold;
-  color:#F4F7DA;
-}
-
-#header > ul a {width:auto;}
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-#header a {float:none;}
-/* End IE5-Mac hack */
-
-#header a:hover {
-  color:#333;
-}
-
-#header #current {
-  background-position:0 -150px;
-  border-width:0;
-}
-
-#header #current a {
-  background-position:100% -150px;
-  padding-bottom:5px;
-  color:#000;
-}
-
-#header li:hover, #header li:hover a {
-  background-position:0% -150px;
-  color:#9BAB96;
-}
-
-#header li:hover a {
-  background-position:100% -150px;
-}
diff --git a/hubzilla_er/schemaSpy.js b/hubzilla_er/schemaSpy.js
deleted file mode 100644
index d1a739d4e..000000000
--- a/hubzilla_er/schemaSpy.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// table-based pages are expected to set 'table' to their name

-var table = null;

-

-// sync target's visibility with the state of checkbox

-function sync(cb, target) {

-  var checked = cb.attr('checked');

-  var displayed = target.css('display') != 'none';

-  if (checked != displayed) {

-    if (checked)

-      target.show();

-    else

-      target.hide();

-  }

-}

-

-// sync target's visibility with the inverse of the state of checkbox

-function unsync(cb, target) {

-  var checked = cb.attr('checked');

-  var displayed = target.css('display') != 'none';

-  if (checked == displayed) {

-    if (checked)

-      target.hide();

-    else

-      target.show();

-  }

-}

-

-// associate the state of checkbox with the visibility of target

-function associate(cb, target) {

-  sync(cb, target);

-  cb.click(function() {

-    sync(cb, target);

-  });

-}

-

-// select the appropriate image based on the options selected

-function syncImage() {

-  var implied   = $('#implied').attr('checked');

-

-  $('.diagram').hide();

-

-  if (table) {

-    if (implied && $('#impliedTwoDegreesImg').size() > 0) {

-      $('#impliedTwoDegreesImg').show();

-    } else {

-      var oneDegree = $('#oneDegree').attr('checked');

-

-      if (oneDegree || $('#twoDegreesImg').size() == 0) {

-        $('#oneDegreeImg').show();

-      } else {

-        $('#twoDegreesImg').show();

-      }

-    }

-  } else {

-    var showNonKeys = $('#showNonKeys').attr('checked');

-

-    if (implied) {

-      if (showNonKeys && $('#impliedLargeImg').size() > 0) {

-        $('#impliedLargeImg').show();

-      } else if ($('#impliedCompactImg').size() > 0) {

-        $('#impliedCompactImg').show();

-      } else {

-        $('#realCompactImg').show();

-      }

-    } else {

-      if (showNonKeys && $('#realLargeImg').size() > 0) {

-        $('#realLargeImg').show();

-      } else {

-        $('#realCompactImg').show();

-      }

-    }

-  }

-}

-

-// our 'ready' handler makes the page consistent

-$(function(){

-  associate($('#implied'),         $('.impliedRelationship'));

-  associate($('#showComments'),    $('.comment'));

-  associate($('#showLegend'),      $('.legend'));

-  associate($('#showRelatedCols'), $('.relatedKey'));

-  associate($('#showConstNames'),  $('.constraint'));

-

-  syncImage();

-  $('#implied,#oneDegree,#twoDegrees,#showNonKeys').click(function() {

-    syncImage();

-  });

-

-  unsync($('#implied'), $('.degrees'));

-  $('#implied').click(function() {

-    unsync($('#implied'), $('.degrees'));

-  });

-

-  unsync($('#removeImpliedOrphans'), $('.impliedNotOrphan'));

-  $('#removeImpliedOrphans').click(function() {

-    unsync($('#removeImpliedOrphans'), $('.impliedNotOrphan'));

-  });

-});

diff --git a/hubzilla_er/tables/abook.html b/hubzilla_er/tables/abook.html
deleted file mode 100644
index 7e103df6f..000000000
--- a/hubzilla_er/tables/abook.html
+++ /dev/null
@@ -1,502 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.abook</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='abook';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>abook</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>abook_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>abook_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>abook_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>abook_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>abook_my_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>abook_their_perms</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>abook_closeness</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>99</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>abook_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>abook_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>abook_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>abook_dob</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>abook_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>abook_blocked</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>abook_ignored</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>abook_hidden</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>abook_archived</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>abook_pending</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>abook_unconnected</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>abook_self</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>abook_feed</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>abook_profile</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>abook_incl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>abook_excl</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='23 columns'>Table contained 12 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>abook_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_account</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_account</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_archived</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_archived</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_blocked</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_blocked</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_channel</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_channel</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_closeness</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_closeness</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_connected</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_connected</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_created</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_dob</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_dob</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_feed</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_feed</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_hidden</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_hidden</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_ignored</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_ignored</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_my_perms</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_my_perms</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_pending</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_pending</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_profile</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_profile</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_self</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_self</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_their_perms</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_their_perms</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_unconnected</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_unconnected</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_updated</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_updated</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>abook_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>abook_xchan</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/account.html b/hubzilla_er/tables/account.html
deleted file mode 100644
index cd2e46eb1..000000000
--- a/hubzilla_er/tables/account.html
+++ /dev/null
@@ -1,417 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.account</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='account';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>account</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="mail.account_id's name implies that it's a child of account.account_id, but it doesn't reference that column."><a href='mail.html'>mail</a><span class='relatedKey'>.account_id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
-</td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>account_parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>account_default_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>account_salt</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>account_password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>account_email</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>account_external</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>account_language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>en</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>account_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>account_lastlog</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>account_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>account_roles</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>account_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>account_expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>account_expire_notified</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>account_service_class</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>account_level</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>account_password_changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='18 columns'>Table contained 1 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>account_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>account_default_channel</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>account_default_channel</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>account_email</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>account_email</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>account_expires</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>account_expires</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>account_external</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>account_external</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>account_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>account_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>account_lastlog</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>account_lastlog</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>account_level</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>account_level</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>account_parent</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>account_parent</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>account_password_changed</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>account_password_changed</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>account_roles</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>account_roles</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>account_service_class</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>account_service_class</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="account.html" title="account" alt="" coords="7,5,335,475">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/account.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="mail.html" title="mail" alt="" coords="380,7,524,540">
-<area shape="rect" id="node3" href="account.html" title="account" alt="" coords="7,109,335,579">
-<area shape="rect" id="node5" href="channel.html" title="channel" alt="" coords="109,596,232,676">
-<area shape="rect" id="node7" href="verify.html" title="verify" alt="" coords="109,5,232,85">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/account.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/addon.html b/hubzilla_er/tables/addon.html
deleted file mode 100644
index 512eac7d1..000000000
--- a/hubzilla_er/tables/addon.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.addon</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='addon';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>addon</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="addon.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='notify.html'>notify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>installed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>timestamp</td>
- <td class='detail'>bigint</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>plugin_admin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='7 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hidden</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hidden</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>installed</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>installed</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>name</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>name</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="addon.html" title="addon" alt="" coords="7,5,201,227">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/addon.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="addon.html" title="addon" alt="" coords="189,5,384,227">
-<area shape="rect" id="node3" href="notify.html" title="notify" alt="" coords="7,587,143,984">
-<area shape="rect" id="node4" href="app.html" title="app" alt="" coords="227,244,347,324">
-<area shape="rect" id="node6" href="event.html" title="event" alt="" coords="227,341,347,421">
-<area shape="rect" id="node8" href="fserver.html" title="fserver" alt="" coords="225,439,348,519">
-<area shape="rect" id="node10" href="fsuggest.html" title="fsuggest" alt="" coords="224,536,349,616">
-<area shape="rect" id="node12" href="hook.html" title="hook" alt="" coords="227,633,347,713">
-<area shape="rect" id="node14" href="manage.html" title="manage" alt="" coords="224,731,349,811">
-<area shape="rect" id="node16" href="pconfig.html" title="pconfig" alt="" coords="217,828,356,908">
-<area shape="rect" id="node18" href="profile.html" title="profile" alt="" coords="227,925,347,1005">
-<area shape="rect" id="node20" href="spam.html" title="spam" alt="" coords="227,1023,347,1103">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/addon.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/app.html b/hubzilla_er/tables/app.html
deleted file mode 100644
index 0189a9224..000000000
--- a/hubzilla_er/tables/app.html
+++ /dev/null
@@ -1,356 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.app</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='app';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>app</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="app.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='notify.html'>notify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>app_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>app_sig</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>app_author</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>app_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>app_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>app_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>app_photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>app_version</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>app_channel</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>app_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>app_price</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>app_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>app_requires</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='14 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>app_channel</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>app_channel</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>app_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>app_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>app_name</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>app_name</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>app_photo</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>app_photo</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>app_price</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>app_price</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>app_url</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>app_url</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>app_version</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>app_version</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="app.html" title="app" alt="" coords="7,5,212,385">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/app.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="addon.html" title="addon" alt="" coords="232,5,352,85">
-<area shape="rect" id="node3" href="notify.html" title="notify" alt="" coords="7,744,143,1141">
-<area shape="rect" id="node4" href="app.html" title="app" alt="" coords="189,102,395,482">
-<area shape="rect" id="node6" href="event.html" title="event" alt="" coords="232,499,352,579">
-<area shape="rect" id="node8" href="fserver.html" title="fserver" alt="" coords="231,596,353,676">
-<area shape="rect" id="node10" href="fsuggest.html" title="fsuggest" alt="" coords="229,693,355,773">
-<area shape="rect" id="node12" href="hook.html" title="hook" alt="" coords="232,791,352,871">
-<area shape="rect" id="node14" href="manage.html" title="manage" alt="" coords="229,888,355,968">
-<area shape="rect" id="node16" href="pconfig.html" title="pconfig" alt="" coords="223,985,361,1065">
-<area shape="rect" id="node18" href="profile.html" title="profile" alt="" coords="232,1083,352,1163">
-<area shape="rect" id="node20" href="spam.html" title="spam" alt="" coords="232,1180,352,1260">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/app.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/attach.html b/hubzilla_er/tables/attach.html
deleted file mode 100644
index ea0353d38..000000000
--- a/hubzilla_er/tables/attach.html
+++ /dev/null
@@ -1,513 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.attach</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='attach';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>attach</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="attach.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>filetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>filesize</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>folder</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>is_dir</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>is_photo</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>data</td>
- <td class='detail'>longblob</td>
- <td class='detail' align='right'>2147483647</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='23 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>aid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>aid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>created</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>creator</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>creator</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>edited</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>edited</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>filename</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>filename</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>filesize</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>filesize</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>filetype</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>filetype</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>folder</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>folder</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hash</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hash</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>is_dir</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>is_dir</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>is_photo</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>is_photo</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>os_storage</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>os_storage</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>revision</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>revision</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="5,5,285,589">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/attach.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="175,5,455,589">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,1435,131,1629">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="251,607,379,687">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="255,704,375,784">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="253,801,376,881">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="255,899,375,979">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="241,996,388,1076">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="253,1093,376,1173">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="240,1191,389,1271">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="257,1288,372,1368">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="255,1385,375,1465">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="255,1483,375,1563">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="240,1580,389,1660">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="253,1677,376,1757">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="253,1775,376,1855">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="245,1872,384,1952">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="253,1969,376,2049">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="255,2067,375,2147">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="249,2164,380,2244">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="253,2261,376,2341">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="255,2359,375,2439">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/attach.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/auth_codes.html b/hubzilla_er/tables/auth_codes.html
deleted file mode 100644
index 842fb3c15..000000000
--- a/hubzilla_er/tables/auth_codes.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.auth_codes</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='auth_codes';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>auth_codes</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="auth_codes.id's name implies that it's a child of tokens.id, but it doesn't reference that column."><a href='tokens.html'>tokens</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="auth_codes.client_id's name implies that it's a child of clients.client_id, but it doesn't reference that column."><a href='clients.html'>clients</a><span class='relatedKey'>.client_id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>expires</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>250</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="auth_codes.html" title="auth_codes" alt="" coords="5,5,216,181">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/auth_codes.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="auth_codes.html" title="auth_codes" alt="" coords="360,81,571,257">
-<area shape="rect" id="node3" href="clients.html" title="clients" alt="" coords="7,117,137,310">
-<area shape="rect" id="node5" href="tokens.html" title="tokens" alt="" coords="183,5,316,198">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/auth_codes.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/cache.html b/hubzilla_er/tables/cache.html
deleted file mode 100644
index e6238f822..000000000
--- a/hubzilla_er/tables/cache.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.cache</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='cache';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>cache</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="config.k's name implies that it's a child of cache.k, but it doesn't reference that column."><a href='config.html'>config</a><span class='relatedKey'>.k</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="pconfig.k's name implies that it's a child of cache.k, but it doesn't reference that column."><a href='pconfig.html'>pconfig</a><span class='relatedKey'>.k</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="profext.k's name implies that it's a child of cache.k, but it doesn't reference that column."><a href='profext.html'>profext</a><span class='relatedKey'>.k</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="sys_perms.k's name implies that it's a child of cache.k, but it doesn't reference that column."><a href='sys_perms.html'>sys_perms</a><span class='relatedKey'>.k</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="xconfig.k's name implies that it's a child of cache.k, but it doesn't reference that column."><a href='xconfig.html'>xconfig</a><span class='relatedKey'>.k</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
-</td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='3 columns'>Table contained 21 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>k</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="cache.html" title="cache" alt="" coords="7,5,212,136">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/cache.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="config.html" title="config" alt="" coords="263,5,391,153">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="48,247,171,327">
-<area shape="rect" id="node5" href="cache.html" title="cache" alt="" coords="7,421,212,552">
-<area shape="rect" id="node6" href="pconfig.html" title="pconfig" alt="" coords="257,733,396,904">
-<area shape="rect" id="node8" href="notify.html" title="notify" alt="" coords="41,732,177,812">
-<area shape="rect" id="node10" href="profext.html" title="profext" alt="" coords="261,545,392,716">
-<area shape="rect" id="node12" href="channel.html" title="channel" alt="" coords="48,569,171,649">
-<area shape="rect" id="node15" href="sys_perms.html" title="sys_perms" alt="" coords="260,169,393,340">
-<area shape="rect" id="node18" href="xconfig.html" title="xconfig" alt="" coords="265,357,388,528">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/cache.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/channel.html b/hubzilla_er/tables/channel.html
deleted file mode 100644
index 1222058de..000000000
--- a/hubzilla_er/tables/channel.html
+++ /dev/null
@@ -1,924 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.channel</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='channel';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>channel</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="likes.channel_id's name implies that it's a child of channel.channel_id, but it doesn't reference that column."><a href='likes.html'>likes</a><span class='relatedKey'>.channel_id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="mail.channel_id's name implies that it's a child of channel.channel_id, but it doesn't reference that column."><a href='mail.html'>mail</a><span class='relatedKey'>.channel_id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="profext.channel_id's name implies that it's a child of channel.channel_id, but it doesn't reference that column."><a href='profext.html'>profext</a><span class='relatedKey'>.channel_id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
-</td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>channel_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_timezone</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_theme</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>channel_startpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>channel_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>channel_prvkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_notifyflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>65535</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_pageflags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_dirdate</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_lastpost</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_deleted</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_max_anon_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_max_friend_req</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>10</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_expire_days</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>channel_passwd_reset</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_default_group</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>channel_allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>channel_allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>channel_deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>channel_deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_r_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_r_profile</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_r_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_r_abook</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_w_stream</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_w_wall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_w_tagwall</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_w_comment</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_w_mail</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_w_photos</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_w_chat</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_a_delegate</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_r_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_w_storage</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_r_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_w_pages</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_a_republish</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_w_like</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_removed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='48 columns'>Table contained 5 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>channel_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_a_delegate</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_a_delegate</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_a_republish</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_a_republish</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_account_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_account_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_address</td>
-  <td class='detail'>Must be unique</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_address_unique</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_default_group</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_default_gid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_deleted</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_deleted</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_dirdate</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_dirdate</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_expire_days</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_expire_days</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_guid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_guid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_hash</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_hash</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_lastpost</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_lastpost</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_location</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_location</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_max_anon_mail</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_max_anon_mail</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_max_friend_req</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_max_friend_req</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_name</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_name</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_notifyflags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_notifyflags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_pageflags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_pageflags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_primary</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_primary</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_r_abook</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_r_abook</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_r_pages</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_r_pages</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_r_photos</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_r_photos</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_r_profile</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_r_profile</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_r_storage</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_r_storage</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_r_stream</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_r_stream</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_removed</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_removed</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_system</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_system</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_theme</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_theme</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_timezone</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_timezone</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_w_chat</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_w_chat</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_w_comment</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_w_comment</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_w_like</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_w_like</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_w_mail</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_w_mail</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_w_pages</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_w_pages</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_w_photos</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_w_photos</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_w_storage</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_w_storage</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_w_stream</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_w_stream</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_w_tagwall</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_w_tagwall</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_w_wall</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_w_wall</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="channel.html" title="channel" alt="" coords="7,5,356,1155">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/channel.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="likes.html" title="likes" alt="" coords="408,556,539,817">
-<area shape="rect" id="node3" href="channel.html" title="channel" alt="" coords="7,575,356,1726">
-<area shape="rect" id="node5" href="verify.html" title="verify" alt="" coords="120,479,243,559">
-<area shape="rect" id="node6" href="mail.html" title="mail" alt="" coords="401,5,545,539">
-<area shape="rect" id="node8" href="account.html" title="account" alt="" coords="123,117,240,197">
-<area shape="rect" id="node11" href="profext.html" title="profext" alt="" coords="408,835,539,1005">
-<area shape="rect" id="node15" href="cache.html" title="cache" alt="" coords="117,1743,245,1823">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/channel.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/chat.html b/hubzilla_er/tables/chat.html
deleted file mode 100644
index fb914f215..000000000
--- a/hubzilla_er/tables/chat.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.chat</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='chat';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>chat</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>chat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>chat_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>chat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>chat_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>chat_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>chat_room</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>chat_room</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>chat_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>chat_xchan</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>created</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/chatpresence.html b/hubzilla_er/tables/chatpresence.html
deleted file mode 100644
index 9b6c8c7f0..000000000
--- a/hubzilla_er/tables/chatpresence.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.chatpresence</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='chatpresence';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>chatpresence</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>cp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>cp_room</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>cp_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>cp_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>cp_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>cp_client</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='6 columns'>Table contained 1 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>cp_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cp_last</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cp_last</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cp_room</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cp_room</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cp_status</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cp_status</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cp_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cp_xchan</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/chatroom.html b/hubzilla_er/tables/chatroom.html
deleted file mode 100644
index cb7db7985..000000000
--- a/hubzilla_er/tables/chatroom.html
+++ /dev/null
@@ -1,286 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.chatroom</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='chatroom';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>chatroom</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>cr_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>cr_aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>cr_uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>cr_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>cr_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>cr_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>cr_expire</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='11 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>cr_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cr_aid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cr_aid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cr_created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cr_created</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cr_edited</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cr_edited</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cr_expire</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cr_expire</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cr_name</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cr_name</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cr_uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cr_uid</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/clients.html b/hubzilla_er/tables/clients.html
deleted file mode 100644
index 81d48f281..000000000
--- a/hubzilla_er/tables/clients.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.clients</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='clients';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>clients</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="auth_codes.client_id's name implies that it's a child of clients.client_id, but it doesn't reference that column."><a href='auth_codes.html'>auth_codes</a><span class='relatedKey'>.client_id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="tokens.client_id's name implies that it's a child of clients.client_id, but it doesn't reference that column."><a href='tokens.html'>tokens</a><span class='relatedKey'>.client_id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
-</td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>pw</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>redirect_uri</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>name</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>icon</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center' title='nullable'>&nbsp;&radic;&nbsp;</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>null</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='6 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>client_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="clients.html" title="clients" alt="" coords="5,5,216,203">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/clients.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="auth_codes.html" title="auth_codes" alt="" coords="439,84,569,255">
-<area shape="rect" id="node3" href="clients.html" title="clients" alt="" coords="5,114,216,313">
-<area shape="rect" id="node5" href="tokens.html" title="tokens" alt="" coords="260,5,393,198">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/clients.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/config.html b/hubzilla_er/tables/config.html
deleted file mode 100644
index 62536d7ce..000000000
--- a/hubzilla_er/tables/config.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.config</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='config';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>config</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="config.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="config.k's name implies that it's a child of cache.k, but it doesn't reference that column."><a href='cache.html'>cache</a><span class='relatedKey'>.k</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>v</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='4 columns'>Table contained 52 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cat + k</td>
-  <td class='detail'>Must be unique</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span>/<span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>access</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="config.html" title="config" alt="" coords="5,5,232,158">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/config.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="236,1465,356,1545">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="9,931,135,1125">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="183,1659,409,1813">
-<area shape="rect" id="node7" href="cache.html" title="cache" alt="" coords="5,1831,139,1956">
-<area shape="rect" id="node8" href="conv.html" title="conv" alt="" coords="236,5,356,85">
-<area shape="rect" id="node10" href="fcontact.html" title="fcontact" alt="" coords="235,103,357,183">
-<area shape="rect" id="node12" href="ffinder.html" title="ffinder" alt="" coords="236,200,356,280">
-<area shape="rect" id="node14" href="group_member.html" title="group_member" alt="" coords="223,297,369,377">
-<area shape="rect" id="node16" href="groups.html" title="groups" alt="" coords="235,395,357,475">
-<area shape="rect" id="node18" href="item.html" title="item" alt="" coords="221,492,371,572">
-<area shape="rect" id="node20" href="item_id.html" title="item_id" alt="" coords="239,589,353,669">
-<area shape="rect" id="node22" href="likes.html" title="likes" alt="" coords="236,687,356,767">
-<area shape="rect" id="node24" href="mail.html" title="mail" alt="" coords="236,784,356,864">
-<area shape="rect" id="node26" href="pconfig.html" title="pconfig" alt="" coords="227,2024,365,2104">
-<area shape="rect" id="node28" href="photo.html" title="photo" alt="" coords="221,881,371,961">
-<area shape="rect" id="node30" href="profdef.html" title="profdef" alt="" coords="235,979,357,1059">
-<area shape="rect" id="node32" href="profext.html" title="profext" alt="" coords="235,1829,357,1909">
-<area shape="rect" id="node35" href="profile_check.html" title="profile_check" alt="" coords="227,1076,365,1156">
-<area shape="rect" id="node37" href="register.html" title="register" alt="" coords="235,1173,357,1253">
-<area shape="rect" id="node39" href="sign.html" title="sign" alt="" coords="236,1271,356,1351">
-<area shape="rect" id="node41" href="sys_perms.html" title="sys_perms" alt="" coords="231,1927,361,2007">
-<area shape="rect" id="node44" href="xconfig.html" title="xconfig" alt="" coords="235,1563,357,1643">
-<area shape="rect" id="node47" href="xign.html" title="xign" alt="" coords="236,1368,356,1448">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/config.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/conv.html b/hubzilla_er/tables/conv.html
deleted file mode 100644
index bf3cda01f..000000000
--- a/hubzilla_er/tables/conv.html
+++ /dev/null
@@ -1,270 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.conv</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='conv';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>conv</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="conv.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>recips</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>creator</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>subject</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='8 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>created</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>updated</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>updated</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="conv.html" title="conv" alt="" coords="7,5,271,249">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/conv.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="248,5,368,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,1094,131,1287">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="244,103,372,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="176,199,440,443">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="247,460,369,540">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="248,557,368,637">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="235,655,381,735">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="247,752,369,832">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="233,849,383,929">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="251,947,365,1027">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="248,1044,368,1124">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="248,1141,368,1221">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="233,1239,383,1319">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="247,1336,369,1416">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="247,1433,369,1513">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="239,1531,377,1611">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="247,1628,369,1708">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="248,1725,368,1805">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="243,1823,373,1903">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="247,1920,369,2000">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="248,2017,368,2097">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/conv.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/event.html b/hubzilla_er/tables/event.html
deleted file mode 100644
index da92cb295..000000000
--- a/hubzilla_er/tables/event.html
+++ /dev/null
@@ -1,507 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.event</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='event';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>event</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="event.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='notify.html'>notify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>event_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>event_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>start</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>finish</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>summary</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>location</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>nofinish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>adjust</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>1</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>ignore</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>event_status</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>event_status_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>event_percent</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>event_repeat</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>event_sequence</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='25 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>adjust</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>adjust</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>aid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>aid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>event_hash</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>event_hash</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>event_sequence</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>event_sequence</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>event_status</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>event_status</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>event_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>event_xchan</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>finish</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>finish</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>ignore</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>ignore</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>nofinish</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>nofinish</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>start</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>start</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>type</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>type</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="event.html" title="event" alt="" coords="7,5,313,635">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/event.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="addon.html" title="addon" alt="" coords="283,5,403,85">
-<area shape="rect" id="node3" href="notify.html" title="notify" alt="" coords="7,995,143,1392">
-<area shape="rect" id="node4" href="app.html" title="app" alt="" coords="283,103,403,183">
-<area shape="rect" id="node6" href="event.html" title="event" alt="" coords="189,200,496,829">
-<area shape="rect" id="node8" href="fserver.html" title="fserver" alt="" coords="281,847,404,927">
-<area shape="rect" id="node10" href="fsuggest.html" title="fsuggest" alt="" coords="280,944,405,1024">
-<area shape="rect" id="node12" href="hook.html" title="hook" alt="" coords="283,1041,403,1121">
-<area shape="rect" id="node14" href="manage.html" title="manage" alt="" coords="280,1139,405,1219">
-<area shape="rect" id="node16" href="pconfig.html" title="pconfig" alt="" coords="273,1236,412,1316">
-<area shape="rect" id="node18" href="profile.html" title="profile" alt="" coords="283,1333,403,1413">
-<area shape="rect" id="node20" href="spam.html" title="spam" alt="" coords="283,1431,403,1511">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/event.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/fcontact.html b/hubzilla_er/tables/fcontact.html
deleted file mode 100644
index 10af48116..000000000
--- a/hubzilla_er/tables/fcontact.html
+++ /dev/null
@@ -1,358 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.fcontact</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='fcontact';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>fcontact</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="fcontact.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>nick</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>batch</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>notify</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>poll</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>confirm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>priority</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>alias</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='16 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>addr</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>addr</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>network</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>network</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="fcontact.html" title="fcontact" alt="" coords="7,5,225,430">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/fcontact.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="225,5,345,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,1275,131,1469">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="221,103,349,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="225,200,345,280">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="176,297,395,722">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="225,739,345,819">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="212,836,359,916">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="224,933,347,1013">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="211,1031,360,1111">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="228,1128,343,1208">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="225,1225,345,1305">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="225,1323,345,1403">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="211,1420,360,1500">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="224,1517,347,1597">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="224,1615,347,1695">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="216,1712,355,1792">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="224,1809,347,1889">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="225,1907,345,1987">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="220,2004,351,2084">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="224,2101,347,2181">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="225,2199,345,2279">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/fcontact.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/ffinder.html b/hubzilla_er/tables/ffinder.html
deleted file mode 100644
index 8c6a09711..000000000
--- a/hubzilla_er/tables/ffinder.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.ffinder</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='ffinder';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>ffinder</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="ffinder.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>fid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='4 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>fid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>fid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="ffinder.html" title="ffinder" alt="" coords="5,5,224,158">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/ffinder.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="224,5,344,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,1003,131,1197">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="220,103,348,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="224,200,344,280">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="223,297,345,377">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="175,394,393,547">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="211,564,357,644">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="223,661,345,741">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="209,759,359,839">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="227,856,341,936">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="224,953,344,1033">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="224,1051,344,1131">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="209,1148,359,1228">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="223,1245,345,1325">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="223,1343,345,1423">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="215,1440,353,1520">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="223,1537,345,1617">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="224,1635,344,1715">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="219,1732,349,1812">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="223,1829,345,1909">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="224,1927,344,2007">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/ffinder.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/fserver.html b/hubzilla_er/tables/fserver.html
deleted file mode 100644
index 0becc814d..000000000
--- a/hubzilla_er/tables/fserver.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.fserver</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='fserver';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>fserver</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="fserver.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='notify.html'>notify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>server</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>key</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='4 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>posturl</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>posturl</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>server</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>server</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="fserver.html" title="fserver" alt="" coords="6,5,195,158">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/fserver.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="addon.html" title="addon" alt="" coords="223,5,343,85">
-<area shape="rect" id="node3" href="notify.html" title="notify" alt="" coords="7,517,143,915">
-<area shape="rect" id="node4" href="app.html" title="app" alt="" coords="223,103,343,183">
-<area shape="rect" id="node6" href="event.html" title="event" alt="" coords="223,200,343,280">
-<area shape="rect" id="node8" href="fserver.html" title="fserver" alt="" coords="188,297,377,450">
-<area shape="rect" id="node10" href="fsuggest.html" title="fsuggest" alt="" coords="220,467,345,547">
-<area shape="rect" id="node12" href="hook.html" title="hook" alt="" coords="223,564,343,644">
-<area shape="rect" id="node14" href="manage.html" title="manage" alt="" coords="220,661,345,741">
-<area shape="rect" id="node16" href="pconfig.html" title="pconfig" alt="" coords="213,759,352,839">
-<area shape="rect" id="node18" href="profile.html" title="profile" alt="" coords="223,856,343,936">
-<area shape="rect" id="node20" href="spam.html" title="spam" alt="" coords="223,953,343,1033">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/fserver.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/fsuggest.html b/hubzilla_er/tables/fsuggest.html
deleted file mode 100644
index 7f0b446e5..000000000
--- a/hubzilla_er/tables/fsuggest.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.fsuggest</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='fsuggest';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>fsuggest</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="fsuggest.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='notify.html'>notify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>cid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>request</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>note</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='9 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="fsuggest.html" title="fsuggest" alt="" coords="5,5,203,272">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/fsuggest.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="addon.html" title="addon" alt="" coords="227,5,347,85">
-<area shape="rect" id="node3" href="notify.html" title="notify" alt="" coords="7,539,143,936">
-<area shape="rect" id="node4" href="app.html" title="app" alt="" coords="227,103,347,183">
-<area shape="rect" id="node6" href="event.html" title="event" alt="" coords="227,200,347,280">
-<area shape="rect" id="node8" href="fserver.html" title="fserver" alt="" coords="225,297,348,377">
-<area shape="rect" id="node10" href="fsuggest.html" title="fsuggest" alt="" coords="188,395,385,661">
-<area shape="rect" id="node12" href="hook.html" title="hook" alt="" coords="227,679,347,759">
-<area shape="rect" id="node14" href="manage.html" title="manage" alt="" coords="224,776,349,856">
-<area shape="rect" id="node16" href="pconfig.html" title="pconfig" alt="" coords="217,873,356,953">
-<area shape="rect" id="node18" href="profile.html" title="profile" alt="" coords="227,971,347,1051">
-<area shape="rect" id="node20" href="spam.html" title="spam" alt="" coords="227,1068,347,1148">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/fsuggest.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/group_member.html b/hubzilla_er/tables/group_member.html
deleted file mode 100644
index f66faa853..000000000
--- a/hubzilla_er/tables/group_member.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.group_member</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='group_member';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>group_member</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="group_member.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>gid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='4 columns'>Table contained 2 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>gid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>gid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="group_member.html" title="group_member" alt="" coords="7,5,231,158">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/group_member.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="228,5,348,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,1003,131,1197">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="224,103,352,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="228,200,348,280">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="227,297,349,377">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="228,395,348,475">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="176,491,400,645">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="227,661,349,741">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="213,759,363,839">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="231,856,345,936">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="228,953,348,1033">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="228,1051,348,1131">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="213,1148,363,1228">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="227,1245,349,1325">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="227,1343,349,1423">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="219,1440,357,1520">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="227,1537,349,1617">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="228,1635,348,1715">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="223,1732,353,1812">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="227,1829,349,1909">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="228,1927,348,2007">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/group_member.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/groups.html b/hubzilla_er/tables/groups.html
deleted file mode 100644
index 5e0b4163f..000000000
--- a/hubzilla_er/tables/groups.html
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.groups</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='groups';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>groups</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="groups.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>visible</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='6 columns'>Table contained 5 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>deleted</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>deleted</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hash</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hash</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>visible</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>visible</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="groups.html" title="groups" alt="" coords="5,5,224,203">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/groups.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="224,5,344,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,1049,131,1242">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="220,103,348,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="224,200,344,280">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="223,297,345,377">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="224,395,344,475">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="211,492,357,572">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="175,589,393,787">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="209,804,359,884">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="227,901,341,981">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="224,999,344,1079">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="224,1096,344,1176">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="209,1193,359,1273">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="223,1291,345,1371">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="223,1388,345,1468">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="215,1485,353,1565">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="223,1583,345,1663">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="224,1680,344,1760">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="219,1777,349,1857">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="223,1875,345,1955">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="224,1972,344,2052">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/groups.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/hook.html b/hubzilla_er/tables/hook.html
deleted file mode 100644
index 08d9b1aa7..000000000
--- a/hubzilla_er/tables/hook.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.hook</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='hook';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>hook</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="hook.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='notify.html'>notify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hook</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>file</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>function</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>priority</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hook</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hook</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="hook.html" title="hook" alt="" coords="5,5,224,181">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/hook.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="addon.html" title="addon" alt="" coords="237,5,357,85">
-<area shape="rect" id="node3" href="notify.html" title="notify" alt="" coords="7,445,143,843">
-<area shape="rect" id="node4" href="app.html" title="app" alt="" coords="237,103,357,183">
-<area shape="rect" id="node6" href="event.html" title="event" alt="" coords="237,200,357,280">
-<area shape="rect" id="node8" href="fserver.html" title="fserver" alt="" coords="236,297,359,377">
-<area shape="rect" id="node10" href="fsuggest.html" title="fsuggest" alt="" coords="235,395,360,475">
-<area shape="rect" id="node12" href="hook.html" title="hook" alt="" coords="188,492,407,668">
-<area shape="rect" id="node14" href="manage.html" title="manage" alt="" coords="235,685,360,765">
-<area shape="rect" id="node16" href="pconfig.html" title="pconfig" alt="" coords="228,783,367,863">
-<area shape="rect" id="node18" href="profile.html" title="profile" alt="" coords="237,880,357,960">
-<area shape="rect" id="node20" href="spam.html" title="spam" alt="" coords="237,977,357,1057">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/hook.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/hubloc.html b/hubzilla_er/tables/hubloc.html
deleted file mode 100644
index 06c3e388b..000000000
--- a/hubzilla_er/tables/hubloc.html
+++ /dev/null
@@ -1,433 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.hubloc</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='hubloc';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>hubloc</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>hubloc_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>hubloc_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>hubloc_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>hubloc_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hubloc_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>hubloc_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hubloc_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>hubloc_status</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hubloc_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>hubloc_url_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hubloc_host</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>hubloc_callback</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hubloc_connect</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>hubloc_sitekey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hubloc_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>hubloc_connected</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hubloc_primary</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>hubloc_orphancheck</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hubloc_error</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>hubloc_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='20 columns'>Table contained 1 513 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>hubloc_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_addr</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_addr</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_connect</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_connect</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_connected</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_connected</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_deleted</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_deleted</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_error</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_error</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_guid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_guid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_host</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_host</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_network</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_network</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_orphancheck</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_orphancheck</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_primary</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_primary</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_status</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_status</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_updated</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_updated</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hubloc_url</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hubloc_url</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/issue.html b/hubzilla_er/tables/issue.html
deleted file mode 100644
index f4befe07f..000000000
--- a/hubzilla_er/tables/issue.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.issue</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='issue';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>issue</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>issue_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>issue_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>issue_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>issue_assigned</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>issue_priority</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>issue_status</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>issue_component</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='7 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>issue_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>issue_assigned</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>issue_assigned</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>issue_component</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>issue_component</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>issue_created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>issue_created</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>issue_priority</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>issue_priority</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>issue_status</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>issue_status</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>issue_updated</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>issue_updated</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/item.html b/hubzilla_er/tables/item.html
deleted file mode 100644
index 8f2684aa5..000000000
--- a/hubzilla_er/tables/item.html
+++ /dev/null
@@ -1,1315 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.item</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='item';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>item</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="item.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>thr_parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>commented</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>received</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>changed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>comments_closed</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>owner_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>author_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>source_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>html</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>app</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>lang</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>revision</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>obj_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>object</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>tgt_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>target</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>layout_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>postopts</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>route</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>llink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>plink</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>resource_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>diaspora_meta</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>coord</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>public_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>comment_policy</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_restrict</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_private</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_origin</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_unseen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_starred</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_uplink</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_consensus</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_wall</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_thread_top</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_notshown</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_relay</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_mentionsme</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_nocomment</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_obscured</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_verified</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_retained</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_rss</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_unpublished</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_delayed</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>item_pending_remove</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>item_blocked</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='73 columns'>Table contained 9 613 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>aid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>aid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>allow_cid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>allow_cid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>allow_gid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>allow_gid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>author_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>author_xchan</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>body</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>body</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>changed</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>changed</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>comment_policy</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>comment_policy</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>commented</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>commented</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>comments_closed</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>comments_closed</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>created</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>deny_cid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>deny_cid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>deny_gid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>deny_gid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>edited</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>edited</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>expires</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>expires</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_blocked</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_blocked</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_consensus</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_consensus</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_delayed</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_delayed</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_deleted</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_deleted</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_hidden</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_hidden</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_mentionsme</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_mentionsme</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_nocomment</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_nocomment</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_notshown</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_notshown</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_nsfw</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_nsfw</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_obscured</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_obscured</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_origin</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_origin</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_pending_remove</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_pending_remove</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_private</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_private</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_relay</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_relay</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_restrict</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_restrict</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_retained</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_retained</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_rss</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_rss</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_starred</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_starred</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_thread_top</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_thread_top</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_type</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_type</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_unpublished</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_unpublished</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_unseen</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_unseen</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_uplink</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_uplink</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_verified</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_verified</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>item_wall</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>item_wall</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>layout_mid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>layout_mid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>llink</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>llink</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mimetype</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mimetype</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>owner_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>owner_xchan</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>parent</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>parent</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>parent_mid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>parent_mid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>public_policy</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>public_policy</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>received</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>received</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>resource_type</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>resource_type</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>revision</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>revision</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>title</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>title</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid + commented</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span>/<span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid_commented</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid + created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span>/<span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid_created</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mid + uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span>/<span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid_mid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>verb</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>verb</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="item.html" title="item" alt="" coords="5,5,344,1723">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/item.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="284,5,404,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,2569,131,2762">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="280,103,408,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="284,200,404,280">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="283,297,405,377">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="284,395,404,475">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="271,492,417,572">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="283,589,405,669">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="175,687,513,2404">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="287,2421,401,2501">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="284,2519,404,2599">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="284,2616,404,2696">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="269,2713,419,2793">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="283,2811,405,2891">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="283,2908,405,2988">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="275,3005,413,3085">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="283,3103,405,3183">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="284,3200,404,3280">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="279,3297,409,3377">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="283,3395,405,3475">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="284,3492,404,3572">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/item.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/item_id.html b/hubzilla_er/tables/item_id.html
deleted file mode 100644
index ec66e3999..000000000
--- a/hubzilla_er/tables/item_id.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.item_id</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='item_id';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>item_id</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="item_id.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>service</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 1 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>iid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>iid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>service</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>service</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>sid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>sid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="item_id.html" title="item_id" alt="" coords="7,5,217,181">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/item_id.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="221,5,341,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,1027,131,1221">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="217,103,345,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="221,200,341,280">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="220,297,343,377">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="221,395,341,475">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="208,492,355,572">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="220,589,343,669">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="207,687,356,767">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="176,784,387,960">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="221,977,341,1057">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="221,1075,341,1155">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="207,1172,356,1252">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="220,1269,343,1349">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="220,1367,343,1447">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="212,1464,351,1544">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="220,1561,343,1641">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="221,1659,341,1739">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="216,1756,347,1836">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="220,1853,343,1933">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="221,1951,341,2031">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/item_id.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/likes.html b/hubzilla_er/tables/likes.html
deleted file mode 100644
index 6d085fa5a..000000000
--- a/hubzilla_er/tables/likes.html
+++ /dev/null
@@ -1,321 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.likes</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='likes';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>likes</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="likes.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="likes.channel_id's name implies that it's a child of channel.channel_id, but it doesn't reference that column."><a href='channel.html'>channel</a><span class='relatedKey'>.channel_id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>liker</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>likee</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>target_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>target_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>target</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='9 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>iid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>iid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>likee</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>likee</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>liker</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>liker</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>target_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>target_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>target_type</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>target_type</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>verb</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>verb</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="likes.html" title="likes" alt="" coords="7,5,281,272">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/likes.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="320,881,440,961">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="39,931,164,1125">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="316,979,444,1059">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="320,1076,440,1156">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="319,1173,441,1253">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="320,1271,440,1351">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="307,1368,453,1448">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="319,1465,441,1545">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="305,1563,455,1643">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="323,5,437,85">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="243,1660,517,1927">
-<area shape="rect" id="node22" href="channel.html" title="channel" alt="" coords="7,1945,196,3090">
-<area shape="rect" id="node24" href="mail.html" title="mail" alt="" coords="320,1944,440,2024">
-<area shape="rect" id="node27" href="photo.html" title="photo" alt="" coords="305,103,455,183">
-<area shape="rect" id="node29" href="profdef.html" title="profdef" alt="" coords="319,200,441,280">
-<area shape="rect" id="node31" href="profext.html" title="profext" alt="" coords="319,2041,441,2121">
-<area shape="rect" id="node34" href="profile_check.html" title="profile_check" alt="" coords="311,297,449,377">
-<area shape="rect" id="node36" href="register.html" title="register" alt="" coords="319,395,441,475">
-<area shape="rect" id="node38" href="sign.html" title="sign" alt="" coords="320,492,440,572">
-<area shape="rect" id="node40" href="sys_perms.html" title="sys_perms" alt="" coords="315,589,445,669">
-<area shape="rect" id="node42" href="xconfig.html" title="xconfig" alt="" coords="319,687,441,767">
-<area shape="rect" id="node44" href="xign.html" title="xign" alt="" coords="320,784,440,864">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/likes.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/mail.html b/hubzilla_er/tables/mail.html
deleted file mode 100644
index 96056d5ce..000000000
--- a/hubzilla_er/tables/mail.html
+++ /dev/null
@@ -1,517 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.mail</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='mail';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>mail</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="mail.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>convid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>mail_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>from_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>to_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>account_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="mail.account_id's name implies that it's a child of account.account_id, but it doesn't reference that column."><a href='account.html'>account</a><span class='relatedKey'>.account_id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="mail.channel_id's name implies that it's a child of channel.channel_id, but it doesn't reference that column."><a href='channel.html'>channel</a><span class='relatedKey'>.channel_id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>title</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>body</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>attach</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>parent_mid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>mail_deleted</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>mail_replied</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>mail_isreply</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>mail_seen</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>mail_recalled</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>mail_obscured</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='21 columns'>Table contained 7 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>account_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>account_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>convid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>convid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>created</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>expires</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>expires</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>from_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>from_xchan</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mail_deleted</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mail_deleted</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mail_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mail_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mail_isreply</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mail_isreply</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mail_obscured</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mail_obscured</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mail_recalled</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mail_recalled</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mail_replied</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mail_replied</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mail_seen</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mail_seen</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>parent_mid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>parent_mid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>to_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>to_xchan</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="mail.html" title="mail" alt="" coords="5,5,291,544">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/mail.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="348,881,468,961">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="51,931,176,1125">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="344,979,472,1059">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="348,1076,468,1156">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="347,1173,469,1253">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="348,1271,468,1351">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="335,1368,481,1448">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="347,1465,469,1545">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="333,1563,483,1643">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="351,5,465,85">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="348,2313,468,2393">
-<area shape="rect" id="node22" href="channel.html" title="channel" alt="" coords="19,2105,208,3250">
-<area shape="rect" id="node24" href="mail.html" title="mail" alt="" coords="265,1757,551,2296">
-<area shape="rect" id="node26" href="account.html" title="account" alt="" coords="7,1623,220,2089">
-<area shape="rect" id="node29" href="photo.html" title="photo" alt="" coords="333,103,483,183">
-<area shape="rect" id="node31" href="profdef.html" title="profdef" alt="" coords="347,200,469,280">
-<area shape="rect" id="node33" href="profext.html" title="profext" alt="" coords="347,1660,469,1740">
-<area shape="rect" id="node36" href="profile_check.html" title="profile_check" alt="" coords="339,297,477,377">
-<area shape="rect" id="node38" href="register.html" title="register" alt="" coords="347,395,469,475">
-<area shape="rect" id="node40" href="sign.html" title="sign" alt="" coords="348,492,468,572">
-<area shape="rect" id="node42" href="sys_perms.html" title="sys_perms" alt="" coords="343,589,473,669">
-<area shape="rect" id="node44" href="xconfig.html" title="xconfig" alt="" coords="347,687,469,767">
-<area shape="rect" id="node46" href="xign.html" title="xign" alt="" coords="348,784,468,864">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/mail.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/manage.html b/hubzilla_er/tables/manage.html
deleted file mode 100644
index 0275c18c2..000000000
--- a/hubzilla_er/tables/manage.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.manage</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='manage';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>manage</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="manage.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='notify.html'>notify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='3 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="manage.html" title="manage" alt="" coords="11,5,190,136">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/manage.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="addon.html" title="addon" alt="" coords="217,5,337,85">
-<area shape="rect" id="node3" href="notify.html" title="notify" alt="" coords="7,445,143,843">
-<area shape="rect" id="node4" href="app.html" title="app" alt="" coords="217,103,337,183">
-<area shape="rect" id="node6" href="event.html" title="event" alt="" coords="217,200,337,280">
-<area shape="rect" id="node8" href="fserver.html" title="fserver" alt="" coords="216,297,339,377">
-<area shape="rect" id="node10" href="fsuggest.html" title="fsuggest" alt="" coords="215,395,340,475">
-<area shape="rect" id="node12" href="hook.html" title="hook" alt="" coords="217,492,337,572">
-<area shape="rect" id="node14" href="manage.html" title="manage" alt="" coords="188,589,367,720">
-<area shape="rect" id="node16" href="pconfig.html" title="pconfig" alt="" coords="208,737,347,817">
-<area shape="rect" id="node18" href="profile.html" title="profile" alt="" coords="217,835,337,915">
-<area shape="rect" id="node20" href="spam.html" title="spam" alt="" coords="217,932,337,1012">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/manage.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/menu.html b/hubzilla_er/tables/menu.html
deleted file mode 100644
index e165beb4d..000000000
--- a/hubzilla_er/tables/menu.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.menu</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='menu';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>menu</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>menu_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>menu_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>menu_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>menu_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>menu_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>menu_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='7 columns'>Table contained 1 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>menu_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>menu_channel_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>menu_channel_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>menu_created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>menu_created</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>menu_edited</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>menu_edited</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>menu_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>menu_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>menu_name</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>menu_name</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/menu_item.html b/hubzilla_er/tables/menu_item.html
deleted file mode 100644
index 92e2eacc9..000000000
--- a/hubzilla_er/tables/menu_item.html
+++ /dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.menu_item</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='menu_item';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>menu_item</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>mitem_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>mitem_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>mitem_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>mitem_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>mitem_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>mitem_menu_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>mitem_order</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='11 columns'>Table contained 1 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>mitem_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mitem_channel_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mitem_channel_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mitem_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mitem_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>mitem_menu_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>mitem_menu_id</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/notify.html b/hubzilla_er/tables/notify.html
deleted file mode 100644
index 2eec3e2ce..000000000
--- a/hubzilla_er/tables/notify.html
+++ /dev/null
@@ -1,434 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.notify</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='notify';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>notify</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="addon.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='addon.html'>addon</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="app.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='app.html'>app</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="event.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='event.html'>event</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="fserver.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='fserver.html'>fserver</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="fsuggest.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='fsuggest.html'>fsuggest</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="hook.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='hook.html'>hook</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="manage.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='manage.html'>manage</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="pconfig.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='pconfig.html'>pconfig</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="profile.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='profile.html'>profile</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="spam.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='spam.html'>spam</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
-</td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>parent</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>seen</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='15 columns'>Table contained 59 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>aid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>aid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>date</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>date</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hash</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hash</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>link</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>link</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>otype</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>otype</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>parent</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>parent</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>seen</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>seen</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>type</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>type</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="notify.html" title="notify" alt="" coords="5,5,277,408">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/notify.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="addon.html" title="addon" alt="" coords="332,5,471,221">
-<area shape="rect" id="node3" href="notify.html" title="notify" alt="" coords="5,1572,277,1975">
-<area shape="rect" id="node4" href="app.html" title="app" alt="" coords="332,238,471,613">
-<area shape="rect" id="node6" href="event.html" title="event" alt="" coords="321,629,481,1253">
-<area shape="rect" id="node8" href="fserver.html" title="fserver" alt="" coords="340,1270,463,1418">
-<area shape="rect" id="node10" href="fsuggest.html" title="fsuggest" alt="" coords="339,1435,464,1696">
-<area shape="rect" id="node12" href="hook.html" title="hook" alt="" coords="340,1713,463,1884">
-<area shape="rect" id="node14" href="manage.html" title="manage" alt="" coords="339,1901,464,2027">
-<area shape="rect" id="node16" href="pconfig.html" title="pconfig" alt="" coords="332,3324,471,3495">
-<area shape="rect" id="node19" href="cache.html" title="cache" alt="" coords="77,3392,205,3472">
-<area shape="rect" id="node20" href="profile.html" title="profile" alt="" coords="331,2043,472,3098">
-<area shape="rect" id="node22" href="spam.html" title="spam" alt="" coords="341,3114,461,3307">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/notify.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/obj.html b/hubzilla_er/tables/obj.html
deleted file mode 100644
index 97f010598..000000000
--- a/hubzilla_er/tables/obj.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.obj</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='obj';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>obj</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>obj_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>obj_page</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>obj_verb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>obj_type</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>obj_obj</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>obj_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='10 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>obj_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>obj_channel</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>obj_channel</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>obj_obj</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>obj_obj</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>obj_page</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>obj_page</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>obj_type</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>obj_type</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>obj_verb</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>obj_verb</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/outq.html b/hubzilla_er/tables/outq.html
deleted file mode 100644
index ceca68f09..000000000
--- a/hubzilla_er/tables/outq.html
+++ /dev/null
@@ -1,309 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.outq</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='outq';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>outq</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>outq_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>outq_account</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>outq_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>outq_driver</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>outq_posturl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>outq_async</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>outq_delivered</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>outq_created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>outq_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>outq_notify</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>outq_msg</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>outq_priority</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='12 columns'>Table contained 2 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>outq_hash</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>outq_account</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>outq_account</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>outq_async</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>outq_async</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>outq_channel</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>outq_channel</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>outq_created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>outq_created</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>outq_delivered</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>outq_delivered</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>outq_posturl</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>outq_hub</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>outq_priority</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>outq_priority</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>outq_updated</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>outq_updated</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/pconfig.html b/hubzilla_er/tables/pconfig.html
deleted file mode 100644
index 3a4eb4fc6..000000000
--- a/hubzilla_er/tables/pconfig.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.pconfig</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='pconfig';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>pconfig</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="pconfig.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='notify.html'>notify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="pconfig.k's name implies that it's a child of cache.k, but it doesn't reference that column."><a href='cache.html'>cache</a><span class='relatedKey'>.k</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 232 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid + cat + k</td>
-  <td class='detail'>Must be unique</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span>/<span title='Ascending'>Asc</span>/<span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>access</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="pconfig.html" title="pconfig" alt="" coords="5,5,285,181">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/pconfig.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="addon.html" title="addon" alt="" coords="268,5,388,85">
-<area shape="rect" id="node3" href="notify.html" title="notify" alt="" coords="7,445,143,843">
-<area shape="rect" id="node4" href="app.html" title="app" alt="" coords="268,103,388,183">
-<area shape="rect" id="node6" href="config.html" title="config" alt="" coords="264,1075,392,1155">
-<area shape="rect" id="node8" href="cache.html" title="cache" alt="" coords="8,1173,141,1299">
-<area shape="rect" id="node9" href="event.html" title="event" alt="" coords="268,200,388,280">
-<area shape="rect" id="node11" href="fserver.html" title="fserver" alt="" coords="267,297,389,377">
-<area shape="rect" id="node13" href="fsuggest.html" title="fsuggest" alt="" coords="265,395,391,475">
-<area shape="rect" id="node15" href="hook.html" title="hook" alt="" coords="268,492,388,572">
-<area shape="rect" id="node17" href="manage.html" title="manage" alt="" coords="265,589,391,669">
-<area shape="rect" id="node19" href="pconfig.html" title="pconfig" alt="" coords="188,881,468,1057">
-<area shape="rect" id="node22" href="profext.html" title="profext" alt="" coords="267,1172,389,1252">
-<area shape="rect" id="node24" href="profile.html" title="profile" alt="" coords="268,687,388,767">
-<area shape="rect" id="node26" href="spam.html" title="spam" alt="" coords="268,784,388,864">
-<area shape="rect" id="node28" href="sys_perms.html" title="sys_perms" alt="" coords="263,1269,393,1349">
-<area shape="rect" id="node30" href="xconfig.html" title="xconfig" alt="" coords="267,1367,389,1447">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/pconfig.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/photo.html b/hubzilla_er/tables/photo.html
deleted file mode 100644
index 0bc69e071..000000000
--- a/hubzilla_er/tables/photo.html
+++ /dev/null
@@ -1,556 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.photo</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='photo';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>photo</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="photo.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>resource_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>title</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>description</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>album</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>filename</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>height</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>width</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>size</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>data</td>
- <td class='detail'>mediumblob</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>scale</td>
- <td class='detail'>tinyint</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>photo_usage</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>profile</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>is_nsfw</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>os_storage</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>os_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>display_path</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>photo_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>allow_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>allow_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>deny_cid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>deny_gid</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='28 columns'>Table contained 3 495 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>aid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>aid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>album</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>album</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>is_nsfw</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>is_nsfw</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>os_storage</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>os_storage</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>photo_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>photo_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>photo_usage</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>photo_usage</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>profile</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>profile</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>resource_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>resource_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>scale</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>scale</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>size</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>size</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>type</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>type</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="photo.html" title="photo" alt="" coords="7,5,319,702">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/photo.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="272,5,392,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,931,131,1125">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="268,103,396,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="272,200,392,280">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="271,297,393,377">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="272,395,392,475">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="259,492,405,572">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="271,589,393,669">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="257,687,407,767">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="275,784,389,864">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="272,881,392,961">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="272,979,392,1059">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="176,1075,488,1773">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="271,1789,393,1869">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="271,1887,393,1967">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="263,1984,401,2064">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="271,2081,393,2161">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="272,2179,392,2259">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="267,2276,397,2356">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="271,2373,393,2453">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="272,2471,392,2551">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/photo.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/poll.html b/hubzilla_er/tables/poll.html
deleted file mode 100644
index 7ad9eea73..000000000
--- a/hubzilla_er/tables/poll.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.poll</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='poll';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>poll</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>poll_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>poll_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>poll_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>poll_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>poll_votes</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>poll_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>poll_channel</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>poll_channel</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>poll_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>poll_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>poll_votes</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>poll_votes</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/poll_elm.html b/hubzilla_er/tables/poll_elm.html
deleted file mode 100644
index cb6b95fbe..000000000
--- a/hubzilla_er/tables/poll_elm.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.poll_elm</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='poll_elm';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>poll_elm</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>pelm_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>pelm_poll</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>pelm_desc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>pelm_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>pelm_result</td>
- <td class='detail'>float</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>pelm_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>pelm_poll</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>pelm_poll</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>pelm_result</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>pelm_result</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/profdef.html b/hubzilla_er/tables/profdef.html
deleted file mode 100644
index 2734deed0..000000000
--- a/hubzilla_er/tables/profdef.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.profdef</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='profdef';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>profdef</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="profdef.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>field_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>field_type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>field_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>field_help</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>field_inputs</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='6 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>field_name</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>field_name</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="profdef.html" title="profdef" alt="" coords="7,5,281,203">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/profdef.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="253,5,373,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,931,131,1125">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="249,103,377,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="253,200,373,280">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="252,297,375,377">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="253,395,373,475">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="240,492,387,572">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="252,589,375,669">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="239,687,388,767">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="256,784,371,864">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="253,881,373,961">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="253,979,373,1059">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="239,1076,388,1156">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="176,1173,451,1371">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="252,1388,375,1468">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="244,1485,383,1565">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="252,1583,375,1663">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="253,1680,373,1760">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="248,1777,379,1857">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="252,1875,375,1955">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="253,1972,373,2052">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/profdef.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/profext.html b/hubzilla_er/tables/profext.html
deleted file mode 100644
index 36472fcf9..000000000
--- a/hubzilla_er/tables/profext.html
+++ /dev/null
@@ -1,264 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.profext</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='profext';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>profext</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="profext.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="profext.channel_id's name implies that it's a child of channel.channel_id, but it doesn't reference that column."><a href='channel.html'>channel</a><span class='relatedKey'>.channel_id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="profext.k's name implies that it's a child of cache.k, but it doesn't reference that column."><a href='cache.html'>cache</a><span class='relatedKey'>.k</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hash</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hash</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>k</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>k</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="profext.html" title="profext" alt="" coords="7,5,279,181">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/profext.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="319,687,439,767">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="39,882,164,1075">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="315,1781,443,1861">
-<area shape="rect" id="node7" href="cache.html" title="cache" alt="" coords="35,2253,168,2379">
-<area shape="rect" id="node8" href="conv.html" title="conv" alt="" coords="319,784,439,864">
-<area shape="rect" id="node10" href="fcontact.html" title="fcontact" alt="" coords="317,881,440,961">
-<area shape="rect" id="node12" href="ffinder.html" title="ffinder" alt="" coords="319,979,439,1059">
-<area shape="rect" id="node14" href="group_member.html" title="group_member" alt="" coords="305,1076,452,1156">
-<area shape="rect" id="node16" href="groups.html" title="groups" alt="" coords="317,1173,440,1253">
-<area shape="rect" id="node18" href="item.html" title="item" alt="" coords="304,1271,453,1351">
-<area shape="rect" id="node20" href="item_id.html" title="item_id" alt="" coords="321,5,436,85">
-<area shape="rect" id="node22" href="likes.html" title="likes" alt="" coords="319,1465,439,1545">
-<area shape="rect" id="node24" href="channel.html" title="channel" alt="" coords="7,1091,196,2237">
-<area shape="rect" id="node26" href="mail.html" title="mail" alt="" coords="319,1368,439,1448">
-<area shape="rect" id="node29" href="pconfig.html" title="pconfig" alt="" coords="309,2252,448,2332">
-<area shape="rect" id="node31" href="photo.html" title="photo" alt="" coords="304,103,453,183">
-<area shape="rect" id="node33" href="profdef.html" title="profdef" alt="" coords="317,200,440,280">
-<area shape="rect" id="node35" href="profext.html" title="profext" alt="" coords="243,1563,515,1739">
-<area shape="rect" id="node39" href="profile_check.html" title="profile_check" alt="" coords="309,297,448,377">
-<area shape="rect" id="node41" href="register.html" title="register" alt="" coords="317,395,440,475">
-<area shape="rect" id="node43" href="sign.html" title="sign" alt="" coords="319,492,439,572">
-<area shape="rect" id="node45" href="sys_perms.html" title="sys_perms" alt="" coords="313,1929,444,2009">
-<area shape="rect" id="node48" href="xconfig.html" title="xconfig" alt="" coords="317,2128,440,2208">
-<area shape="rect" id="node51" href="xign.html" title="xign" alt="" coords="319,589,439,669">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/profext.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/profile.html b/hubzilla_er/tables/profile.html
deleted file mode 100644
index e439f0e0b..000000000
--- a/hubzilla_er/tables/profile.html
+++ /dev/null
@@ -1,728 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.profile</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='profile';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>profile</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="profile.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='notify.html'>notify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>profile_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>profile_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>is_default</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hide_friends</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>pdesc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>chandesc</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>dob_tz</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>UTC</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>address</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>locality</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>postal_code</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>country_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>with</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>howlong</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>politic</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>religion</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>likes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>dislikes</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>summary</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>music</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>book</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>tv</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>film</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>interest</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>romance</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>work</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>education</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>contact</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>channels</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>photo</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>thumb</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>publish</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='44 columns'>Table contained 4 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>aid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>aid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>country_name</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>country_name</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>gender</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>gender</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>profile_guid + uid</td>
-  <td class='detail'>Must be unique</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span>/<span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>guid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hide_friends</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hide_friends</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hometown</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hometown</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>is_default</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>is_default</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>locality</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>locality</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>marital</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>marital</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>postal_code</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>postal_code</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>profile_guid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>profile_guid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>publish</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>publish</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>sexual</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>sexual</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="profile.html" title="profile" alt="" coords="5,5,245,1065">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/profile.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="addon.html" title="addon" alt="" coords="248,5,368,85">
-<area shape="rect" id="node3" href="notify.html" title="notify" alt="" coords="7,445,143,843">
-<area shape="rect" id="node4" href="app.html" title="app" alt="" coords="248,103,368,183">
-<area shape="rect" id="node6" href="event.html" title="event" alt="" coords="248,200,368,280">
-<area shape="rect" id="node8" href="fserver.html" title="fserver" alt="" coords="247,297,369,377">
-<area shape="rect" id="node10" href="fsuggest.html" title="fsuggest" alt="" coords="245,395,371,475">
-<area shape="rect" id="node12" href="hook.html" title="hook" alt="" coords="248,492,368,572">
-<area shape="rect" id="node14" href="manage.html" title="manage" alt="" coords="245,589,371,669">
-<area shape="rect" id="node16" href="pconfig.html" title="pconfig" alt="" coords="239,687,377,767">
-<area shape="rect" id="node18" href="profile.html" title="profile" alt="" coords="188,783,428,1843">
-<area shape="rect" id="node20" href="spam.html" title="spam" alt="" coords="248,1860,368,1940">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/profile.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/profile_check.html b/hubzilla_er/tables/profile_check.html
deleted file mode 100644
index 72ef92044..000000000
--- a/hubzilla_er/tables/profile_check.html
+++ /dev/null
@@ -1,266 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.profile_check</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='profile_check';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>profile_check</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="profile_check.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>cid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>dfrn_id</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>sec</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='6 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>dfrn_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>dfrn_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>expire</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>expire</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>sec</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>sec</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="profile_check.html" title="profile_check" alt="" coords="5,5,227,203">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/profile_check.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="225,5,345,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,931,131,1125">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="221,103,349,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="225,200,345,280">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="224,297,347,377">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="225,395,345,475">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="212,492,359,572">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="224,589,347,669">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="211,687,360,767">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="228,784,343,864">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="225,881,345,961">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="225,979,345,1059">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="211,1076,360,1156">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="224,1173,347,1253">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="224,1271,347,1351">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="175,1367,396,1566">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="224,1583,347,1663">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="225,1680,345,1760">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="220,1777,351,1857">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="224,1875,347,1955">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="225,1972,345,2052">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/profile_check.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/register.html b/hubzilla_er/tables/register.html
deleted file mode 100644
index 42a6ec3ed..000000000
--- a/hubzilla_er/tables/register.html
+++ /dev/null
@@ -1,254 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.register</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='register';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>register</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="register.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>password</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>language</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>16</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='6 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>created</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>hash</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>hash</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="register.html" title="register" alt="" coords="7,5,231,203">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/register.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="228,5,348,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,931,131,1125">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="224,103,352,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="228,200,348,280">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="227,297,349,377">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="228,395,348,475">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="215,492,361,572">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="227,589,349,669">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="213,687,363,767">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="231,784,345,864">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="228,881,348,961">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="228,979,348,1059">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="213,1076,363,1156">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="227,1173,349,1253">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="227,1271,349,1351">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="219,1368,357,1448">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="176,1465,400,1663">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="228,1680,348,1760">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="223,1777,353,1857">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="227,1875,349,1955">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="228,1972,348,2052">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/register.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/session.html b/hubzilla_er/tables/session.html
deleted file mode 100644
index 452d1b776..000000000
--- a/hubzilla_er/tables/session.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.session</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='session';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>session</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>sid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>data</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>expire</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='4 columns'>Table contained 23 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>expire</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>expire</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>sid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>sid</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/shares.html b/hubzilla_er/tables/shares.html
deleted file mode 100644
index e370e5c9a..000000000
--- a/hubzilla_er/tables/shares.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.shares</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='shares';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>shares</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>share_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>share_type</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>share_target</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>share_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='4 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>share_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>share_target</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>share_target</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>share_type</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>share_type</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>share_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>share_xchan</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/sign.html b/hubzilla_er/tables/sign.html
deleted file mode 100644
index 3ab4d8d31..000000000
--- a/hubzilla_er/tables/sign.html
+++ /dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.sign</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='sign';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>sign</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="sign.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>retract_iid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>signed_text</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>signature</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>signer</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='6 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>iid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>iid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>retract_iid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>retract_iid</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="sign.html" title="sign" alt="" coords="7,5,281,203">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/sign.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="253,5,373,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,931,131,1125">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="249,103,377,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="253,200,373,280">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="252,297,375,377">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="253,395,373,475">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="240,492,387,572">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="252,589,375,669">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="239,687,388,767">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="256,784,371,864">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="253,881,373,961">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="253,979,373,1059">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="239,1076,388,1156">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="252,1173,375,1253">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="252,1271,375,1351">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="244,1368,383,1448">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="252,1465,375,1545">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="176,1562,451,1761">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="248,1777,379,1857">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="252,1875,375,1955">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="253,1972,373,2052">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/sign.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/site.html b/hubzilla_er/tables/site.html
deleted file mode 100644
index 0f4631eea..000000000
--- a/hubzilla_er/tables/site.html
+++ /dev/null
@@ -1,332 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.site</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='site';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>site</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>site_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>site_access</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>site_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>site_update</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>site_pull</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>site_sync</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>site_directory</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>site_register</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>site_sellpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>site_location</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>site_realm</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>site_valid</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>site_dead</td>
- <td class='detail'>smallint</td>
- <td class='detail' align='right'>5</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='13 columns'>Table contained 117 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>site_url</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>site_access</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>site_access</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>site_dead</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>site_dead</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>site_directory</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>site_directory</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>site_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>site_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>site_pull</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>site_pull</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>site_realm</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>site_realm</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>site_register</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>site_register</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>site_sellpage</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>site_sellpage</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>site_update</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>site_update</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>site_valid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>site_valid</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/source.html b/hubzilla_er/tables/source.html
deleted file mode 100644
index ac58a2798..000000000
--- a/hubzilla_er/tables/source.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.source</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='source';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>source</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>src_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>src_channel_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>src_channel_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>src_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>src_patt</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>src_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>src_channel_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>src_channel_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>src_channel_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>src_channel_xchan</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>src_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>src_xchan</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/spam.html b/hubzilla_er/tables/spam.html
deleted file mode 100644
index 9996c49cd..000000000
--- a/hubzilla_er/tables/spam.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.spam</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='spam';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>spam</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="spam.id's name implies that it's a child of notify.id, but it doesn't reference that column."><a href='notify.html'>notify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>spam</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>ham</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='6 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>ham</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>ham</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>spam</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>spam</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>term</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>term</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="spam.html" title="spam" alt="" coords="5,5,203,203">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/spam.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="addon.html" title="addon" alt="" coords="227,5,347,85">
-<area shape="rect" id="node3" href="notify.html" title="notify" alt="" coords="7,445,143,843">
-<area shape="rect" id="node4" href="app.html" title="app" alt="" coords="227,103,347,183">
-<area shape="rect" id="node6" href="event.html" title="event" alt="" coords="227,200,347,280">
-<area shape="rect" id="node8" href="fserver.html" title="fserver" alt="" coords="225,297,348,377">
-<area shape="rect" id="node10" href="fsuggest.html" title="fsuggest" alt="" coords="224,395,349,475">
-<area shape="rect" id="node12" href="hook.html" title="hook" alt="" coords="227,492,347,572">
-<area shape="rect" id="node14" href="manage.html" title="manage" alt="" coords="224,589,349,669">
-<area shape="rect" id="node16" href="pconfig.html" title="pconfig" alt="" coords="217,687,356,767">
-<area shape="rect" id="node18" href="profile.html" title="profile" alt="" coords="227,784,347,864">
-<area shape="rect" id="node20" href="spam.html" title="spam" alt="" coords="188,881,385,1079">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/spam.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/sys_perms.html b/hubzilla_er/tables/sys_perms.html
deleted file mode 100644
index 672b98166..000000000
--- a/hubzilla_er/tables/sys_perms.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.sys_perms</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='sys_perms';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>sys_perms</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="sys_perms.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="sys_perms.k's name implies that it's a child of cache.k, but it doesn't reference that column."><a href='cache.html'>cache</a><span class='relatedKey'>.k</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>public_perm</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="sys_perms.html" title="sys_perms" alt="" coords="7,5,284,181">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/sys_perms.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="263,1465,383,1545">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="9,931,135,1125">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="259,1660,387,1740">
-<area shape="rect" id="node7" href="cache.html" title="cache" alt="" coords="5,1759,139,1884">
-<area shape="rect" id="node8" href="conv.html" title="conv" alt="" coords="263,5,383,85">
-<area shape="rect" id="node10" href="fcontact.html" title="fcontact" alt="" coords="261,103,384,183">
-<area shape="rect" id="node12" href="ffinder.html" title="ffinder" alt="" coords="263,200,383,280">
-<area shape="rect" id="node14" href="group_member.html" title="group_member" alt="" coords="249,297,396,377">
-<area shape="rect" id="node16" href="groups.html" title="groups" alt="" coords="261,395,384,475">
-<area shape="rect" id="node18" href="item.html" title="item" alt="" coords="248,492,397,572">
-<area shape="rect" id="node20" href="item_id.html" title="item_id" alt="" coords="265,589,380,669">
-<area shape="rect" id="node22" href="likes.html" title="likes" alt="" coords="263,687,383,767">
-<area shape="rect" id="node24" href="mail.html" title="mail" alt="" coords="263,784,383,864">
-<area shape="rect" id="node26" href="pconfig.html" title="pconfig" alt="" coords="253,2048,392,2128">
-<area shape="rect" id="node28" href="photo.html" title="photo" alt="" coords="248,881,397,961">
-<area shape="rect" id="node30" href="profdef.html" title="profdef" alt="" coords="261,979,384,1059">
-<area shape="rect" id="node32" href="profext.html" title="profext" alt="" coords="261,1757,384,1837">
-<area shape="rect" id="node35" href="profile_check.html" title="profile_check" alt="" coords="253,1076,392,1156">
-<area shape="rect" id="node37" href="register.html" title="register" alt="" coords="261,1173,384,1253">
-<area shape="rect" id="node39" href="sign.html" title="sign" alt="" coords="263,1271,383,1351">
-<area shape="rect" id="node41" href="sys_perms.html" title="sys_perms" alt="" coords="184,1855,461,2031">
-<area shape="rect" id="node44" href="xconfig.html" title="xconfig" alt="" coords="261,1563,384,1643">
-<area shape="rect" id="node47" href="xign.html" title="xign" alt="" coords="263,1368,383,1448">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/sys_perms.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/term.html b/hubzilla_er/tables/term.html
deleted file mode 100644
index 5f1039d06..000000000
--- a/hubzilla_er/tables/term.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.term</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='term';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>term</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>tid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>aid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>oid</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>otype</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>imgurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>term_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>parent_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='11 columns'>Table contained 7 585 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>tid</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>aid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>aid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>imgurl</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>imgurl</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>oid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>oid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>otype</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>otype</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>parent_hash</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>parent_hash</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>term</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>term</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>term_hash</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>term_hash</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>type</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>type</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/tokens.html b/hubzilla_er/tables/tokens.html
deleted file mode 100644
index 0217c4f11..000000000
--- a/hubzilla_er/tables/tokens.html
+++ /dev/null
@@ -1,245 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.tokens</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='tokens';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>tokens</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>40</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="auth_codes.id's name implies that it's a child of tokens.id, but it doesn't reference that column."><a href='auth_codes.html'>auth_codes</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
-</td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>secret</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>client_id</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="tokens.client_id's name implies that it's a child of clients.client_id, but it doesn't reference that column."><a href='clients.html'>clients</a><span class='relatedKey'>.client_id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>expires</td>
- <td class='detail'>bigint unsigned</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>scope</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>200</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='6 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>client_id</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>client_id</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>expires</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>expires</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="tokens.html" title="tokens" alt="" coords="5,5,245,203">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/tokens.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="auth_codes.html" title="auth_codes" alt="" coords="468,88,599,259">
-<area shape="rect" id="node3" href="clients.html" title="clients" alt="" coords="7,121,137,314">
-<area shape="rect" id="node5" href="tokens.html" title="tokens" alt="" coords="183,5,423,203">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/tokens.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/updates.html b/hubzilla_er/tables/updates.html
deleted file mode 100644
index 78d0b01ad..000000000
--- a/hubzilla_er/tables/updates.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.updates</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='updates';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>updates</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>ud_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>ud_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>128</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>ud_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>ud_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>ud_last</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>ud_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>ud_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='7 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>ud_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>ud_addr</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>ud_addr</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>ud_date</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>ud_date</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>ud_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>ud_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>ud_guid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>ud_guid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>ud_hash</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>ud_hash</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>ud_last</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>ud_last</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/verify.html b/hubzilla_er/tables/verify.html
deleted file mode 100644
index e01eb4f62..000000000
--- a/hubzilla_er/tables/verify.html
+++ /dev/null
@@ -1,383 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.verify</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='verify';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>verify</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="attach.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='attach.html'>attach</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="config.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='config.html'>config</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="conv.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='conv.html'>conv</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="fcontact.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='fcontact.html'>fcontact</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="ffinder.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='ffinder.html'>ffinder</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="group_member.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='group_member.html'>group_member</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="groups.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='groups.html'>groups</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="item.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='item.html'>item</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="item_id.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='item_id.html'>item_id</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="likes.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='likes.html'>likes</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="mail.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='mail.html'>mail</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="photo.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='photo.html'>photo</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="profdef.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='profdef.html'>profdef</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="profext.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='profext.html'>profext</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="profile_check.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='profile_check.html'>profile_check</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="register.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='register.html'>register</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="sign.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='sign.html'>sign</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="sys_perms.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='sys_perms.html'>sys_perms</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="xconfig.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='xconfig.html'>xconfig</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="xign.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='xign.html'>xign</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
-</td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>type</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>token</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>meta</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>created</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='6 columns'>Table contained 1 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>channel</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>channel</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>created</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>created</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>meta</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>meta</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>token</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>token</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>type</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>type</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="verify.html" title="verify" alt="" coords="7,5,217,203">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/verify.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="297,776,433,1355">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="7,2493,217,2691">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="301,6451,429,6599">
-<area shape="rect" id="node7" href="cache.html" title="cache" alt="" coords="48,6580,176,6660">
-<area shape="rect" id="node8" href="conv.html" title="conv" alt="" coords="303,1371,428,1610">
-<area shape="rect" id="node10" href="fcontact.html" title="fcontact" alt="" coords="303,1626,428,2046">
-<area shape="rect" id="node12" href="ffinder.html" title="ffinder" alt="" coords="305,2062,425,2210">
-<area shape="rect" id="node14" href="group_member.html" title="group_member" alt="" coords="292,2226,439,2374">
-<area shape="rect" id="node16" href="groups.html" title="groups" alt="" coords="304,2390,427,2583">
-<area shape="rect" id="node18" href="item.html" title="item" alt="" coords="264,2600,467,4312">
-<area shape="rect" id="node20" href="item_id.html" title="item_id" alt="" coords="308,4329,423,4500">
-<area shape="rect" id="node22" href="likes.html" title="likes" alt="" coords="300,5985,431,6247">
-<area shape="rect" id="node24" href="channel.html" title="channel" alt="" coords="51,6007,173,6087">
-<area shape="rect" id="node26" href="mail.html" title="mail" alt="" coords="293,5435,437,5968">
-<area shape="rect" id="node28" href="account.html" title="account" alt="" coords="53,5547,171,5627">
-<area shape="rect" id="node31" href="photo.html" title="photo" alt="" coords="284,4517,447,5209">
-<area shape="rect" id="node33" href="profdef.html" title="profdef" alt="" coords="300,5225,431,5418">
-<area shape="rect" id="node35" href="profext.html" title="profext" alt="" coords="300,6264,431,6435">
-<area shape="rect" id="node39" href="profile_check.html" title="profile_check" alt="" coords="296,5,435,198">
-<area shape="rect" id="node41" href="register.html" title="register" alt="" coords="301,214,429,407">
-<area shape="rect" id="node43" href="sign.html" title="sign" alt="" coords="300,423,431,617">
-<area shape="rect" id="node45" href="sys_perms.html" title="sys_perms" alt="" coords="299,6616,432,6787">
-<area shape="rect" id="node48" href="xconfig.html" title="xconfig" alt="" coords="304,6804,427,6975">
-<area shape="rect" id="node51" href="xign.html" title="xign" alt="" coords="305,633,425,759">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/verify.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/vote.html b/hubzilla_er/tables/vote.html
deleted file mode 100644
index 641c39857..000000000
--- a/hubzilla_er/tables/vote.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.vote</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='vote';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>vote</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>vote_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>vote_poll</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>vote_element</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>vote_result</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>vote_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>vote_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>vote_element</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>vote_element</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>vote_poll</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>vote_poll</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>vote_poll + vote_element + vote_xchan</td>
-  <td class='detail'>Must be unique</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span>/<span title='Ascending'>Asc</span>/<span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>vote_vote</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/xchan.html b/hubzilla_er/tables/xchan.html
deleted file mode 100644
index 97be20010..000000000
--- a/hubzilla_er/tables/xchan.html
+++ /dev/null
@@ -1,511 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.xchan</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='xchan';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>xchan</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>xchan_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan_guid</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>xchan_guid_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>xchan_pubkey</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>xchan_photo_mimetype</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>image/jpeg</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>xchan_photo_l</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>xchan_photo_m</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>xchan_photo_s</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xchan_addr</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xchan_connurl</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan_follow</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>xchan_connpage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan_name</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xchan_network</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan_instance_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xchan_flags</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>xchan_photo_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>xchan_name_date</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan_hidden</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xchan_orphan</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan_censored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xchan_selfcensored</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan_system</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xchan_pubforum</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan_deleted</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='26 columns'>Table contained 1 168 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>xchan_hash</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_addr</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_addr</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_censored</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_censored</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_connurl</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_connurl</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_deleted</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_deleted</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_follow</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_follow</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_guid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_guid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_hidden</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_hidden</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_instance_url</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_instance_url</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_name</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_name</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_network</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_network</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_orphan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_orphan</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_pubforum</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_pubforum</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_selfcensored</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_selfcensored</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_system</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_system</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan_url</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan_url</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/xchat.html b/hubzilla_er/tables/xchat.html
deleted file mode 100644
index 707f80199..000000000
--- a/hubzilla_er/tables/xchat.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.xchat</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='xchat';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>xchat</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>xchat_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchat_url</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xchat_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchat_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xchat_edited</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>xchat_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchat_desc</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchat_desc</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchat_edited</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchat_edited</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchat_url</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchat_url</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchat_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchat_xchan</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/xconfig.html b/hubzilla_er/tables/xconfig.html
deleted file mode 100644
index c3e3c453a..000000000
--- a/hubzilla_er/tables/xconfig.html
+++ /dev/null
@@ -1,254 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.xconfig</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='xconfig';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>xconfig</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative even' valign='top'>
-    <td class='relatedTable detail' title="xconfig.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>cat</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>k</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="xconfig.k's name implies that it's a child of cache.k, but it doesn't reference that column."><a href='cache.html'>cache</a><span class='relatedKey'>.k</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>v</td>
- <td class='detail'>mediumtext</td>
- <td class='detail' align='right'>16777215</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='5 columns'>Table contained 4 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>cat</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>cat</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>k</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>k</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="xconfig.html" title="xconfig" alt="" coords="5,5,269,181">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/xconfig.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="255,1465,375,1545">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="9,931,135,1125">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="251,1756,379,1836">
-<area shape="rect" id="node7" href="cache.html" title="cache" alt="" coords="5,1855,139,1980">
-<area shape="rect" id="node8" href="conv.html" title="conv" alt="" coords="255,5,375,85">
-<area shape="rect" id="node10" href="fcontact.html" title="fcontact" alt="" coords="253,103,376,183">
-<area shape="rect" id="node12" href="ffinder.html" title="ffinder" alt="" coords="255,200,375,280">
-<area shape="rect" id="node14" href="group_member.html" title="group_member" alt="" coords="241,297,388,377">
-<area shape="rect" id="node16" href="groups.html" title="groups" alt="" coords="253,395,376,475">
-<area shape="rect" id="node18" href="item.html" title="item" alt="" coords="240,492,389,572">
-<area shape="rect" id="node20" href="item_id.html" title="item_id" alt="" coords="257,589,372,669">
-<area shape="rect" id="node22" href="likes.html" title="likes" alt="" coords="255,687,375,767">
-<area shape="rect" id="node24" href="mail.html" title="mail" alt="" coords="255,784,375,864">
-<area shape="rect" id="node26" href="pconfig.html" title="pconfig" alt="" coords="245,2048,384,2128">
-<area shape="rect" id="node28" href="photo.html" title="photo" alt="" coords="240,881,389,961">
-<area shape="rect" id="node30" href="profdef.html" title="profdef" alt="" coords="253,979,376,1059">
-<area shape="rect" id="node32" href="profext.html" title="profext" alt="" coords="253,1853,376,1933">
-<area shape="rect" id="node35" href="profile_check.html" title="profile_check" alt="" coords="245,1076,384,1156">
-<area shape="rect" id="node37" href="register.html" title="register" alt="" coords="253,1173,376,1253">
-<area shape="rect" id="node39" href="sign.html" title="sign" alt="" coords="255,1271,375,1351">
-<area shape="rect" id="node41" href="sys_perms.html" title="sys_perms" alt="" coords="249,1951,380,2031">
-<area shape="rect" id="node44" href="xconfig.html" title="xconfig" alt="" coords="183,1563,447,1739">
-<area shape="rect" id="node47" href="xign.html" title="xign" alt="" coords="255,1368,375,1448">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/xconfig.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/xign.html b/hubzilla_er/tables/xign.html
deleted file mode 100644
index a8d430c34..000000000
--- a/hubzilla_er/tables/xign.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.xign</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='xign';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>xign</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='implied'><input type=checkbox id='implied' checked>Implied relationships</label>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'>
-  <table border='0' width='100%' cellspacing='0' cellpadding='0'>
-   <tr class='impliedRelationship relative odd' valign='top'>
-    <td class='relatedTable detail' title="xign.id's name implies that it's a child of verify.id, but it doesn't reference that column."><a href='verify.html'>verify</a><span class='relatedKey'>.id</span>
-    </td>
-    <td class='constraint detail'>Implied Constraint<span title='Restrict delete:
- Parent cannot be deleted if children exist'>&nbsp;R</span></td>
-   </tr>
-  </table>
- </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>uid</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='3 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>uid</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>uid</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xchan</td>
- </tr>
-</table>
-</div>
-<table width='100%' border='0'><tr><td class='container'>
-<br><form action='get'><b>Close relationships:</b></form><map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="xign.html" title="xign" alt="" coords="5,5,224,136">
-</map>
-  <a name='diagram'><img id='oneDegreeImg' src='../diagrams/xign.1degree.png' usemap='#oneDegreeRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-<map id="impliedTwoDegreesRelationshipsDiagram" name="impliedTwoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="attach.html" title="attach" alt="" coords="224,5,344,85">
-<area shape="rect" id="node3" href="verify.html" title="verify" alt="" coords="5,931,131,1125">
-<area shape="rect" id="node4" href="config.html" title="config" alt="" coords="220,103,348,183">
-<area shape="rect" id="node6" href="conv.html" title="conv" alt="" coords="224,200,344,280">
-<area shape="rect" id="node8" href="fcontact.html" title="fcontact" alt="" coords="223,297,345,377">
-<area shape="rect" id="node10" href="ffinder.html" title="ffinder" alt="" coords="224,395,344,475">
-<area shape="rect" id="node12" href="group_member.html" title="group_member" alt="" coords="211,492,357,572">
-<area shape="rect" id="node14" href="groups.html" title="groups" alt="" coords="223,589,345,669">
-<area shape="rect" id="node16" href="item.html" title="item" alt="" coords="209,687,359,767">
-<area shape="rect" id="node18" href="item_id.html" title="item_id" alt="" coords="227,784,341,864">
-<area shape="rect" id="node20" href="likes.html" title="likes" alt="" coords="224,881,344,961">
-<area shape="rect" id="node22" href="mail.html" title="mail" alt="" coords="224,979,344,1059">
-<area shape="rect" id="node24" href="photo.html" title="photo" alt="" coords="209,1076,359,1156">
-<area shape="rect" id="node26" href="profdef.html" title="profdef" alt="" coords="223,1173,345,1253">
-<area shape="rect" id="node28" href="profext.html" title="profext" alt="" coords="223,1271,345,1351">
-<area shape="rect" id="node30" href="profile_check.html" title="profile_check" alt="" coords="215,1368,353,1448">
-<area shape="rect" id="node32" href="register.html" title="register" alt="" coords="223,1465,345,1545">
-<area shape="rect" id="node34" href="sign.html" title="sign" alt="" coords="224,1563,344,1643">
-<area shape="rect" id="node36" href="sys_perms.html" title="sys_perms" alt="" coords="219,1660,349,1740">
-<area shape="rect" id="node38" href="xconfig.html" title="xconfig" alt="" coords="223,1757,345,1837">
-<area shape="rect" id="node40" href="xign.html" title="xign" alt="" coords="175,1855,393,1985">
-</map>
-
-  <a name='diagram'><img id='impliedTwoDegreesImg' src='../diagrams/xign.implied2degrees.png' usemap='#impliedTwoDegreesRelationshipsDiagram' class='diagram' border='0' alt='' align='left'></a>
-</td></tr></table>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/xlink.html b/hubzilla_er/tables/xlink.html
deleted file mode 100644
index 8b4c81ad7..000000000
--- a/hubzilla_er/tables/xlink.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.xlink</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='xlink';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>xlink</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>xlink_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xlink_xchan</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xlink_link</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xlink_rating</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>xlink_rating_text</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xlink_updated</td>
- <td class='detail'>datetime</td>
- <td class='detail' align='right'>19</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0000-00-00 00:00:00</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xlink_static</td>
- <td class='detail'>bit</td>
- <td class='detail' align='right'>0</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>xlink_sig</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='8 columns'>Table contained 244 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>xlink_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xlink_link</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xlink_link</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xlink_rating</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xlink_rating</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xlink_static</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xlink_static</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xlink_updated</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xlink_updated</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xlink_xchan</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xlink_xchan</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/xperm.html b/hubzilla_er/tables/xperm.html
deleted file mode 100644
index 466a84bfa..000000000
--- a/hubzilla_er/tables/xperm.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.xperm</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='xperm';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>xperm</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>xp_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xp_client</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>20</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xp_channel</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xp_perm</td>
- <td class='detail'>varchar</td>
- <td class='detail' align='right'>64</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='4 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>xp_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xp_channel</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xp_channel</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xp_client</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xp_client</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xp_perm</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xp_perm</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/xprof.html b/hubzilla_er/tables/xprof.html
deleted file mode 100644
index c5d7695fb..000000000
--- a/hubzilla_er/tables/xprof.html
+++ /dev/null
@@ -1,360 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.xprof</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='xprof';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>xprof</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='even'>
- <td class='primaryKey' title='Primary Key'>xprof_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xprof_age</td>
- <td class='detail'>tinyint unsigned</td>
- <td class='detail' align='right'>3</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xprof_desc</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xprof_dob</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>12</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xprof_gender</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xprof_marital</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xprof_sexual</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xprof_locale</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xprof_region</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xprof_postcode</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>32</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xprof_country</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>xprof_keywords</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='detail'>xprof_about</td>
- <td class='detail'>text</td>
- <td class='detail' align='right'>65535</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='detail'>xprof_homepage</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xprof_hometown</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='15 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>xprof_hash</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xprof_age</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xprof_age</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xprof_country</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xprof_country</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xprof_desc</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xprof_desc</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xprof_dob</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xprof_dob</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xprof_gender</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xprof_gender</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xprof_hometown</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xprof_hometown</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xprof_locale</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xprof_locale</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xprof_marital</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xprof_marital</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xprof_postcode</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xprof_postcode</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xprof_region</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xprof_region</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xprof_sexual</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xprof_sexual</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/tables/xtag.html b/hubzilla_er/tables/xtag.html
deleted file mode 100644
index bdd04c26e..000000000
--- a/hubzilla_er/tables/xtag.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - Table zot.xtag</title>
-  <link rel=stylesheet href='../schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='../schemaSpy.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript'>
-    table='xtag';
-  </SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='../index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='../relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li><a href='../utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='../constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='../anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='../columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>Table <span title='Database'>zot</span>.<span title='Table'>xtag</span></span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table width='100%' border='0'>
-<tr valign='top'><td class='container' align='left' valign='top'>
-<form name='options' action=''>
- <label for='showRelatedCols'><input type=checkbox id='showRelatedCols'>Related columns</label>
- <label for='showConstNames'><input type=checkbox id='showConstNames'>Constraints</label>
- <label for='showComments'><input type=checkbox id='showComments'>Comments</label>
- <label for='showLegend'><input type=checkbox checked id='showLegend'>Legend</label>
-</form>
-</td><td class='container' rowspan='2' align='right' valign='top'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr class='impliedRelationship'><td class='detail'><span class='impliedRelationship'>Implied relationships</span></td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td><tr valign='top'><td class='container' align='left' valign='top'>
-<a name='columns'></a>
-<table id='columns' class='dataTable' border='1' rules='groups'>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup>
-<colgroup class='comment'>
-<thead align='left'>
-<tr>
-  <th>Column</th>
-  <th>Type</th>
-  <th>Size</th>
-  <th title='Are nulls allowed?'>Nulls</th>
-  <th title='Is column automatically updated?'>Auto</th>
-  <th title='Default value'>Default</th>
-  <th title='Columns in tables that reference this column'><span class='notSortedByColumn'>Children</span></th>
-  <th title='Columns in tables that are referenced by this column'><span class='notSortedByColumn'>Parents</span></th>
-  <th title='Comments' class='comment'><span class='notSortedByColumn'>Comments</span></th>
-</tr>
-</thead>
-<tbody valign='top'>
-<tr class='odd'>
- <td class='primaryKey' title='Primary Key'>xtag_id</td>
- <td class='detail'>int unsigned</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center' title='Automatically updated by the database'>&nbsp;&radic;&nbsp;</td>
- <td class='detail'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xtag_hash</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='odd'>
- <td class='indexedColumn' title='Indexed'>xtag_term</td>
- <td class='detail'>char</td>
- <td class='detail' align='right'>255</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'></td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-<tr class='even'>
- <td class='indexedColumn' title='Indexed'>xtag_flags</td>
- <td class='detail'>int</td>
- <td class='detail' align='right'>10</td>
- <td class='detail' align='center'></td>
- <td class='detail' align='center'></td>
- <td class='detail' align='right'>0</td>
- <td class='detail'></td>
- <td class='detail'> </td>
- <td class='comment detail'></td>
-</tr>
-</table>
-<p title='4 columns'>Table contained 0 rows at on aug 19 21:08 CEST 2015<p/>
-</td></tr></table>
-<div class='indent'>
-<b>Indexes:</b>
-<table class='dataTable' border='1' rules='groups'><colgroup><colgroup><colgroup><colgroup>
-<thead>
- <tr>
-  <th>Column(s)</th>
-  <th>Type</th>
-  <th>Sort</th>
-  <th class='constraint' style='text-align:left;'>Constraint Name</th>
- </tr>
-</thead>
-<tbody>
- <tr>
-  <td class='primaryKey'>xtag_id</td>
-  <td class='detail'>Primary key</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>PRIMARY</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xtag_flags</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xtag_flags</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xtag_hash</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xtag_hash</td>
- </tr>
- <tr>
-  <td class='indexedColumn'>xtag_term</td>
-  <td class='detail'>Performance</td>
-  <td class='detail' style='text-align:left;'><span title='Ascending'>Asc</span></td>
-  <td class='constraint' style='text-align:left;'>xtag_term</td>
- </tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/updateschemaspy.sh b/hubzilla_er/updateschemaspy.sh
deleted file mode 100755
index 271591729..000000000
--- a/hubzilla_er/updateschemaspy.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# Use schemaSpy to generate HTML-reports about tables in Hubzilla running on OpenShift.
-# You will need to port-forward your app on OpenShift, like this
-# rhc port-forward zot  
-java -jar /home/haakon/Nedlastinger/schemaSpy_5.0.0.jar -t mysql -host 127.0.0.1:3306 -db zot -u adminkwvcHXy -p g66nhPmZ9b52 -dp /home/haakon/Nedlastinger/mysql-connector-java-5.1.17.jar -o .
diff --git a/hubzilla_er/utilities.html b/hubzilla_er/utilities.html
deleted file mode 100644
index 647e748ab..000000000
--- a/hubzilla_er/utilities.html
+++ /dev/null
@@ -1,334 +0,0 @@
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html>
-<head>
-  <!-- SchemaSpy rev 590 -->
-  <title>SchemaSpy - zot - Utility Tables</title>
-  <link rel=stylesheet href='schemaSpy.css' type='text/css'>
-  <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='jquery.js'></SCRIPT>
-  <SCRIPT LANGUAGE='JavaScript' TYPE='text/javascript' SRC='schemaSpy.js'></SCRIPT>
-</head>
-<body>
-<table id='headerHolder' cellspacing='0' cellpadding='0'><tr><td>
-<div id='header'>
- <ul>
-  <li><a href='index.html' title='All tables and views in the schema'>Tables</a></li>
-  <li><a href='relationships.html' title='Diagram of table relationships'>Relationships</a></li>
-  <li id='current'><a href='utilities.html' title='View of tables with neither parents nor children'>Utility&nbsp;Tables</a></li>
-  <li><a href='constraints.html' title='Useful for diagnosing error messages that just give constraint name or number'>Constraints</a></li>
-  <li><a href='anomalies.html' title="Things that might not be quite right">Anomalies</a></li>
-  <li><a href='columns.byTable.html' title="All of the columns in the schema">Columns</a></li>
-  <li><a href='http://sourceforge.net/donate/index.php?group_id=137197' title='Please help keep SchemaSpy alive' target='_blank'>Donate</a></li>
- </ul>
-</div>
-</td></tr></table>
-<div class='content' style='clear:both;'>
-<table width='100%' border='0' cellpadding='0'>
- <tr>
-  <td class='heading' valign='middle'><span class='header'>SchemaSpy Analysis of <span title='Database'>zot</span> - Utility Tables</span></td>
-  <td class='heading' align='right' valign='top' title='John Currier - Creator of Cool Tools'><span class='indent'>Generated by</span><br><span class='indent'><span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span></span></td>
- </tr>
-</table>
-<table class='container' width='100%'>
-<tr><td class='container'>
-<span class='container'>Generated by <span class='signature'><a href='http://schemaspy.sourceforge.net' target='_blank'>SchemaSpy</a></span> on on aug 19 21:08 CEST 2015</span>
-</td>
-<td class='container' align='right' valign='top' rowspan='2'>
- <table class='legend' border='0'>
-  <tr>
-   <td class='dataTable' valign='bottom'>Legend:</td>
-   <td class='container' align='right' valign='top'><a href='http://sourceforge.net' target='_blank'><img src='http://sourceforge.net/sflogo.php?group_id=137197&amp;type=1' alt='SourceForge.net' border='0' height='31' width='88'></a></td>
-  </tr>
-  <tr><td class='container' colspan='2'>
-   <table class='dataTable' border='1'>
-    <tbody>
-    <tr><td class='primaryKey'>Primary key columns</td></tr>
-    <tr><td class='indexedColumn'>Columns with indexes</td></tr>
-    <tr><td class='excludedColumn'>Excluded column relationships</td></tr>
-    <tr class='impliedRelationship'><td class='legendDetail'>Dashed lines show implied relationships</td></tr>
-    <tr><td class='legendDetail'>&lt; <em>n</em> &gt; number of related tables</td></tr>
-   </table>
-  </td></tr>
- </table>
-<div style="margin-right: 2pt;">
-<script type="text/javascript"><!--
-google_ad_client = "pub-9598353634003340";
-google_ad_channel ="SchemaSpy-generated";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_type = "text";
-google_color_border = "9bab96";
-google_color_link = "489148";
-google_color_text = "000000";
-//-->
-</script>
-<script type="text/javascript"
-src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-</div>
-&nbsp;
-</td></tr>
-<tr><td class='container' align='left' valign='top'>
-<form action=''>
- <label for='removeImpliedOrphans'><input type=checkbox id='removeImpliedOrphans'>
-  Hide tables with implied relationships</label>
-</form>
-</td></tr></table>
-<a name='diagram'>
-  <img src='diagrams/summary/abook.1degree.png' usemap='#abook' border='0' alt='' align='top'>
-  <img src='diagrams/summary/account.1degree.png' usemap='#account' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/addon.1degree.png' usemap='#addon' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/app.1degree.png' usemap='#app' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/attach.1degree.png' usemap='#attach' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/auth_codes.1degree.png' usemap='#auth_codes' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/cache.1degree.png' usemap='#cache' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/channel.1degree.png' usemap='#channel' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/chat.1degree.png' usemap='#chat' border='0' alt='' align='top'>
-  <img src='diagrams/summary/chatpresence.1degree.png' usemap='#chatpresence' border='0' alt='' align='top'>
-  <img src='diagrams/summary/chatroom.1degree.png' usemap='#chatroom' border='0' alt='' align='top'>
-  <img src='diagrams/summary/clients.1degree.png' usemap='#clients' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/config.1degree.png' usemap='#config' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/conv.1degree.png' usemap='#conv' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/event.1degree.png' usemap='#event' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/fcontact.1degree.png' usemap='#fcontact' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/ffinder.1degree.png' usemap='#ffinder' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/fserver.1degree.png' usemap='#fserver' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/fsuggest.1degree.png' usemap='#fsuggest' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/group_member.1degree.png' usemap='#group_member' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/groups.1degree.png' usemap='#groups' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/hook.1degree.png' usemap='#hook' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/hubloc.1degree.png' usemap='#hubloc' border='0' alt='' align='top'>
-  <img src='diagrams/summary/issue.1degree.png' usemap='#issue' border='0' alt='' align='top'>
-  <img src='diagrams/summary/item.1degree.png' usemap='#item' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/item_id.1degree.png' usemap='#item_id' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/likes.1degree.png' usemap='#likes' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/mail.1degree.png' usemap='#mail' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/manage.1degree.png' usemap='#manage' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/menu.1degree.png' usemap='#menu' border='0' alt='' align='top'>
-  <img src='diagrams/summary/menu_item.1degree.png' usemap='#menu_item' border='0' alt='' align='top'>
-  <img src='diagrams/summary/notify.1degree.png' usemap='#notify' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/obj.1degree.png' usemap='#obj' border='0' alt='' align='top'>
-  <img src='diagrams/summary/outq.1degree.png' usemap='#outq' border='0' alt='' align='top'>
-  <img src='diagrams/summary/pconfig.1degree.png' usemap='#pconfig' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/photo.1degree.png' usemap='#photo' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/poll.1degree.png' usemap='#poll' border='0' alt='' align='top'>
-  <img src='diagrams/summary/poll_elm.1degree.png' usemap='#poll_elm' border='0' alt='' align='top'>
-  <img src='diagrams/summary/profdef.1degree.png' usemap='#profdef' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/profext.1degree.png' usemap='#profext' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/profile.1degree.png' usemap='#profile' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/profile_check.1degree.png' usemap='#profile_check' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/register.1degree.png' usemap='#register' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/session.1degree.png' usemap='#session' border='0' alt='' align='top'>
-  <img src='diagrams/summary/shares.1degree.png' usemap='#shares' border='0' alt='' align='top'>
-  <img src='diagrams/summary/sign.1degree.png' usemap='#sign' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/site.1degree.png' usemap='#site' border='0' alt='' align='top'>
-  <img src='diagrams/summary/source.1degree.png' usemap='#source' border='0' alt='' align='top'>
-  <img src='diagrams/summary/spam.1degree.png' usemap='#spam' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/sys_perms.1degree.png' usemap='#sys_perms' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/term.1degree.png' usemap='#term' border='0' alt='' align='top'>
-  <img src='diagrams/summary/tokens.1degree.png' usemap='#tokens' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/updates.1degree.png' usemap='#updates' border='0' alt='' align='top'>
-  <img src='diagrams/summary/verify.1degree.png' usemap='#verify' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/vote.1degree.png' usemap='#vote' border='0' alt='' align='top'>
-  <img src='diagrams/summary/xchan.1degree.png' usemap='#xchan' border='0' alt='' align='top'>
-  <img src='diagrams/summary/xchat.1degree.png' usemap='#xchat' border='0' alt='' align='top'>
-  <img src='diagrams/summary/xconfig.1degree.png' usemap='#xconfig' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/xign.1degree.png' usemap='#xign' border='0' alt='' align='top' class='impliedNotOrphan'>
-  <img src='diagrams/summary/xlink.1degree.png' usemap='#xlink' border='0' alt='' align='top'>
-  <img src='diagrams/summary/xperm.1degree.png' usemap='#xperm' border='0' alt='' align='top'>
-  <img src='diagrams/summary/xprof.1degree.png' usemap='#xprof' border='0' alt='' align='top'>
-  <img src='diagrams/summary/xtag.1degree.png' usemap='#xtag' border='0' alt='' align='top'>
-<map id="abook" name="abook">
-<area shape="rect" id="node1" href="tables/abook.html" title="abook" alt="" coords="5,5,181,584">
-</map>
-<map id="account" name="account">
-<area shape="rect" id="node1" href="tables/account.html" title="account" alt="" coords="7,5,220,470">
-</map>
-<map id="addon" name="addon">
-<area shape="rect" id="node1" href="tables/addon.html" title="addon" alt="" coords="5,5,144,221">
-</map>
-<map id="app" name="app">
-<area shape="rect" id="node1" href="tables/app.html" title="app" alt="" coords="5,5,144,379">
-</map>
-<map id="attach" name="attach">
-<area shape="rect" id="node1" href="tables/attach.html" title="attach" alt="" coords="5,5,141,584">
-</map>
-<map id="auth_codes" name="auth_codes">
-<area shape="rect" id="node1" href="tables/auth_codes.html" title="auth_codes" alt="" coords="5,5,136,176">
-</map>
-<map id="cache" name="cache">
-<area shape="rect" id="node1" href="tables/cache.html" title="cache" alt="" coords="5,5,131,131">
-</map>
-<map id="channel" name="channel">
-<area shape="rect" id="node1" href="tables/channel.html" title="channel" alt="" coords="7,5,196,1150">
-</map>
-<map id="chat" name="chat">
-<area shape="rect" id="node1" href="tables/chat.html" title="chat" alt="" coords="5,5,136,176">
-</map>
-<map id="chatpresence" name="chatpresence">
-<area shape="rect" id="node1" href="tables/chatpresence.html" title="chatpresence" alt="" coords="7,5,137,198">
-</map>
-<map id="chatroom" name="chatroom">
-<area shape="rect" id="node1" href="tables/chatroom.html" title="chatroom" alt="" coords="5,5,133,312">
-</map>
-<map id="clients" name="clients">
-<area shape="rect" id="node1" href="tables/clients.html" title="clients" alt="" coords="5,5,136,198">
-</map>
-<map id="config" name="config">
-<area shape="rect" id="node1" href="tables/config.html" title="config" alt="" coords="5,5,123,153">
-</map>
-<map id="conv" name="conv">
-<area shape="rect" id="node1" href="tables/conv.html" title="conv" alt="" coords="5,5,123,243">
-</map>
-<map id="event" name="event">
-<area shape="rect" id="node1" href="tables/event.html" title="event" alt="" coords="5,5,165,629">
-</map>
-<map id="fcontact" name="fcontact">
-<area shape="rect" id="node1" href="tables/fcontact.html" title="fcontact" alt="" coords="5,5,123,425">
-</map>
-<map id="ffinder" name="ffinder">
-<area shape="rect" id="node1" href="tables/ffinder.html" title="ffinder" alt="" coords="5,5,115,153">
-</map>
-<map id="fserver" name="fserver">
-<area shape="rect" id="node1" href="tables/fserver.html" title="fserver" alt="" coords="5,5,117,153">
-</map>
-<map id="fsuggest" name="fsuggest">
-<area shape="rect" id="node1" href="tables/fsuggest.html" title="fsuggest" alt="" coords="5,5,123,267">
-</map>
-<map id="group_member" name="group_member">
-<area shape="rect" id="node1" href="tables/group_member.html" title="group_member" alt="" coords="5,5,152,153">
-</map>
-<map id="groups" name="groups">
-<area shape="rect" id="node1" href="tables/groups.html" title="groups" alt="" coords="5,5,117,198">
-</map>
-<map id="hook" name="hook">
-<area shape="rect" id="node1" href="tables/hook.html" title="hook" alt="" coords="5,5,120,176">
-</map>
-<map id="hubloc" name="hubloc">
-<area shape="rect" id="node1" href="tables/hubloc.html" title="hubloc" alt="" coords="7,5,204,515">
-</map>
-<map id="issue" name="issue">
-<area shape="rect" id="node1" href="tables/issue.html" title="issue" alt="" coords="5,5,163,221">
-</map>
-<map id="item" name="item">
-<area shape="rect" id="node1" href="tables/item.html" title="item" alt="" coords="7,5,209,1717">
-</map>
-<map id="item_id" name="item_id">
-<area shape="rect" id="node1" href="tables/item_id.html" title="item_id" alt="" coords="7,5,111,176">
-</map>
-<map id="likes" name="likes">
-<area shape="rect" id="node1" href="tables/likes.html" title="likes" alt="" coords="5,5,136,267">
-</map>
-<map id="mail" name="mail">
-<area shape="rect" id="node1" href="tables/mail.html" title="mail" alt="" coords="5,5,149,539">
-</map>
-<map id="manage" name="manage">
-<area shape="rect" id="node1" href="tables/manage.html" title="manage" alt="" coords="5,5,123,131">
-</map>
-<map id="menu" name="menu">
-<area shape="rect" id="node1" href="tables/menu.html" title="menu" alt="" coords="7,5,156,221">
-</map>
-<map id="menu_item" name="menu_item">
-<area shape="rect" id="node1" href="tables/menu_item.html" title="menu_item" alt="" coords="7,5,159,312">
-</map>
-<map id="notify" name="notify">
-<area shape="rect" id="node1" href="tables/notify.html" title="notify" alt="" coords="5,5,123,403">
-</map>
-<map id="obj" name="obj">
-<area shape="rect" id="node1" href="tables/obj.html" title="obj" alt="" coords="5,5,139,289">
-</map>
-<map id="outq" name="outq">
-<area shape="rect" id="node1" href="tables/outq.html" title="outq" alt="" coords="5,5,149,334">
-</map>
-<map id="pconfig" name="pconfig">
-<area shape="rect" id="node1" href="tables/pconfig.html" title="pconfig" alt="" coords="5,5,133,176">
-</map>
-<map id="photo" name="photo">
-<area shape="rect" id="node1" href="tables/photo.html" title="photo" alt="" coords="7,5,169,697">
-</map>
-<map id="poll" name="poll">
-<area shape="rect" id="node1" href="tables/poll.html" title="poll" alt="" coords="5,5,141,176">
-</map>
-<map id="poll_elm" name="poll_elm">
-<area shape="rect" id="node1" href="tables/poll_elm.html" title="poll_elm" alt="" coords="5,5,136,176">
-</map>
-<map id="profdef" name="profdef">
-<area shape="rect" id="node1" href="tables/profdef.html" title="profdef" alt="" coords="5,5,136,198">
-</map>
-<map id="profext" name="profext">
-<area shape="rect" id="node1" href="tables/profext.html" title="profext" alt="" coords="5,5,133,176">
-</map>
-<map id="profile" name="profile">
-<area shape="rect" id="node1" href="tables/profile.html" title="profile" alt="" coords="5,5,147,1059">
-</map>
-<map id="profile_check" name="profile_check">
-<area shape="rect" id="node1" href="tables/profile_check.html" title="profile_check" alt="" coords="5,5,144,198">
-</map>
-<map id="register" name="register">
-<area shape="rect" id="node1" href="tables/register.html" title="register" alt="" coords="5,5,128,198">
-</map>
-<map id="session" name="session">
-<area shape="rect" id="node1" href="tables/session.html" title="session" alt="" coords="5,5,128,153">
-</map>
-<map id="shares" name="shares">
-<area shape="rect" id="node1" href="tables/shares.html" title="shares" alt="" coords="5,5,141,153">
-</map>
-<map id="sign" name="sign">
-<area shape="rect" id="node1" href="tables/sign.html" title="sign" alt="" coords="5,5,136,198">
-</map>
-<map id="site" name="site">
-<area shape="rect" id="node1" href="tables/site.html" title="site" alt="" coords="5,5,160,357">
-</map>
-<map id="source" name="source">
-<area shape="rect" id="node1" href="tables/source.html" title="source" alt="" coords="5,5,168,176">
-</map>
-<map id="spam" name="spam">
-<area shape="rect" id="node1" href="tables/spam.html" title="spam" alt="" coords="5,5,115,198">
-</map>
-<map id="sys_perms" name="sys_perms">
-<area shape="rect" id="node1" href="tables/sys_perms.html" title="sys_perms" alt="" coords="5,5,139,176">
-</map>
-<map id="term" name="term">
-<area shape="rect" id="node1" href="tables/term.html" title="term" alt="" coords="7,5,169,312">
-</map>
-<map id="tokens" name="tokens">
-<area shape="rect" id="node1" href="tables/tokens.html" title="tokens" alt="" coords="5,5,123,198">
-</map>
-<map id="updates" name="updates">
-<area shape="rect" id="node1" href="tables/updates.html" title="updates" alt="" coords="5,5,123,221">
-</map>
-<map id="verify" name="verify">
-<area shape="rect" id="node1" href="tables/verify.html" title="verify" alt="" coords="7,5,113,198">
-</map>
-<map id="vote" name="vote">
-<area shape="rect" id="node1" href="tables/vote.html" title="vote" alt="" coords="5,5,144,176">
-</map>
-<map id="xchan" name="xchan">
-<area shape="rect" id="node1" href="tables/xchan.html" title="xchan" alt="" coords="7,5,217,651">
-</map>
-<map id="xchat" name="xchat">
-<area shape="rect" id="node1" href="tables/xchat.html" title="xchat" alt="" coords="5,5,141,176">
-</map>
-<map id="xconfig" name="xconfig">
-<area shape="rect" id="node1" href="tables/xconfig.html" title="xconfig" alt="" coords="5,5,117,176">
-</map>
-<map id="xign" name="xign">
-<area shape="rect" id="node1" href="tables/xign.html" title="xign" alt="" coords="5,5,115,131">
-</map>
-<map id="xlink" name="xlink">
-<area shape="rect" id="node1" href="tables/xlink.html" title="xlink" alt="" coords="5,5,171,243">
-</map>
-<map id="xperm" name="xperm">
-<area shape="rect" id="node1" href="tables/xperm.html" title="xperm" alt="" coords="5,5,136,153">
-</map>
-<map id="xprof" name="xprof">
-<area shape="rect" id="node1" href="tables/xprof.html" title="xprof" alt="" coords="5,5,160,403">
-</map>
-<map id="xtag" name="xtag">
-<area shape="rect" id="node1" href="tables/xtag.html" title="xtag" alt="" coords="5,5,131,153">
-</map>
-</a>
-</div>
-</body>
-</html>
diff --git a/hubzilla_er/zot.xml b/hubzilla_er/zot.xml
deleted file mode 100644
index c1450b4fc..000000000
--- a/hubzilla_er/zot.xml
+++ /dev/null
@@ -1,2477 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<database name="zot" type="MySQL - 5.5.45">
-   <tables>
-      <table name="abook" numRows="12" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="abook_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="abook_account" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="abook_channel" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="abook_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="4" name="abook_my_perms" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="5" name="abook_their_perms" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="99" digits="0" id="6" name="abook_closeness" nullable="false" remarks="" size="3" type="TINYINT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="7" name="abook_created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="8" name="abook_updated" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="9" name="abook_connected" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="10" name="abook_dob" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="11" name="abook_flags" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="12" name="abook_blocked" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="13" name="abook_ignored" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="14" name="abook_hidden" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="15" name="abook_archived" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="16" name="abook_pending" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="17" name="abook_unconnected" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="18" name="abook_self" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="19" name="abook_feed" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="20" name="abook_profile" nullable="false" remarks="" size="64" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="21" name="abook_incl" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="22" name="abook_excl" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <primaryKey column="abook_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="abook_id"/>
-         </index>
-         <index name="abook_account" unique="false">
-            <column ascending="true" name="abook_account"/>
-         </index>
-         <index name="abook_archived" unique="false">
-            <column ascending="true" name="abook_archived"/>
-         </index>
-         <index name="abook_blocked" unique="false">
-            <column ascending="true" name="abook_blocked"/>
-         </index>
-         <index name="abook_channel" unique="false">
-            <column ascending="true" name="abook_channel"/>
-         </index>
-         <index name="abook_closeness" unique="false">
-            <column ascending="true" name="abook_closeness"/>
-         </index>
-         <index name="abook_connected" unique="false">
-            <column ascending="true" name="abook_connected"/>
-         </index>
-         <index name="abook_created" unique="false">
-            <column ascending="true" name="abook_created"/>
-         </index>
-         <index name="abook_dob" unique="false">
-            <column ascending="true" name="abook_dob"/>
-         </index>
-         <index name="abook_feed" unique="false">
-            <column ascending="true" name="abook_feed"/>
-         </index>
-         <index name="abook_flags" unique="false">
-            <column ascending="true" name="abook_flags"/>
-         </index>
-         <index name="abook_hidden" unique="false">
-            <column ascending="true" name="abook_hidden"/>
-         </index>
-         <index name="abook_ignored" unique="false">
-            <column ascending="true" name="abook_ignored"/>
-         </index>
-         <index name="abook_my_perms" unique="false">
-            <column ascending="true" name="abook_my_perms"/>
-         </index>
-         <index name="abook_pending" unique="false">
-            <column ascending="true" name="abook_pending"/>
-         </index>
-         <index name="abook_profile" unique="false">
-            <column ascending="true" name="abook_profile"/>
-         </index>
-         <index name="abook_self" unique="false">
-            <column ascending="true" name="abook_self"/>
-         </index>
-         <index name="abook_their_perms" unique="false">
-            <column ascending="true" name="abook_their_perms"/>
-         </index>
-         <index name="abook_unconnected" unique="false">
-            <column ascending="true" name="abook_unconnected"/>
-         </index>
-         <index name="abook_updated" unique="false">
-            <column ascending="true" name="abook_updated"/>
-         </index>
-         <index name="abook_xchan" unique="false">
-            <column ascending="true" name="abook_xchan"/>
-         </index>
-      </table>
-      <table name="account" numRows="1" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="account_id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <child column="account_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="mail"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="account_parent" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="account_default_channel" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="account_salt" nullable="false" remarks="" size="32" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="account_password" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="account_email" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="6" name="account_external" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="en" digits="0" id="7" name="account_language" nullable="false" remarks="" size="16" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="8" name="account_created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="9" name="account_lastlog" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="10" name="account_flags" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="11" name="account_roles" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="12" name="account_reset" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="13" name="account_expires" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="14" name="account_expire_notified" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="15" name="account_service_class" nullable="false" remarks="" size="32" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="16" name="account_level" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="17" name="account_password_changed" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <primaryKey column="account_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="account_id"/>
-         </index>
-         <index name="account_default_channel" unique="false">
-            <column ascending="true" name="account_default_channel"/>
-         </index>
-         <index name="account_email" unique="false">
-            <column ascending="true" name="account_email"/>
-         </index>
-         <index name="account_expires" unique="false">
-            <column ascending="true" name="account_expires"/>
-         </index>
-         <index name="account_external" unique="false">
-            <column ascending="true" name="account_external"/>
-         </index>
-         <index name="account_flags" unique="false">
-            <column ascending="true" name="account_flags"/>
-         </index>
-         <index name="account_lastlog" unique="false">
-            <column ascending="true" name="account_lastlog"/>
-         </index>
-         <index name="account_level" unique="false">
-            <column ascending="true" name="account_level"/>
-         </index>
-         <index name="account_parent" unique="false">
-            <column ascending="true" name="account_parent"/>
-         </index>
-         <index name="account_password_changed" unique="false">
-            <column ascending="true" name="account_password_changed"/>
-         </index>
-         <index name="account_roles" unique="false">
-            <column ascending="true" name="account_roles"/>
-         </index>
-         <index name="account_service_class" unique="false">
-            <column ascending="true" name="account_service_class"/>
-         </index>
-      </table>
-      <table name="addon" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="notify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="version" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="installed" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="4" name="hidden" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="5" name="timestamp" nullable="false" remarks="" size="19" type="BIGINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="6" name="plugin_admin" nullable="false" remarks="" size="0" type="BIT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="hidden" unique="false">
-            <column ascending="true" name="hidden"/>
-         </index>
-         <index name="installed" unique="false">
-            <column ascending="true" name="installed"/>
-         </index>
-         <index name="name" unique="false">
-            <column ascending="true" name="name"/>
-         </index>
-      </table>
-      <table name="app" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="notify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="app_id" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="app_sig" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="app_author" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="app_name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="5" name="app_desc" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="6" name="app_url" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="7" name="app_photo" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="8" name="app_version" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="9" name="app_channel" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="10" name="app_addr" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="11" name="app_price" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="12" name="app_page" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="13" name="app_requires" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="app_channel" unique="false">
-            <column ascending="true" name="app_channel"/>
-         </index>
-         <index name="app_id" unique="false">
-            <column ascending="true" name="app_id"/>
-         </index>
-         <index name="app_name" unique="false">
-            <column ascending="true" name="app_name"/>
-         </index>
-         <index name="app_photo" unique="false">
-            <column ascending="true" name="app_photo"/>
-         </index>
-         <index name="app_price" unique="false">
-            <column ascending="true" name="app_price"/>
-         </index>
-         <index name="app_url" unique="false">
-            <column ascending="true" name="app_url"/>
-         </index>
-         <index name="app_version" unique="false">
-            <column ascending="true" name="app_version"/>
-         </index>
-      </table>
-      <table name="attach" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="aid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="uid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="hash" nullable="false" remarks="" size="64" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="creator" nullable="false" remarks="" size="128" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="filename" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="6" name="filetype" nullable="false" remarks="" size="64" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="7" name="filesize" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="8" name="revision" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="9" name="folder" nullable="false" remarks="" size="64" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="10" name="flags" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="11" name="is_dir" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="12" name="is_photo" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="13" name="os_storage" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" digits="0" id="14" name="os_path" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="15" name="display_path" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="16" name="data" nullable="false" remarks="" size="2147483647" type="LONGBLOB"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="17" name="created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="18" name="edited" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" digits="0" id="19" name="allow_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="20" name="allow_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="21" name="deny_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="22" name="deny_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="aid" unique="false">
-            <column ascending="true" name="aid"/>
-         </index>
-         <index name="created" unique="false">
-            <column ascending="true" name="created"/>
-         </index>
-         <index name="creator" unique="false">
-            <column ascending="true" name="creator"/>
-         </index>
-         <index name="edited" unique="false">
-            <column ascending="true" name="edited"/>
-         </index>
-         <index name="filename" unique="false">
-            <column ascending="true" name="filename"/>
-         </index>
-         <index name="filesize" unique="false">
-            <column ascending="true" name="filesize"/>
-         </index>
-         <index name="filetype" unique="false">
-            <column ascending="true" name="filetype"/>
-         </index>
-         <index name="flags" unique="false">
-            <column ascending="true" name="flags"/>
-         </index>
-         <index name="folder" unique="false">
-            <column ascending="true" name="folder"/>
-         </index>
-         <index name="hash" unique="false">
-            <column ascending="true" name="hash"/>
-         </index>
-         <index name="is_dir" unique="false">
-            <column ascending="true" name="is_dir"/>
-         </index>
-         <index name="is_photo" unique="false">
-            <column ascending="true" name="is_photo"/>
-         </index>
-         <index name="os_storage" unique="false">
-            <column ascending="true" name="os_storage"/>
-         </index>
-         <index name="revision" unique="false">
-            <column ascending="true" name="revision"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-      </table>
-      <table name="auth_codes" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="false" defaultValue="" digits="0" id="0" name="id" nullable="false" remarks="" size="40" type="VARCHAR">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="tokens"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="client_id" nullable="false" remarks="" size="20" type="VARCHAR">
-            <parent column="client_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="clients"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="redirect_uri" nullable="false" remarks="" size="200" type="VARCHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="expires" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="scope" nullable="false" remarks="" size="250" type="VARCHAR"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-      </table>
-      <table name="cache" numRows="21" remarks="" type="TABLE">
-         <column autoUpdated="false" defaultValue="" digits="0" id="0" name="k" nullable="false" remarks="" size="255" type="CHAR">
-            <child column="k" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="config"/>
-            <child column="k" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="pconfig"/>
-            <child column="k" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="profext"/>
-            <child column="k" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="sys_perms"/>
-            <child column="k" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="xconfig"/>
-         </column>
-         <column autoUpdated="false" digits="0" id="1" name="v" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="2" name="updated" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <primaryKey column="k" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="k"/>
-         </index>
-      </table>
-      <table name="channel" numRows="5" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="channel_id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <child column="channel_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="likes"/>
-            <child column="channel_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="mail"/>
-            <child column="channel_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="profext"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="channel_account_id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-		       <foreignKey table="account" column="account_id"/>
-		 </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="channel_primary" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="channel_name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="channel_address" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="channel_guid" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="6" name="channel_guid_sig" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="7" name="channel_hash" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="UTC" digits="0" id="8" name="channel_timezone" nullable="false" remarks="" size="128" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="9" name="channel_location" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="10" name="channel_theme" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="11" name="channel_startpage" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="12" name="channel_pubkey" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="13" name="channel_prvkey" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="65535" digits="0" id="14" name="channel_notifyflags" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="15" name="channel_pageflags" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="16" name="channel_dirdate" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="17" name="channel_lastpost" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="18" name="channel_deleted" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="10" digits="0" id="19" name="channel_max_anon_mail" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="10" digits="0" id="20" name="channel_max_friend_req" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="21" name="channel_expire_days" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="22" name="channel_passwd_reset" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="23" name="channel_default_group" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="24" name="channel_allow_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="25" name="channel_allow_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="26" name="channel_deny_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="27" name="channel_deny_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="28" name="channel_r_stream" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="29" name="channel_r_profile" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="30" name="channel_r_photos" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="31" name="channel_r_abook" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="32" name="channel_w_stream" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="33" name="channel_w_wall" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="34" name="channel_w_tagwall" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="35" name="channel_w_comment" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="36" name="channel_w_mail" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="37" name="channel_w_photos" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="38" name="channel_w_chat" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="39" name="channel_a_delegate" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="40" name="channel_r_storage" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="41" name="channel_w_storage" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="42" name="channel_r_pages" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="43" name="channel_w_pages" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="44" name="channel_a_republish" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="45" name="channel_w_like" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="46" name="channel_removed" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="47" name="channel_system" nullable="false" remarks="" size="0" type="BIT"/>
-         <primaryKey column="channel_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="channel_id"/>
-         </index>
-         <index name="channel_a_delegate" unique="false">
-            <column ascending="true" name="channel_a_delegate"/>
-         </index>
-         <index name="channel_a_republish" unique="false">
-            <column ascending="true" name="channel_a_republish"/>
-         </index>
-         <index name="channel_account_id" unique="false">
-            <column ascending="true" name="channel_account_id"/>
-         </index>
-         <index name="channel_address_unique" unique="true">
-            <column ascending="true" name="channel_address"/>
-         </index>
-         <index name="channel_default_gid" unique="false">
-            <column ascending="true" name="channel_default_group"/>
-         </index>
-         <index name="channel_deleted" unique="false">
-            <column ascending="true" name="channel_deleted"/>
-         </index>
-         <index name="channel_dirdate" unique="false">
-            <column ascending="true" name="channel_dirdate"/>
-         </index>
-         <index name="channel_expire_days" unique="false">
-            <column ascending="true" name="channel_expire_days"/>
-         </index>
-         <index name="channel_guid" unique="false">
-            <column ascending="true" name="channel_guid"/>
-         </index>
-         <index name="channel_hash" unique="false">
-            <column ascending="true" name="channel_hash"/>
-         </index>
-         <index name="channel_lastpost" unique="false">
-            <column ascending="true" name="channel_lastpost"/>
-         </index>
-         <index name="channel_location" unique="false">
-            <column ascending="true" name="channel_location"/>
-         </index>
-         <index name="channel_max_anon_mail" unique="false">
-            <column ascending="true" name="channel_max_anon_mail"/>
-         </index>
-         <index name="channel_max_friend_req" unique="false">
-            <column ascending="true" name="channel_max_friend_req"/>
-         </index>
-         <index name="channel_name" unique="false">
-            <column ascending="true" name="channel_name"/>
-         </index>
-         <index name="channel_notifyflags" unique="false">
-            <column ascending="true" name="channel_notifyflags"/>
-         </index>
-         <index name="channel_pageflags" unique="false">
-            <column ascending="true" name="channel_pageflags"/>
-         </index>
-         <index name="channel_primary" unique="false">
-            <column ascending="true" name="channel_primary"/>
-         </index>
-         <index name="channel_r_abook" unique="false">
-            <column ascending="true" name="channel_r_abook"/>
-         </index>
-         <index name="channel_r_pages" unique="false">
-            <column ascending="true" name="channel_r_pages"/>
-         </index>
-         <index name="channel_r_photos" unique="false">
-            <column ascending="true" name="channel_r_photos"/>
-         </index>
-         <index name="channel_r_profile" unique="false">
-            <column ascending="true" name="channel_r_profile"/>
-         </index>
-         <index name="channel_r_storage" unique="false">
-            <column ascending="true" name="channel_r_storage"/>
-         </index>
-         <index name="channel_r_stream" unique="false">
-            <column ascending="true" name="channel_r_stream"/>
-         </index>
-         <index name="channel_removed" unique="false">
-            <column ascending="true" name="channel_removed"/>
-         </index>
-         <index name="channel_system" unique="false">
-            <column ascending="true" name="channel_system"/>
-         </index>
-         <index name="channel_theme" unique="false">
-            <column ascending="true" name="channel_theme"/>
-         </index>
-         <index name="channel_timezone" unique="false">
-            <column ascending="true" name="channel_timezone"/>
-         </index>
-         <index name="channel_w_chat" unique="false">
-            <column ascending="true" name="channel_w_chat"/>
-         </index>
-         <index name="channel_w_comment" unique="false">
-            <column ascending="true" name="channel_w_comment"/>
-         </index>
-         <index name="channel_w_like" unique="false">
-            <column ascending="true" name="channel_w_like"/>
-         </index>
-         <index name="channel_w_mail" unique="false">
-            <column ascending="true" name="channel_w_mail"/>
-         </index>
-         <index name="channel_w_pages" unique="false">
-            <column ascending="true" name="channel_w_pages"/>
-         </index>
-         <index name="channel_w_photos" unique="false">
-            <column ascending="true" name="channel_w_photos"/>
-         </index>
-         <index name="channel_w_storage" unique="false">
-            <column ascending="true" name="channel_w_storage"/>
-         </index>
-         <index name="channel_w_stream" unique="false">
-            <column ascending="true" name="channel_w_stream"/>
-         </index>
-         <index name="channel_w_tagwall" unique="false">
-            <column ascending="true" name="channel_w_tagwall"/>
-         </index>
-         <index name="channel_w_wall" unique="false">
-            <column ascending="true" name="channel_w_wall"/>
-         </index>
-      </table>
-      <table name="chat" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="chat_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="chat_room" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="chat_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="3" name="chat_text" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="4" name="created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <primaryKey column="chat_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="chat_id"/>
-         </index>
-         <index name="chat_room" unique="false">
-            <column ascending="true" name="chat_room"/>
-         </index>
-         <index name="chat_xchan" unique="false">
-            <column ascending="true" name="chat_xchan"/>
-         </index>
-         <index name="created" unique="false">
-            <column ascending="true" name="created"/>
-         </index>
-      </table>
-      <table name="chatpresence" numRows="1" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="cp_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="cp_room" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="cp_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="3" name="cp_last" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="cp_status" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="cp_client" nullable="false" remarks="" size="128" type="CHAR"/>
-         <primaryKey column="cp_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="cp_id"/>
-         </index>
-         <index name="cp_last" unique="false">
-            <column ascending="true" name="cp_last"/>
-         </index>
-         <index name="cp_room" unique="false">
-            <column ascending="true" name="cp_room"/>
-         </index>
-         <index name="cp_status" unique="false">
-            <column ascending="true" name="cp_status"/>
-         </index>
-         <index name="cp_xchan" unique="false">
-            <column ascending="true" name="cp_xchan"/>
-         </index>
-      </table>
-      <table name="chatroom" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="cr_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="cr_aid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="cr_uid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="cr_name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="4" name="cr_created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="5" name="cr_edited" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="6" name="cr_expire" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" digits="0" id="7" name="allow_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="8" name="allow_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="9" name="deny_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="10" name="deny_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <primaryKey column="cr_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="cr_id"/>
-         </index>
-         <index name="cr_aid" unique="false">
-            <column ascending="true" name="cr_aid"/>
-         </index>
-         <index name="cr_created" unique="false">
-            <column ascending="true" name="cr_created"/>
-         </index>
-         <index name="cr_edited" unique="false">
-            <column ascending="true" name="cr_edited"/>
-         </index>
-         <index name="cr_expire" unique="false">
-            <column ascending="true" name="cr_expire"/>
-         </index>
-         <index name="cr_name" unique="false">
-            <column ascending="true" name="cr_name"/>
-         </index>
-         <index name="cr_uid" unique="false">
-            <column ascending="true" name="cr_uid"/>
-         </index>
-      </table>
-      <table name="clients" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="false" defaultValue="" digits="0" id="0" name="client_id" nullable="false" remarks="" size="20" type="VARCHAR">
-            <child column="client_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="auth_codes"/>
-            <child column="client_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="tokens"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="pw" nullable="false" remarks="" size="20" type="VARCHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="redirect_uri" nullable="false" remarks="" size="200" type="VARCHAR"/>
-         <column autoUpdated="false" digits="0" id="3" name="name" nullable="true" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="4" name="icon" nullable="true" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="5" name="uid" nullable="false" remarks="" size="10" type="INT"/>
-         <primaryKey column="client_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="client_id"/>
-         </index>
-      </table>
-      <table name="config" numRows="52" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="cat" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="k" nullable="false" remarks="" size="255" type="CHAR">
-            <parent column="k" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="cache"/>
-         </column>
-         <column autoUpdated="false" digits="0" id="3" name="v" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="access" unique="true">
-            <column ascending="true" name="cat"/>
-            <column ascending="true" name="k"/>
-         </index>
-      </table>
-      <table name="conv" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="guid" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="2" name="recips" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="uid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="creator" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="5" name="created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="6" name="updated" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" digits="0" id="7" name="subject" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="created" unique="false">
-            <column ascending="true" name="created"/>
-         </index>
-         <index name="updated" unique="false">
-            <column ascending="true" name="updated"/>
-         </index>
-      </table>
-      <table name="event" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="notify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="aid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="uid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="event_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="event_hash" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="5" name="created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="6" name="edited" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="7" name="start" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="8" name="finish" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" digits="0" id="9" name="summary" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="10" name="description" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="11" name="location" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="12" name="type" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="13" name="nofinish" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="1" digits="0" id="14" name="adjust" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="15" name="ignore" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" digits="0" id="16" name="allow_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="17" name="allow_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="18" name="deny_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="19" name="deny_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="20" name="event_status" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="21" name="event_status_date" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="22" name="event_percent" nullable="false" remarks="" size="5" type="SMALLINT"/>
-         <column autoUpdated="false" digits="0" id="23" name="event_repeat" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="24" name="event_sequence" nullable="false" remarks="" size="5" type="SMALLINT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="adjust" unique="false">
-            <column ascending="true" name="adjust"/>
-         </index>
-         <index name="aid" unique="false">
-            <column ascending="true" name="aid"/>
-         </index>
-         <index name="event_hash" unique="false">
-            <column ascending="true" name="event_hash"/>
-         </index>
-         <index name="event_sequence" unique="false">
-            <column ascending="true" name="event_sequence"/>
-         </index>
-         <index name="event_status" unique="false">
-            <column ascending="true" name="event_status"/>
-         </index>
-         <index name="event_xchan" unique="false">
-            <column ascending="true" name="event_xchan"/>
-         </index>
-         <index name="finish" unique="false">
-            <column ascending="true" name="finish"/>
-         </index>
-         <index name="ignore" unique="false">
-            <column ascending="true" name="ignore"/>
-         </index>
-         <index name="nofinish" unique="false">
-            <column ascending="true" name="nofinish"/>
-         </index>
-         <index name="start" unique="false">
-            <column ascending="true" name="start"/>
-         </index>
-         <index name="type" unique="false">
-            <column ascending="true" name="type"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-      </table>
-      <table name="fcontact" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" digits="0" id="1" name="url" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="2" name="name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="3" name="photo" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="4" name="request" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="5" name="nick" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="6" name="addr" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="7" name="batch" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="8" name="notify" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="9" name="poll" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="10" name="confirm" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="11" name="priority" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" digits="0" id="12" name="network" nullable="false" remarks="" size="32" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="13" name="alias" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="14" name="pubkey" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="15" name="updated" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="addr" unique="false">
-            <column ascending="true" name="addr"/>
-         </index>
-         <index name="network" unique="false">
-            <column ascending="true" name="network"/>
-         </index>
-      </table>
-      <table name="ffinder" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" digits="0" id="1" name="uid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" digits="0" id="2" name="cid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" digits="0" id="3" name="fid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="cid" unique="false">
-            <column ascending="true" name="cid"/>
-         </index>
-         <index name="fid" unique="false">
-            <column ascending="true" name="fid"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-      </table>
-      <table name="fserver" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="notify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="server" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="posturl" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="3" name="key" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="posturl" unique="false">
-            <column ascending="true" name="posturl"/>
-         </index>
-         <index name="server" unique="false">
-            <column ascending="true" name="server"/>
-         </index>
-      </table>
-      <table name="fsuggest" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="notify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="uid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="cid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="url" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="request" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="6" name="photo" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="7" name="note" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="8" name="created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-      </table>
-      <table name="group_member" numRows="2" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="uid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="gid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="gid" unique="false">
-            <column ascending="true" name="gid"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-         <index name="xchan" unique="false">
-            <column ascending="true" name="xchan"/>
-         </index>
-      </table>
-      <table name="groups" numRows="5" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="hash" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="uid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="visible" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="4" name="deleted" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="deleted" unique="false">
-            <column ascending="true" name="deleted"/>
-         </index>
-         <index name="hash" unique="false">
-            <column ascending="true" name="hash"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-         <index name="visible" unique="false">
-            <column ascending="true" name="visible"/>
-         </index>
-      </table>
-      <table name="hook" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="notify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="hook" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="file" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="function" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="4" name="priority" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="hook" unique="false">
-            <column ascending="true" name="hook"/>
-         </index>
-      </table>
-      <table name="hubloc" numRows="1513" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="hubloc_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="hubloc_guid" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="2" name="hubloc_guid_sig" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="hubloc_hash" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="hubloc_addr" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="hubloc_network" nullable="false" remarks="" size="32" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="6" name="hubloc_flags" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="7" name="hubloc_status" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="8" name="hubloc_url" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="9" name="hubloc_url_sig" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="10" name="hubloc_host" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="11" name="hubloc_callback" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="12" name="hubloc_connect" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="13" name="hubloc_sitekey" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="14" name="hubloc_updated" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="15" name="hubloc_connected" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="16" name="hubloc_primary" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="17" name="hubloc_orphancheck" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="18" name="hubloc_error" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="19" name="hubloc_deleted" nullable="false" remarks="" size="0" type="BIT"/>
-         <primaryKey column="hubloc_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="hubloc_id"/>
-         </index>
-         <index name="hubloc_addr" unique="false">
-            <column ascending="true" name="hubloc_addr"/>
-         </index>
-         <index name="hubloc_connect" unique="false">
-            <column ascending="true" name="hubloc_connect"/>
-         </index>
-         <index name="hubloc_connected" unique="false">
-            <column ascending="true" name="hubloc_connected"/>
-         </index>
-         <index name="hubloc_deleted" unique="false">
-            <column ascending="true" name="hubloc_deleted"/>
-         </index>
-         <index name="hubloc_error" unique="false">
-            <column ascending="true" name="hubloc_error"/>
-         </index>
-         <index name="hubloc_flags" unique="false">
-            <column ascending="true" name="hubloc_flags"/>
-         </index>
-         <index name="hubloc_guid" unique="false">
-            <column ascending="true" name="hubloc_guid"/>
-         </index>
-         <index name="hubloc_host" unique="false">
-            <column ascending="true" name="hubloc_host"/>
-         </index>
-         <index name="hubloc_network" unique="false">
-            <column ascending="true" name="hubloc_network"/>
-         </index>
-         <index name="hubloc_orphancheck" unique="false">
-            <column ascending="true" name="hubloc_orphancheck"/>
-         </index>
-         <index name="hubloc_primary" unique="false">
-            <column ascending="true" name="hubloc_primary"/>
-         </index>
-         <index name="hubloc_status" unique="false">
-            <column ascending="true" name="hubloc_status"/>
-         </index>
-         <index name="hubloc_updated" unique="false">
-            <column ascending="true" name="hubloc_updated"/>
-         </index>
-         <index name="hubloc_url" unique="false">
-            <column ascending="true" name="hubloc_url"/>
-         </index>
-      </table>
-      <table name="issue" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="issue_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="1" name="issue_created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="2" name="issue_updated" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="issue_assigned" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="4" name="issue_priority" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="5" name="issue_status" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="6" name="issue_component" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="issue_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="issue_id"/>
-         </index>
-         <index name="issue_assigned" unique="false">
-            <column ascending="true" name="issue_assigned"/>
-         </index>
-         <index name="issue_component" unique="false">
-            <column ascending="true" name="issue_component"/>
-         </index>
-         <index name="issue_created" unique="false">
-            <column ascending="true" name="issue_created"/>
-         </index>
-         <index name="issue_priority" unique="false">
-            <column ascending="true" name="issue_priority"/>
-         </index>
-         <index name="issue_status" unique="false">
-            <column ascending="true" name="issue_status"/>
-         </index>
-         <index name="issue_updated" unique="false">
-            <column ascending="true" name="issue_updated"/>
-         </index>
-      </table>
-      <table name="item" numRows="9613" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="mid" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="aid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="uid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="4" name="parent" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="parent_mid" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="6" name="thr_parent" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="7" name="created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="8" name="edited" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="9" name="expires" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="10" name="commented" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="11" name="received" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="12" name="changed" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="13" name="comments_closed" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="14" name="owner_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="15" name="author_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="16" name="source_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="17" name="mimetype" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="18" name="title" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="19" name="body" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="20" name="html" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="21" name="app" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="22" name="lang" nullable="false" remarks="" size="64" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="23" name="revision" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="24" name="verb" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="25" name="obj_type" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="26" name="object" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="27" name="tgt_type" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="28" name="target" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="29" name="layout_mid" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="30" name="postopts" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="31" name="route" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="32" name="llink" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="33" name="plink" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="34" name="resource_id" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="35" name="resource_type" nullable="false" remarks="" size="16" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="36" name="attach" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="37" name="sig" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="38" name="diaspora_meta" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="39" name="location" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="40" name="coord" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="41" name="public_policy" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="42" name="comment_policy" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="43" name="allow_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="44" name="allow_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="45" name="deny_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="46" name="deny_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="47" name="item_restrict" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="48" name="item_flags" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="49" name="item_private" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="50" name="item_origin" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="51" name="item_unseen" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="52" name="item_starred" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="53" name="item_uplink" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="54" name="item_consensus" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="55" name="item_wall" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="56" name="item_thread_top" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="57" name="item_notshown" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="58" name="item_nsfw" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="59" name="item_relay" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="60" name="item_mentionsme" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="61" name="item_nocomment" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="62" name="item_obscured" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="63" name="item_verified" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="64" name="item_retained" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="65" name="item_rss" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="66" name="item_deleted" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="67" name="item_type" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="68" name="item_hidden" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="69" name="item_unpublished" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="70" name="item_delayed" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="71" name="item_pending_remove" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="72" name="item_blocked" nullable="false" remarks="" size="0" type="BIT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="aid" unique="false">
-            <column ascending="true" name="aid"/>
-         </index>
-         <index name="allow_cid" unique="false">
-            <column ascending="true" name="allow_cid"/>
-         </index>
-         <index name="allow_gid" unique="false">
-            <column ascending="true" name="allow_gid"/>
-         </index>
-         <index name="author_xchan" unique="false">
-            <column ascending="true" name="author_xchan"/>
-         </index>
-         <index name="body" unique="false">
-            <column ascending="true" name="body"/>
-         </index>
-         <index name="changed" unique="false">
-            <column ascending="true" name="changed"/>
-         </index>
-         <index name="comment_policy" unique="false">
-            <column ascending="true" name="comment_policy"/>
-         </index>
-         <index name="commented" unique="false">
-            <column ascending="true" name="commented"/>
-         </index>
-         <index name="comments_closed" unique="false">
-            <column ascending="true" name="comments_closed"/>
-         </index>
-         <index name="created" unique="false">
-            <column ascending="true" name="created"/>
-         </index>
-         <index name="deny_cid" unique="false">
-            <column ascending="true" name="deny_cid"/>
-         </index>
-         <index name="deny_gid" unique="false">
-            <column ascending="true" name="deny_gid"/>
-         </index>
-         <index name="edited" unique="false">
-            <column ascending="true" name="edited"/>
-         </index>
-         <index name="expires" unique="false">
-            <column ascending="true" name="expires"/>
-         </index>
-         <index name="item_blocked" unique="false">
-            <column ascending="true" name="item_blocked"/>
-         </index>
-         <index name="item_consensus" unique="false">
-            <column ascending="true" name="item_consensus"/>
-         </index>
-         <index name="item_delayed" unique="false">
-            <column ascending="true" name="item_delayed"/>
-         </index>
-         <index name="item_deleted" unique="false">
-            <column ascending="true" name="item_deleted"/>
-         </index>
-         <index name="item_flags" unique="false">
-            <column ascending="true" name="item_flags"/>
-         </index>
-         <index name="item_hidden" unique="false">
-            <column ascending="true" name="item_hidden"/>
-         </index>
-         <index name="item_mentionsme" unique="false">
-            <column ascending="true" name="item_mentionsme"/>
-         </index>
-         <index name="item_nocomment" unique="false">
-            <column ascending="true" name="item_nocomment"/>
-         </index>
-         <index name="item_notshown" unique="false">
-            <column ascending="true" name="item_notshown"/>
-         </index>
-         <index name="item_nsfw" unique="false">
-            <column ascending="true" name="item_nsfw"/>
-         </index>
-         <index name="item_obscured" unique="false">
-            <column ascending="true" name="item_obscured"/>
-         </index>
-         <index name="item_origin" unique="false">
-            <column ascending="true" name="item_origin"/>
-         </index>
-         <index name="item_pending_remove" unique="false">
-            <column ascending="true" name="item_pending_remove"/>
-         </index>
-         <index name="item_private" unique="false">
-            <column ascending="true" name="item_private"/>
-         </index>
-         <index name="item_relay" unique="false">
-            <column ascending="true" name="item_relay"/>
-         </index>
-         <index name="item_restrict" unique="false">
-            <column ascending="true" name="item_restrict"/>
-         </index>
-         <index name="item_retained" unique="false">
-            <column ascending="true" name="item_retained"/>
-         </index>
-         <index name="item_rss" unique="false">
-            <column ascending="true" name="item_rss"/>
-         </index>
-         <index name="item_starred" unique="false">
-            <column ascending="true" name="item_starred"/>
-         </index>
-         <index name="item_thread_top" unique="false">
-            <column ascending="true" name="item_thread_top"/>
-         </index>
-         <index name="item_type" unique="false">
-            <column ascending="true" name="item_type"/>
-         </index>
-         <index name="item_unpublished" unique="false">
-            <column ascending="true" name="item_unpublished"/>
-         </index>
-         <index name="item_unseen" unique="false">
-            <column ascending="true" name="item_unseen"/>
-         </index>
-         <index name="item_uplink" unique="false">
-            <column ascending="true" name="item_uplink"/>
-         </index>
-         <index name="item_verified" unique="false">
-            <column ascending="true" name="item_verified"/>
-         </index>
-         <index name="item_wall" unique="false">
-            <column ascending="true" name="item_wall"/>
-         </index>
-         <index name="layout_mid" unique="false">
-            <column ascending="true" name="layout_mid"/>
-         </index>
-         <index name="llink" unique="false">
-            <column ascending="true" name="llink"/>
-         </index>
-         <index name="mid" unique="false">
-            <column ascending="true" name="mid"/>
-         </index>
-         <index name="mimetype" unique="false">
-            <column ascending="true" name="mimetype"/>
-         </index>
-         <index name="owner_xchan" unique="false">
-            <column ascending="true" name="owner_xchan"/>
-         </index>
-         <index name="parent" unique="false">
-            <column ascending="true" name="parent"/>
-         </index>
-         <index name="parent_mid" unique="false">
-            <column ascending="true" name="parent_mid"/>
-         </index>
-         <index name="public_policy" unique="false">
-            <column ascending="true" name="public_policy"/>
-         </index>
-         <index name="received" unique="false">
-            <column ascending="true" name="received"/>
-         </index>
-         <index name="resource_type" unique="false">
-            <column ascending="true" name="resource_type"/>
-         </index>
-         <index name="revision" unique="false">
-            <column ascending="true" name="revision"/>
-         </index>
-         <index name="title" unique="false">
-            <column ascending="true" name="title"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-         <index name="uid_commented" unique="false">
-            <column ascending="true" name="uid"/>
-            <column ascending="true" name="commented"/>
-         </index>
-         <index name="uid_created" unique="false">
-            <column ascending="true" name="uid"/>
-            <column ascending="true" name="created"/>
-         </index>
-         <index name="uid_mid" unique="false">
-            <column ascending="true" name="mid"/>
-            <column ascending="true" name="uid"/>
-         </index>
-         <index name="verb" unique="false">
-            <column ascending="true" name="verb"/>
-         </index>
-      </table>
-      <table name="item_id" numRows="1" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="iid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="uid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="sid" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="service" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="iid" unique="false">
-            <column ascending="true" name="iid"/>
-         </index>
-         <index name="service" unique="false">
-            <column ascending="true" name="service"/>
-         </index>
-         <index name="sid" unique="false">
-            <column ascending="true" name="sid"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-      </table>
-      <table name="likes" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="channel_id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="channel_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="channel"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="liker" nullable="false" remarks="" size="128" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="likee" nullable="false" remarks="" size="128" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="4" name="iid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="verb" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="6" name="target_type" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="7" name="target_id" nullable="false" remarks="" size="128" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="8" name="target" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="channel_id" unique="false">
-            <column ascending="true" name="channel_id"/>
-         </index>
-         <index name="iid" unique="false">
-            <column ascending="true" name="iid"/>
-         </index>
-         <index name="likee" unique="false">
-            <column ascending="true" name="likee"/>
-         </index>
-         <index name="liker" unique="false">
-            <column ascending="true" name="liker"/>
-         </index>
-         <index name="target_id" unique="false">
-            <column ascending="true" name="target_id"/>
-         </index>
-         <index name="target_type" unique="false">
-            <column ascending="true" name="target_type"/>
-         </index>
-         <index name="verb" unique="false">
-            <column ascending="true" name="verb"/>
-         </index>
-      </table>
-      <table name="mail" numRows="7" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="convid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="mail_flags" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="from_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="to_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="5" name="account_id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="account_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="account"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="6" name="channel_id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="channel_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="channel"/>
-         </column>
-         <column autoUpdated="false" digits="0" id="7" name="title" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="8" name="body" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="9" name="sig" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="10" name="attach" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="11" name="mid" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="12" name="parent_mid" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="13" name="mail_deleted" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="14" name="mail_replied" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="15" name="mail_isreply" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="16" name="mail_seen" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="17" name="mail_recalled" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="18" name="mail_obscured" nullable="false" remarks="" size="5" type="SMALLINT"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="19" name="created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="20" name="expires" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="account_id" unique="false">
-            <column ascending="true" name="account_id"/>
-         </index>
-         <index name="channel_id" unique="false">
-            <column ascending="true" name="channel_id"/>
-         </index>
-         <index name="convid" unique="false">
-            <column ascending="true" name="convid"/>
-         </index>
-         <index name="created" unique="false">
-            <column ascending="true" name="created"/>
-         </index>
-         <index name="expires" unique="false">
-            <column ascending="true" name="expires"/>
-         </index>
-         <index name="from_xchan" unique="false">
-            <column ascending="true" name="from_xchan"/>
-         </index>
-         <index name="mail_deleted" unique="false">
-            <column ascending="true" name="mail_deleted"/>
-         </index>
-         <index name="mail_flags" unique="false">
-            <column ascending="true" name="mail_flags"/>
-         </index>
-         <index name="mail_isreply" unique="false">
-            <column ascending="true" name="mail_isreply"/>
-         </index>
-         <index name="mail_obscured" unique="false">
-            <column ascending="true" name="mail_obscured"/>
-         </index>
-         <index name="mail_recalled" unique="false">
-            <column ascending="true" name="mail_recalled"/>
-         </index>
-         <index name="mail_replied" unique="false">
-            <column ascending="true" name="mail_replied"/>
-         </index>
-         <index name="mail_seen" unique="false">
-            <column ascending="true" name="mail_seen"/>
-         </index>
-         <index name="mid" unique="false">
-            <column ascending="true" name="mid"/>
-         </index>
-         <index name="parent_mid" unique="false">
-            <column ascending="true" name="parent_mid"/>
-         </index>
-         <index name="to_xchan" unique="false">
-            <column ascending="true" name="to_xchan"/>
-         </index>
-      </table>
-      <table name="manage" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="notify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="uid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-         <index name="xchan" unique="false">
-            <column ascending="true" name="xchan"/>
-         </index>
-      </table>
-      <table name="menu" numRows="1" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="menu_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="menu_channel_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="menu_name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="menu_desc" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="4" name="menu_flags" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="5" name="menu_created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="6" name="menu_edited" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <primaryKey column="menu_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="menu_id"/>
-         </index>
-         <index name="menu_channel_id" unique="false">
-            <column ascending="true" name="menu_channel_id"/>
-         </index>
-         <index name="menu_created" unique="false">
-            <column ascending="true" name="menu_created"/>
-         </index>
-         <index name="menu_edited" unique="false">
-            <column ascending="true" name="menu_edited"/>
-         </index>
-         <index name="menu_flags" unique="false">
-            <column ascending="true" name="menu_flags"/>
-         </index>
-         <index name="menu_name" unique="false">
-            <column ascending="true" name="menu_name"/>
-         </index>
-      </table>
-      <table name="menu_item" numRows="1" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="mitem_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="mitem_link" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="mitem_desc" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="mitem_flags" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" digits="0" id="4" name="allow_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="5" name="allow_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="6" name="deny_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="7" name="deny_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="8" name="mitem_channel_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="9" name="mitem_menu_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="10" name="mitem_order" nullable="false" remarks="" size="10" type="INT"/>
-         <primaryKey column="mitem_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="mitem_id"/>
-         </index>
-         <index name="mitem_channel_id" unique="false">
-            <column ascending="true" name="mitem_channel_id"/>
-         </index>
-         <index name="mitem_flags" unique="false">
-            <column ascending="true" name="mitem_flags"/>
-         </index>
-         <index name="mitem_menu_id" unique="false">
-            <column ascending="true" name="mitem_menu_id"/>
-         </index>
-      </table>
-      <table name="notify" numRows="59" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT">
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="addon"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="app"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="event"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="fserver"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="fsuggest"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="hook"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="manage"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="pconfig"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="profile"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="spam"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="hash" nullable="false" remarks="" size="64" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="url" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="photo" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="5" name="date" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" digits="0" id="6" name="msg" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="7" name="aid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="8" name="uid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="9" name="link" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="10" name="parent" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="11" name="seen" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="12" name="type" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="13" name="verb" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="14" name="otype" nullable="false" remarks="" size="16" type="CHAR"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="aid" unique="false">
-            <column ascending="true" name="aid"/>
-         </index>
-         <index name="date" unique="false">
-            <column ascending="true" name="date"/>
-         </index>
-         <index name="hash" unique="false">
-            <column ascending="true" name="hash"/>
-         </index>
-         <index name="link" unique="false">
-            <column ascending="true" name="link"/>
-         </index>
-         <index name="otype" unique="false">
-            <column ascending="true" name="otype"/>
-         </index>
-         <index name="parent" unique="false">
-            <column ascending="true" name="parent"/>
-         </index>
-         <index name="seen" unique="false">
-            <column ascending="true" name="seen"/>
-         </index>
-         <index name="type" unique="false">
-            <column ascending="true" name="type"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-      </table>
-      <table name="obj" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="obj_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="obj_page" nullable="false" remarks="" size="64" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="obj_verb" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="obj_type" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="obj_obj" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="5" name="obj_channel" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" digits="0" id="6" name="allow_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="7" name="allow_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="8" name="deny_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="9" name="deny_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <primaryKey column="obj_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="obj_id"/>
-         </index>
-         <index name="obj_channel" unique="false">
-            <column ascending="true" name="obj_channel"/>
-         </index>
-         <index name="obj_obj" unique="false">
-            <column ascending="true" name="obj_obj"/>
-         </index>
-         <index name="obj_page" unique="false">
-            <column ascending="true" name="obj_page"/>
-         </index>
-         <index name="obj_type" unique="false">
-            <column ascending="true" name="obj_type"/>
-         </index>
-         <index name="obj_verb" unique="false">
-            <column ascending="true" name="obj_verb"/>
-         </index>
-      </table>
-      <table name="outq" numRows="2" remarks="" type="TABLE">
-         <column autoUpdated="false" digits="0" id="0" name="outq_hash" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="outq_account" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="outq_channel" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="outq_driver" nullable="false" remarks="" size="32" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="outq_posturl" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="5" name="outq_async" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="6" name="outq_delivered" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="7" name="outq_created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="8" name="outq_updated" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" digits="0" id="9" name="outq_notify" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="10" name="outq_msg" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="11" name="outq_priority" nullable="false" remarks="" size="5" type="SMALLINT"/>
-         <primaryKey column="outq_hash" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="outq_hash"/>
-         </index>
-         <index name="outq_account" unique="false">
-            <column ascending="true" name="outq_account"/>
-         </index>
-         <index name="outq_async" unique="false">
-            <column ascending="true" name="outq_async"/>
-         </index>
-         <index name="outq_channel" unique="false">
-            <column ascending="true" name="outq_channel"/>
-         </index>
-         <index name="outq_created" unique="false">
-            <column ascending="true" name="outq_created"/>
-         </index>
-         <index name="outq_delivered" unique="false">
-            <column ascending="true" name="outq_delivered"/>
-         </index>
-         <index name="outq_hub" unique="false">
-            <column ascending="true" name="outq_posturl"/>
-         </index>
-         <index name="outq_priority" unique="false">
-            <column ascending="true" name="outq_priority"/>
-         </index>
-         <index name="outq_updated" unique="false">
-            <column ascending="true" name="outq_updated"/>
-         </index>
-      </table>
-      <table name="pconfig" numRows="232" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="notify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="uid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="cat" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="k" nullable="false" remarks="" size="255" type="CHAR">
-            <parent column="k" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="cache"/>
-         </column>
-         <column autoUpdated="false" digits="0" id="4" name="v" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="access" unique="true">
-            <column ascending="true" name="uid"/>
-            <column ascending="true" name="cat"/>
-            <column ascending="true" name="k"/>
-         </index>
-      </table>
-      <table name="photo" numRows="3495" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="aid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="uid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="resource_id" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="5" name="created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="6" name="edited" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="7" name="title" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="8" name="description" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="9" name="album" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="10" name="filename" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="image/jpeg" digits="0" id="11" name="type" nullable="false" remarks="" size="128" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="12" name="height" nullable="false" remarks="" size="5" type="SMALLINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="13" name="width" nullable="false" remarks="" size="5" type="SMALLINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="14" name="size" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" digits="0" id="15" name="data" nullable="false" remarks="" size="16777215" type="MEDIUMBLOB"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="16" name="scale" nullable="false" remarks="" size="3" type="TINYINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="17" name="photo_usage" nullable="false" remarks="" size="5" type="SMALLINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="18" name="profile" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="19" name="is_nsfw" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="20" name="os_storage" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" digits="0" id="21" name="os_path" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="22" name="display_path" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="23" name="photo_flags" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" digits="0" id="24" name="allow_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="25" name="allow_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="26" name="deny_cid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="27" name="deny_gid" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="aid" unique="false">
-            <column ascending="true" name="aid"/>
-         </index>
-         <index name="album" unique="false">
-            <column ascending="true" name="album"/>
-         </index>
-         <index name="is_nsfw" unique="false">
-            <column ascending="true" name="is_nsfw"/>
-         </index>
-         <index name="os_storage" unique="false">
-            <column ascending="true" name="os_storage"/>
-         </index>
-         <index name="photo_flags" unique="false">
-            <column ascending="true" name="photo_flags"/>
-         </index>
-         <index name="photo_usage" unique="false">
-            <column ascending="true" name="photo_usage"/>
-         </index>
-         <index name="profile" unique="false">
-            <column ascending="true" name="profile"/>
-         </index>
-         <index name="resource_id" unique="false">
-            <column ascending="true" name="resource_id"/>
-         </index>
-         <index name="scale" unique="false">
-            <column ascending="true" name="scale"/>
-         </index>
-         <index name="size" unique="false">
-            <column ascending="true" name="size"/>
-         </index>
-         <index name="type" unique="false">
-            <column ascending="true" name="type"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-         <index name="xchan" unique="false">
-            <column ascending="true" name="xchan"/>
-         </index>
-      </table>
-      <table name="poll" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="poll_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="poll_channel" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" digits="0" id="2" name="poll_desc" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="poll_flags" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="4" name="poll_votes" nullable="false" remarks="" size="10" type="INT"/>
-         <primaryKey column="poll_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="poll_id"/>
-         </index>
-         <index name="poll_channel" unique="false">
-            <column ascending="true" name="poll_channel"/>
-         </index>
-         <index name="poll_flags" unique="false">
-            <column ascending="true" name="poll_flags"/>
-         </index>
-         <index name="poll_votes" unique="false">
-            <column ascending="true" name="poll_votes"/>
-         </index>
-      </table>
-      <table name="poll_elm" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="pelm_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="pelm_poll" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" digits="0" id="2" name="pelm_desc" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="pelm_flags" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="4" name="pelm_result" nullable="false" remarks="" size="12" type="FLOAT"/>
-         <primaryKey column="pelm_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="pelm_id"/>
-         </index>
-         <index name="pelm_poll" unique="false">
-            <column ascending="true" name="pelm_poll"/>
-         </index>
-         <index name="pelm_result" unique="false">
-            <column ascending="true" name="pelm_result"/>
-         </index>
-      </table>
-      <table name="profdef" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="field_name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="field_type" nullable="false" remarks="" size="16" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="field_desc" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="field_help" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="5" name="field_inputs" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="field_name" unique="false">
-            <column ascending="true" name="field_name"/>
-         </index>
-      </table>
-      <table name="profext" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="channel_id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="channel_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="channel"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="hash" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="k" nullable="false" remarks="" size="255" type="CHAR">
-            <parent column="k" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="cache"/>
-         </column>
-         <column autoUpdated="false" digits="0" id="4" name="v" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="channel_id" unique="false">
-            <column ascending="true" name="channel_id"/>
-         </index>
-         <index name="hash" unique="false">
-            <column ascending="true" name="hash"/>
-         </index>
-         <index name="k" unique="false">
-            <column ascending="true" name="k"/>
-         </index>
-      </table>
-      <table name="profile" numRows="4" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="notify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="profile_guid" nullable="false" remarks="" size="64" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="aid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="uid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="profile_name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="5" name="is_default" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="6" name="hide_friends" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="7" name="name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="8" name="pdesc" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="9" name="chandesc" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="0000-00-00" digits="0" id="10" name="dob" nullable="false" remarks="" size="32" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="UTC" digits="0" id="11" name="dob_tz" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="12" name="address" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="13" name="locality" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="14" name="region" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="15" name="postal_code" nullable="false" remarks="" size="32" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="16" name="country_name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="17" name="hometown" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="18" name="gender" nullable="false" remarks="" size="32" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="19" name="marital" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="20" name="with" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="21" name="howlong" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="22" name="sexual" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="23" name="politic" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="24" name="religion" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="25" name="keywords" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="26" name="likes" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="27" name="dislikes" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="28" name="about" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="29" name="summary" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="30" name="music" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="31" name="book" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="32" name="tv" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="33" name="film" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="34" name="interest" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="35" name="romance" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="36" name="work" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="37" name="education" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="38" name="contact" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="39" name="channels" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="40" name="homepage" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="41" name="photo" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="42" name="thumb" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="43" name="publish" nullable="false" remarks="" size="0" type="BIT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="aid" unique="false">
-            <column ascending="true" name="aid"/>
-         </index>
-         <index name="country_name" unique="false">
-            <column ascending="true" name="country_name"/>
-         </index>
-         <index name="gender" unique="false">
-            <column ascending="true" name="gender"/>
-         </index>
-         <index name="guid" unique="true">
-            <column ascending="true" name="profile_guid"/>
-            <column ascending="true" name="uid"/>
-         </index>
-         <index name="hide_friends" unique="false">
-            <column ascending="true" name="hide_friends"/>
-         </index>
-         <index name="hometown" unique="false">
-            <column ascending="true" name="hometown"/>
-         </index>
-         <index name="is_default" unique="false">
-            <column ascending="true" name="is_default"/>
-         </index>
-         <index name="locality" unique="false">
-            <column ascending="true" name="locality"/>
-         </index>
-         <index name="marital" unique="false">
-            <column ascending="true" name="marital"/>
-         </index>
-         <index name="postal_code" unique="false">
-            <column ascending="true" name="postal_code"/>
-         </index>
-         <index name="profile_guid" unique="false">
-            <column ascending="true" name="profile_guid"/>
-         </index>
-         <index name="publish" unique="false">
-            <column ascending="true" name="publish"/>
-         </index>
-         <index name="sexual" unique="false">
-            <column ascending="true" name="sexual"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-      </table>
-      <table name="profile_check" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="uid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="cid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="dfrn_id" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="sec" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="5" name="expire" nullable="false" remarks="" size="10" type="INT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="cid" unique="false">
-            <column ascending="true" name="cid"/>
-         </index>
-         <index name="dfrn_id" unique="false">
-            <column ascending="true" name="dfrn_id"/>
-         </index>
-         <index name="expire" unique="false">
-            <column ascending="true" name="expire"/>
-         </index>
-         <index name="sec" unique="false">
-            <column ascending="true" name="sec"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-      </table>
-      <table name="register" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="hash" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="2" name="created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="uid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="password" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="language" nullable="false" remarks="" size="16" type="CHAR"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="created" unique="false">
-            <column ascending="true" name="created"/>
-         </index>
-         <index name="hash" unique="false">
-            <column ascending="true" name="hash"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-      </table>
-      <table name="session" numRows="23" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="20" type="BIGINT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="sid" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="2" name="data" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="expire" nullable="false" remarks="" size="20" type="BIGINT UNSIGNED"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="expire" unique="false">
-            <column ascending="true" name="expire"/>
-         </index>
-         <index name="sid" unique="false">
-            <column ascending="true" name="sid"/>
-         </index>
-      </table>
-      <table name="shares" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="share_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="share_type" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="share_target" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="share_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="share_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="share_id"/>
-         </index>
-         <index name="share_target" unique="false">
-            <column ascending="true" name="share_target"/>
-         </index>
-         <index name="share_type" unique="false">
-            <column ascending="true" name="share_type"/>
-         </index>
-         <index name="share_xchan" unique="false">
-            <column ascending="true" name="share_xchan"/>
-         </index>
-      </table>
-      <table name="sign" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="iid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="retract_iid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" digits="0" id="3" name="signed_text" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" digits="0" id="4" name="signature" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="signer" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="iid" unique="false">
-            <column ascending="true" name="iid"/>
-         </index>
-         <index name="retract_iid" unique="false">
-            <column ascending="true" name="retract_iid"/>
-         </index>
-      </table>
-      <table name="site" numRows="117" remarks="" type="TABLE">
-         <column autoUpdated="false" digits="0" id="0" name="site_url" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="site_access" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="site_flags" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="3" name="site_update" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="4" name="site_pull" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="5" name="site_sync" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="6" name="site_directory" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="7" name="site_register" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="8" name="site_sellpage" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="9" name="site_location" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="10" name="site_realm" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="11" name="site_valid" nullable="false" remarks="" size="5" type="SMALLINT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="12" name="site_dead" nullable="false" remarks="" size="5" type="SMALLINT"/>
-         <primaryKey column="site_url" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="site_url"/>
-         </index>
-         <index name="site_access" unique="false">
-            <column ascending="true" name="site_access"/>
-         </index>
-         <index name="site_dead" unique="false">
-            <column ascending="true" name="site_dead"/>
-         </index>
-         <index name="site_directory" unique="false">
-            <column ascending="true" name="site_directory"/>
-         </index>
-         <index name="site_flags" unique="false">
-            <column ascending="true" name="site_flags"/>
-         </index>
-         <index name="site_pull" unique="false">
-            <column ascending="true" name="site_pull"/>
-         </index>
-         <index name="site_realm" unique="false">
-            <column ascending="true" name="site_realm"/>
-         </index>
-         <index name="site_register" unique="false">
-            <column ascending="true" name="site_register"/>
-         </index>
-         <index name="site_sellpage" unique="false">
-            <column ascending="true" name="site_sellpage"/>
-         </index>
-         <index name="site_update" unique="false">
-            <column ascending="true" name="site_update"/>
-         </index>
-         <index name="site_valid" unique="false">
-            <column ascending="true" name="site_valid"/>
-         </index>
-      </table>
-      <table name="source" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="src_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="src_channel_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="src_channel_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="src_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="4" name="src_patt" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <primaryKey column="src_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="src_id"/>
-         </index>
-         <index name="src_channel_id" unique="false">
-            <column ascending="true" name="src_channel_id"/>
-         </index>
-         <index name="src_channel_xchan" unique="false">
-            <column ascending="true" name="src_channel_xchan"/>
-         </index>
-         <index name="src_xchan" unique="false">
-            <column ascending="true" name="src_xchan"/>
-         </index>
-      </table>
-      <table name="spam" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="notify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="uid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="spam" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="ham" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="term" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="5" name="date" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="ham" unique="false">
-            <column ascending="true" name="ham"/>
-         </index>
-         <index name="spam" unique="false">
-            <column ascending="true" name="spam"/>
-         </index>
-         <index name="term" unique="false">
-            <column ascending="true" name="term"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-      </table>
-      <table name="sys_perms" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="cat" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="k" nullable="false" remarks="" size="255" type="CHAR">
-            <parent column="k" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="cache"/>
-         </column>
-         <column autoUpdated="false" digits="0" id="3" name="v" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="4" name="public_perm" nullable="false" remarks="" size="0" type="BIT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-      </table>
-      <table name="term" numRows="7585" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="tid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="aid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="uid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="oid" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="4" name="otype" nullable="false" remarks="" size="3" type="TINYINT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="5" name="type" nullable="false" remarks="" size="3" type="TINYINT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="6" name="term" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="7" name="url" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="8" name="imgurl" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="9" name="term_hash" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="10" name="parent_hash" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="tid" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="tid"/>
-         </index>
-         <index name="aid" unique="false">
-            <column ascending="true" name="aid"/>
-         </index>
-         <index name="imgurl" unique="false">
-            <column ascending="true" name="imgurl"/>
-         </index>
-         <index name="oid" unique="false">
-            <column ascending="true" name="oid"/>
-         </index>
-         <index name="otype" unique="false">
-            <column ascending="true" name="otype"/>
-         </index>
-         <index name="parent_hash" unique="false">
-            <column ascending="true" name="parent_hash"/>
-         </index>
-         <index name="term" unique="false">
-            <column ascending="true" name="term"/>
-         </index>
-         <index name="term_hash" unique="false">
-            <column ascending="true" name="term_hash"/>
-         </index>
-         <index name="type" unique="false">
-            <column ascending="true" name="type"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-      </table>
-      <table name="tokens" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="false" defaultValue="" digits="0" id="0" name="id" nullable="false" remarks="" size="40" type="VARCHAR">
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="auth_codes"/>
-         </column>
-         <column autoUpdated="false" digits="0" id="1" name="secret" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="client_id" nullable="false" remarks="" size="20" type="VARCHAR">
-            <parent column="client_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="clients"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="expires" nullable="false" remarks="" size="20" type="BIGINT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="scope" nullable="false" remarks="" size="200" type="VARCHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="5" name="uid" nullable="false" remarks="" size="10" type="INT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="client_id" unique="false">
-            <column ascending="true" name="client_id"/>
-         </index>
-         <index name="expires" unique="false">
-            <column ascending="true" name="expires"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-      </table>
-      <table name="updates" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="ud_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="ud_hash" nullable="false" remarks="" size="128" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="ud_guid" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="3" name="ud_date" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="4" name="ud_last" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="5" name="ud_flags" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="6" name="ud_addr" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="ud_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="ud_id"/>
-         </index>
-         <index name="ud_addr" unique="false">
-            <column ascending="true" name="ud_addr"/>
-         </index>
-         <index name="ud_date" unique="false">
-            <column ascending="true" name="ud_date"/>
-         </index>
-         <index name="ud_flags" unique="false">
-            <column ascending="true" name="ud_flags"/>
-         </index>
-         <index name="ud_guid" unique="false">
-            <column ascending="true" name="ud_guid"/>
-         </index>
-         <index name="ud_hash" unique="false">
-            <column ascending="true" name="ud_hash"/>
-         </index>
-         <index name="ud_last" unique="false">
-            <column ascending="true" name="ud_last"/>
-         </index>
-      </table>
-      <table name="verify" numRows="1" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="attach"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="config"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="conv"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="fcontact"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="ffinder"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="group_member"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="groups"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="item"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="item_id"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="likes"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="mail"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="photo"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="profdef"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="profext"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="profile_check"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="register"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="sign"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="sys_perms"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="xconfig"/>
-            <child column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="xign"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="channel" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="type" nullable="false" remarks="" size="32" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="token" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="meta" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="5" name="created" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="channel" unique="false">
-            <column ascending="true" name="channel"/>
-         </index>
-         <index name="created" unique="false">
-            <column ascending="true" name="created"/>
-         </index>
-         <index name="meta" unique="false">
-            <column ascending="true" name="meta"/>
-         </index>
-         <index name="token" unique="false">
-            <column ascending="true" name="token"/>
-         </index>
-         <index name="type" unique="false">
-            <column ascending="true" name="type"/>
-         </index>
-      </table>
-      <table name="vote" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="vote_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="vote_poll" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="vote_element" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" digits="0" id="3" name="vote_result" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="vote_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="vote_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="vote_id"/>
-         </index>
-         <index name="vote_element" unique="false">
-            <column ascending="true" name="vote_element"/>
-         </index>
-         <index name="vote_poll" unique="false">
-            <column ascending="true" name="vote_poll"/>
-         </index>
-         <index name="vote_vote" unique="true">
-            <column ascending="true" name="vote_poll"/>
-            <column ascending="true" name="vote_element"/>
-            <column ascending="true" name="vote_xchan"/>
-         </index>
-      </table>
-      <table name="xchan" numRows="1168" remarks="" type="TABLE">
-         <column autoUpdated="false" digits="0" id="0" name="xchan_hash" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="xchan_guid" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="2" name="xchan_guid_sig" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="3" name="xchan_pubkey" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="image/jpeg" digits="0" id="4" name="xchan_photo_mimetype" nullable="false" remarks="" size="32" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="xchan_photo_l" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="6" name="xchan_photo_m" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="7" name="xchan_photo_s" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="8" name="xchan_addr" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="9" name="xchan_url" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="10" name="xchan_connurl" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="11" name="xchan_follow" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="12" name="xchan_connpage" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="13" name="xchan_name" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="14" name="xchan_network" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="15" name="xchan_instance_url" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="16" name="xchan_flags" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="17" name="xchan_photo_date" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="18" name="xchan_name_date" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="19" name="xchan_hidden" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="20" name="xchan_orphan" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="21" name="xchan_censored" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="22" name="xchan_selfcensored" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="23" name="xchan_system" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="24" name="xchan_pubforum" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="25" name="xchan_deleted" nullable="false" remarks="" size="0" type="BIT"/>
-         <primaryKey column="xchan_hash" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="xchan_hash"/>
-         </index>
-         <index name="xchan_addr" unique="false">
-            <column ascending="true" name="xchan_addr"/>
-         </index>
-         <index name="xchan_censored" unique="false">
-            <column ascending="true" name="xchan_censored"/>
-         </index>
-         <index name="xchan_connurl" unique="false">
-            <column ascending="true" name="xchan_connurl"/>
-         </index>
-         <index name="xchan_deleted" unique="false">
-            <column ascending="true" name="xchan_deleted"/>
-         </index>
-         <index name="xchan_flags" unique="false">
-            <column ascending="true" name="xchan_flags"/>
-         </index>
-         <index name="xchan_follow" unique="false">
-            <column ascending="true" name="xchan_follow"/>
-         </index>
-         <index name="xchan_guid" unique="false">
-            <column ascending="true" name="xchan_guid"/>
-         </index>
-         <index name="xchan_hidden" unique="false">
-            <column ascending="true" name="xchan_hidden"/>
-         </index>
-         <index name="xchan_instance_url" unique="false">
-            <column ascending="true" name="xchan_instance_url"/>
-         </index>
-         <index name="xchan_name" unique="false">
-            <column ascending="true" name="xchan_name"/>
-         </index>
-         <index name="xchan_network" unique="false">
-            <column ascending="true" name="xchan_network"/>
-         </index>
-         <index name="xchan_orphan" unique="false">
-            <column ascending="true" name="xchan_orphan"/>
-         </index>
-         <index name="xchan_pubforum" unique="false">
-            <column ascending="true" name="xchan_pubforum"/>
-         </index>
-         <index name="xchan_selfcensored" unique="false">
-            <column ascending="true" name="xchan_selfcensored"/>
-         </index>
-         <index name="xchan_system" unique="false">
-            <column ascending="true" name="xchan_system"/>
-         </index>
-         <index name="xchan_url" unique="false">
-            <column ascending="true" name="xchan_url"/>
-         </index>
-      </table>
-      <table name="xchat" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="xchat_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="xchat_url" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="xchat_desc" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="xchat_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="4" name="xchat_edited" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <primaryKey column="xchat_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="xchat_id"/>
-         </index>
-         <index name="xchat_desc" unique="false">
-            <column ascending="true" name="xchat_desc"/>
-         </index>
-         <index name="xchat_edited" unique="false">
-            <column ascending="true" name="xchat_edited"/>
-         </index>
-         <index name="xchat_url" unique="false">
-            <column ascending="true" name="xchat_url"/>
-         </index>
-         <index name="xchat_xchan" unique="false">
-            <column ascending="true" name="xchat_xchan"/>
-         </index>
-      </table>
-      <table name="xconfig" numRows="4" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="cat" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="k" nullable="false" remarks="" size="255" type="CHAR">
-            <parent column="k" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="cache"/>
-         </column>
-         <column autoUpdated="false" digits="0" id="4" name="v" nullable="false" remarks="" size="16777215" type="MEDIUMTEXT"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="cat" unique="false">
-            <column ascending="true" name="cat"/>
-         </index>
-         <index name="k" unique="false">
-            <column ascending="true" name="k"/>
-         </index>
-         <index name="xchan" unique="false">
-            <column ascending="true" name="xchan"/>
-         </index>
-      </table>
-      <table name="xign" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="id" nullable="false" remarks="" size="10" type="INT UNSIGNED">
-            <parent column="id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="verify"/>
-         </column>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="uid" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="id"/>
-         </index>
-         <index name="uid" unique="false">
-            <column ascending="true" name="uid"/>
-         </index>
-         <index name="xchan" unique="false">
-            <column ascending="true" name="xchan"/>
-         </index>
-      </table>
-      <table name="xlink" numRows="244" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="xlink_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="xlink_xchan" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="xlink_link" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="xlink_rating" nullable="false" remarks="" size="10" type="INT"/>
-         <column autoUpdated="false" digits="0" id="4" name="xlink_rating_text" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="0000-00-00 00:00:00" digits="0" id="5" name="xlink_updated" nullable="false" remarks="" size="19" type="DATETIME"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="6" name="xlink_static" nullable="false" remarks="" size="0" type="BIT"/>
-         <column autoUpdated="false" digits="0" id="7" name="xlink_sig" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <primaryKey column="xlink_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="xlink_id"/>
-         </index>
-         <index name="xlink_link" unique="false">
-            <column ascending="true" name="xlink_link"/>
-         </index>
-         <index name="xlink_rating" unique="false">
-            <column ascending="true" name="xlink_rating"/>
-         </index>
-         <index name="xlink_static" unique="false">
-            <column ascending="true" name="xlink_static"/>
-         </index>
-         <index name="xlink_updated" unique="false">
-            <column ascending="true" name="xlink_updated"/>
-         </index>
-         <index name="xlink_xchan" unique="false">
-            <column ascending="true" name="xlink_xchan"/>
-         </index>
-      </table>
-      <table name="xperm" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="xp_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="xp_client" nullable="false" remarks="" size="20" type="VARCHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="xp_channel" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="xp_perm" nullable="false" remarks="" size="64" type="VARCHAR"/>
-         <primaryKey column="xp_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="xp_id"/>
-         </index>
-         <index name="xp_channel" unique="false">
-            <column ascending="true" name="xp_channel"/>
-         </index>
-         <index name="xp_client" unique="false">
-            <column ascending="true" name="xp_client"/>
-         </index>
-         <index name="xp_perm" unique="false">
-            <column ascending="true" name="xp_perm"/>
-         </index>
-      </table>
-      <table name="xprof" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="false" digits="0" id="0" name="xprof_hash" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="xprof_age" nullable="false" remarks="" size="3" type="TINYINT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="xprof_desc" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="3" name="xprof_dob" nullable="false" remarks="" size="12" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="4" name="xprof_gender" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="5" name="xprof_marital" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="6" name="xprof_sexual" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="7" name="xprof_locale" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="8" name="xprof_region" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="9" name="xprof_postcode" nullable="false" remarks="" size="32" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="10" name="xprof_country" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" digits="0" id="11" name="xprof_keywords" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" digits="0" id="12" name="xprof_about" nullable="false" remarks="" size="65535" type="TEXT"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="13" name="xprof_homepage" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="14" name="xprof_hometown" nullable="false" remarks="" size="255" type="CHAR"/>
-         <primaryKey column="xprof_hash" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="xprof_hash"/>
-         </index>
-         <index name="xprof_age" unique="false">
-            <column ascending="true" name="xprof_age"/>
-         </index>
-         <index name="xprof_country" unique="false">
-            <column ascending="true" name="xprof_country"/>
-         </index>
-         <index name="xprof_desc" unique="false">
-            <column ascending="true" name="xprof_desc"/>
-         </index>
-         <index name="xprof_dob" unique="false">
-            <column ascending="true" name="xprof_dob"/>
-         </index>
-         <index name="xprof_gender" unique="false">
-            <column ascending="true" name="xprof_gender"/>
-         </index>
-         <index name="xprof_hometown" unique="false">
-            <column ascending="true" name="xprof_hometown"/>
-         </index>
-         <index name="xprof_locale" unique="false">
-            <column ascending="true" name="xprof_locale"/>
-         </index>
-         <index name="xprof_marital" unique="false">
-            <column ascending="true" name="xprof_marital"/>
-         </index>
-         <index name="xprof_postcode" unique="false">
-            <column ascending="true" name="xprof_postcode"/>
-         </index>
-         <index name="xprof_region" unique="false">
-            <column ascending="true" name="xprof_region"/>
-         </index>
-         <index name="xprof_sexual" unique="false">
-            <column ascending="true" name="xprof_sexual"/>
-         </index>
-      </table>
-      <table name="xtag" numRows="0" remarks="" type="TABLE">
-         <column autoUpdated="true" digits="0" id="0" name="xtag_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="1" name="xtag_hash" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="" digits="0" id="2" name="xtag_term" nullable="false" remarks="" size="255" type="CHAR"/>
-         <column autoUpdated="false" defaultValue="0" digits="0" id="3" name="xtag_flags" nullable="false" remarks="" size="10" type="INT"/>
-         <primaryKey column="xtag_id" sequenceNumberInPK="1"/>
-         <index name="PRIMARY" unique="true">
-            <column ascending="true" name="xtag_id"/>
-         </index>
-         <index name="xtag_flags" unique="false">
-            <column ascending="true" name="xtag_flags"/>
-         </index>
-         <index name="xtag_hash" unique="false">
-            <column ascending="true" name="xtag_hash"/>
-         </index>
-         <index name="xtag_term" unique="false">
-            <column ascending="true" name="xtag_term"/>
-         </index>
-      </table>
-   </tables>
-</database>
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php
index efea5d92f..1aa5f435e 100644
--- a/include/RedDAV/RedBrowser.php
+++ b/include/RedDAV/RedBrowser.php
@@ -188,7 +188,7 @@ class RedBrowser extends DAV\Browser\Plugin {
 
 			$parentHash = '';
 			$owner = $this->auth->owner_id;
-			$splitPath = split('/', $fullPath);
+			$splitPath = explode('/', $fullPath);
 			if (count($splitPath) > 3) {
 				for ($i = 3; $i < count($splitPath); $i++) {
 					$attachName = urldecode($splitPath[$i]);
diff --git a/include/account.php b/include/account.php
index b3a520fd4..e448bdcc6 100644
--- a/include/account.php
+++ b/include/account.php
@@ -67,7 +67,7 @@ function check_account_invite($invite_code) {
 			$result['message'] .= t('An invitation is required.') . EOL;
 		}
 		$r = q("select * from register where `hash` = '%s' limit 1", dbesc($invite_code));
-		if(! results($r)) {
+		if(! $r) {
 			$result['message'] .= t('Invitation could not be verified.') . EOL;
 		}
 	}
@@ -718,4 +718,4 @@ function upgrade_message($bbcode = false) {
 function upgrade_bool_message($bbcode = false) {
 	$x = upgrade_link($bbcode);
 	return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ;
-}
\ No newline at end of file
+}
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 4d44ec12e..3c8f34321 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -210,10 +210,13 @@ function fixacl(&$item) {
 	$item = str_replace(array('<','>'),array('',''),$item);
 }
 
-function populate_acl($defaults = null,$show_jotnets = true) {
+function populate_acl($defaults = null,$show_jotnets = true, $showall = '') {
 
 	$allow_cid = $allow_gid = $deny_cid = $deny_gid = false;
 
+	if(! $showall)
+		$showall = t('Visible to your default audience');
+
 	if(is_array($defaults)) {
 		$allow_cid = ((strlen($defaults['allow_cid'])) 
 			? explode('><', $defaults['allow_cid']) : array() );
@@ -231,22 +234,21 @@ function populate_acl($defaults = null,$show_jotnets = true) {
 	
 	$jotnets = '';
 	if($show_jotnets) {
-logger('jot_networks');
 		call_hooks('jot_networks', $jotnets);
 	}
 
 	$tpl = get_markup_template("acl_selector.tpl");
 	$o = replace_macros($tpl, array(
-		'$showall'=> t("Visible to your default audience"),
-		'$show'		 => t("Show"),
-		'$hide'		 => t("Don't show"),
-		'$allowcid' => json_encode($allow_cid),
-		'$allowgid' => json_encode($allow_gid),
-		'$denycid' => json_encode($deny_cid),
-		'$denygid' => json_encode($deny_gid),
-		'$jnetModalTitle' => t('Other networks and post services'),
-		'$jotnets' => $jotnets,
-		'$aclModalTitle' => t('Permissions'),
+		'$showall'         => $showall,
+		'$show'	           => t("Show"),
+		'$hide'	           => t("Don't show"),
+		'$allowcid'        => json_encode($allow_cid),
+		'$allowgid'        => json_encode($allow_gid),
+		'$denycid'         => json_encode($deny_cid),
+		'$denygid'         => json_encode($deny_gid),
+		'$jnetModalTitle'  => t('Other networks and post services'),
+		'$jotnets'         => $jotnets,
+		'$aclModalTitle'   => t('Permissions'),
 		'$aclModalDismiss' => t('Close')
 	));
 
diff --git a/include/api.php b/include/api.php
index e60583a01..5053977c5 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1,10 +1,10 @@
 <?php /** @file */
 
-require_once("bbcode.php");
-require_once("datetime.php");
-require_once("conversation.php");
-require_once("oauth.php");
-require_once("html2plain.php");
+require_once("include/bbcode.php");
+require_once("include/datetime.php");
+require_once("include/conversation.php");
+require_once("include/oauth.php");
+require_once("include/html2plain.php");
 require_once('include/security.php');
 require_once('include/photos.php');
 require_once('include/items.php');
@@ -112,8 +112,11 @@ require_once('include/api_auth.php');
 						break;
 					case "json":
 						header ("Content-Type: application/json");
-						foreach($r as $rr)
+						foreach($r as $rr) {
+							if(! $rr)
+								$rr = array();
 							$json = json_encode($rr);
+						}
 						if ($_GET['callback'])
 							$json = $_GET['callback']."(".$json.")";
 						return $json; 
@@ -248,6 +251,7 @@ require_once('include/api_auth.php');
 		if (count($uinfo)==0) {
 			return False;
 		}
+		$following = false;
 		
 		if(intval($uinfo[0]['abook_self'])) {
 			$usr = q("select * from channel where channel_id = %d limit 1",
@@ -263,18 +267,22 @@ require_once('include/api_auth.php');
 			$r = q("SELECT COUNT(`id`) as `count` FROM `item`
 					WHERE `uid` = %d
 					AND item_wall = 1 $item_normal 
-					AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+					AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''
+					AND item_private = 0 ",
 					intval($usr[0]['channel_id'])
 			);
 			$countitms = $r[0]['count'];
+			$following = true;
 		}
 		else {
 			$r = q("SELECT COUNT(`id`) as `count` FROM `item`
 					WHERE author_xchan = '%s'
-					AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+					AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''
+					AND item_private = 0 ",
 					intval($uinfo[0]['xchan_hash'])
 			);
 			$countitms = $r[0]['count'];
+			$following = (($uinfo[0]['abook_myperms'] & PERMS_R_STREAM) ? true : false );
 		}
 
 
@@ -310,7 +318,6 @@ require_once('include/api_auth.php');
 			'location' => ($usr) ? $usr[0]['channel_location'] : '',
 			'profile_image_url' => $uinfo[0]['xchan_photo_l'],
 			'url' => $uinfo[0]['xchan_url'],
-//FIXME
 			'contact_url' => $a->get_baseurl() . "/connections/".$uinfo[0]['abook_id'],
 			'protected' => false,	
 			'friends_count' => intval($countfriends),
@@ -334,7 +341,7 @@ require_once('include/api_auth.php');
 			'profile_background_tile' => false,
 			'profile_use_background_image' => false,
 			'notifications' => false,
-			'following' => '', // #XXX: fix me
+			'following' => $following,
 			'verified' => true // #XXX: fix me
 		);
 
@@ -414,7 +421,7 @@ require_once('include/api_auth.php');
 			'utc_offset' => 0, // #XXX: fix me
 			'time_zone' => '', //$uinfo[0]['timezone'],
 			'statuses_count' => 0,
-			'following' => 1,
+			'following' => false,
 			'statusnet_blocking' => false,
 			'notifications' => false,
 			'uid' => 0,
@@ -852,13 +859,38 @@ require_once('include/api_auth.php');
 			$_REQUEST['type'] = 'wall';
 		
 			if(x($_FILES,'media')) {
-				$_FILES['userfile'] = $_FILES['media'];
-				// upload the image if we have one
-				$_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo
-				require_once('mod/wall_attach.php');
-				$media = wall_attach_post($a);
-				if(strlen($media)>0)
-					$_REQUEST['body'] .= "\n\n".$media;
+				if(is_array($_FILES['media']['name'])) {
+					$num_uploads = count($_FILES['media']['name']);
+					for($x = 0; $x < $num_uploads; $x ++) {
+						$_FILES['userfile'] = array();
+						$_FILES['userfile']['name'] = $_FILES['media']['name'][$x];
+						$_FILES['userfile']['type'] = $_FILES['media']['type'][$x];
+						$_FILES['userfile']['tmp_name'] = $_FILES['media']['tmp_name'][$x];
+						$_FILES['userfile']['error'] = $_FILES['media']['error'][$x];
+						$_FILES['userfile']['size'] = $_FILES['media']['size'][$x];
+
+						// upload each image if we have any
+						$_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo
+						require_once('mod/wall_attach.php');
+						$a->data['api_info'] = $user_info;
+						$media = wall_attach_post($a);
+
+						if(strlen($media)>0)
+							$_REQUEST['body'] .= "\n\n" . $media;
+					}
+				}
+				else {
+					// AndStatus doesn't present media as an array
+					$_FILES['userfile'] = $_FILES['media'];
+					// upload each image if we have any
+					$_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo
+					require_once('mod/wall_attach.php');
+					$a->data['api_info'] = $user_info;
+					$media = wall_attach_post($a);
+
+					if(strlen($media)>0)
+						$_REQUEST['body'] .= "\n\n" . $media;
+				}
 			}
 		}
 
@@ -870,6 +902,7 @@ require_once('include/api_auth.php');
 		// this should output the last post (the one we just posted).
 		return api_status_show($a,$type);
 	}
+	api_register_func('api/statuses/update_with_media','api_statuses_update', true);
 	api_register_func('api/statuses/update','api_statuses_update', true);
 
 
@@ -1078,6 +1111,8 @@ require_once('include/api_auth.php');
 				'contributors' => ''					
 			);
 			$status_info['user'] = $user_info;
+			if(array_key_exists('status',$status_info['user']))
+				unset($status_info['user']['status']);
 		}
 
 		return  api_apply_template("status", $type, array('$status' => $status_info));
@@ -1319,6 +1354,8 @@ require_once('include/api_auth.php');
 
 		// params
 		$id = intval(argv(3));
+		if(! $id)
+			$id = $_REQUEST['id'];
 
 		logger('API: api_statuses_show: '.$id);
 
@@ -1335,10 +1372,12 @@ require_once('include/api_auth.php');
 		$r = q("select * from item where true $item_normal $sql_extra",
 			intval($id)
 		);
+
 		xchan_query($r,true);
 
 		$ret = api_format_items($r,$user_info);
 
+
 		if ($conversation) {
 			$data = array('$statuses' => $ret);
 			return api_apply_template("timeline", $type, $data);
@@ -2298,28 +2337,28 @@ require_once('include/api_auth.php');
 	api_register_func('api/direct_messages','api_direct_messages_inbox',true);
 
 
-
 	function api_oauth_request_token(&$a, $type){
 		try{
-			$oauth = new FKOAuth1();
-			$req = OAuthRequest::from_request();
-logger('Req: ' . var_export($req,true));
+			$oauth = new ZotOAuth1();
+			$req = OAuth1Request::from_request();
+			logger('Req: ' . var_export($req,true),LOGGER_DATA);
 			$r = $oauth->fetch_request_token($req);
 		}catch(Exception $e){
 			logger('oauth_exception: ' . print_r($e->getMessage(),true));
-			echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); 
+			echo "error=". OAuth1Util::urlencode_rfc3986($e->getMessage()); 
 			killme();
 		}
 		echo $r;
 		killme();	
 	}
+
 	function api_oauth_access_token(&$a, $type){
 		try{
-			$oauth = new FKOAuth1();
-			$req = OAuthRequest::from_request();
+			$oauth = new ZotOAuth1();
+			$req = OAuth1Request::from_request();
 			$r = $oauth->fetch_access_token($req);
 		}catch(Exception $e){
-			echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme();
+			echo "error=". OAuth1Util::urlencode_rfc3986($e->getMessage()); killme();
 		}
 		echo $r;
 		killme();			
diff --git a/include/api_auth.php b/include/api_auth.php
index ee9db3f55..26a9df8d4 100644
--- a/include/api_auth.php
+++ b/include/api_auth.php
@@ -1,17 +1,19 @@
 <?php /** @file */
 
-require_once("oauth.php");
-
-
 /**
- * Simple HTTP Login
+ * API Login via basic-auth or OAuth
  */
 
 function api_login(&$a){
+
+	$record = null;
+
+	require_once('include/oauth.php');
+
 	// login with oauth
 	try {
-		$oauth = new FKOAuth1();
-		$req = OAuthRequest::from_request();
+		$oauth = new ZotOAuth1();
+		$req = OAuth1Request::from_request();
 
 		list($consumer,$token) = $oauth->verify_request($req);
 
@@ -23,16 +25,14 @@ function api_login(&$a){
 			call_hooks('logged_in', $a->user);
 			return;
 		}
-		echo __file__.__line__.__function__."<pre>"; 
-//			var_dump($consumer, $token); 
-		die();
+		killme();
 	}
 	catch(Exception $e) {
-		logger(__file__.__line__.__function__."\n".$e);
+		logger($e->getMessage());
 	}
-
 		
-	// workaround for HTTP-auth in CGI mode
+	// workarounds for HTTP-auth in CGI mode
+
 	if(x($_SERVER,'REDIRECT_REMOTE_USER')) {
 		$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"],6)) ;
 		if(strlen($userpass)) {
@@ -51,45 +51,49 @@ function api_login(&$a){
 		}
 	}
 
+	require_once('include/auth.php');
+	require_once('include/security.php');
 
-	if (!isset($_SERVER['PHP_AUTH_USER'])) {
-		logger('API_login: ' . print_r($_SERVER,true), LOGGER_DEBUG);
-		header('WWW-Authenticate: Basic realm="Red"');
-		header('HTTP/1.0 401 Unauthorized');
-		die('This api requires login');
-	}
-		
 	// process normal login request
-	require_once('include/auth.php');
-	$channel_login = 0;
-	$record = account_verify_password($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']);
-	if(! $record) {
-	        $r = q("select * from channel where channel_address = '%s' limit 1",
+
+	if(isset($_SERVER['PHP_AUTH_USER'])) {
+		$channel_login = 0;
+		$record = account_verify_password($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']);
+		if(! $record) {
+	        $r = q("select * from channel left join account on account.account_id = channel.channel_account_id 
+				where channel.channel_address = '%s' limit 1",
 		       dbesc($_SERVER['PHP_AUTH_USER'])
 			);
         	if ($r) {
-			$x = q("select * from account where account_id = %d limit 1",
-			       intval($r[0]['channel_account_id'])
-				);
-			if ($x) {
-				$record = account_verify_password($x[0]['account_email'],$_SERVER['PHP_AUTH_PW']);
+				$record = account_verify_password($r[0]['account_email'],$_SERVER['PHP_AUTH_PW']);
 				if($record)
 					$channel_login = $r[0]['channel_id'];
 			}
 		}
-		if(! $record) {	
-			logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
-			header('WWW-Authenticate: Basic realm="Red"');
-			header('HTTP/1.0 401 Unauthorized');
-			die('This api requires login');
-		}
 	}
 
-	require_once('include/security.php');
-	authenticate_success($record);
+	if($record) {
+		authenticate_success($record);
 
-	if($channel_login)
-		change_channel($channel_login);
+		if($channel_login)
+			change_channel($channel_login);
+
+		$_SESSION['allow_api'] = true;
+		return true;
+	}
+	else {
+		$_SERVER['PHP_AUTH_PW'] = '*****';
+		logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
+		log_failed_login('API login failure');
+		retry_basic_auth();
+	}
 
-	$_SESSION['allow_api'] = true;
 }
+
+
+function retry_basic_auth() {
+	header('WWW-Authenticate: Basic realm="Hubzilla"');
+	header('HTTP/1.0 401 Unauthorized');
+	echo('This api requires login');
+	killme();
+}
\ No newline at end of file
diff --git a/include/attach.php b/include/attach.php
index 36b971712..8595d5d86 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -430,7 +430,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 			$observer = $x[0];
 	}
 
-	logger('arr: ' . print_r($arr,true));
+	logger('arr: ' . print_r($arr,true), LOGGER_DATA);
 
 	if(! perm_is_allowed($channel_id,$observer_hash, 'write_storage')) {
 		$ret['message'] = t('Permission denied.');
@@ -503,6 +503,10 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		}
 	}
 
+	// AndStatus sends jpegs with a non-standard mimetype
+	if($type === 'image/jpg')
+		$type = 'image/jpeg';
+
 	$existing_size = 0;
 
 	if($options === 'replace') {
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 1be7caa19..81b95b30b 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -305,15 +305,6 @@ function bb2diaspora_itembody($item, $force_update = false) {
 
 	$matches = array();
 
-	//if we have a photo item just prepend the photo bbcode to item['body']
-	$is_photo = (($item['obj_type'] == ACTIVITY_OBJ_PHOTO) ? true : false);
-	if($is_photo) {
-		$object = json_decode($item['object'],true);
-		if($object['bbcode']) {
-			$item['body'] = (($item['body']) ? $object['bbcode'] . "\r\n" . $item['body'] : $object['bbcode']);
-		}
-	}
-
 	if(($item['diaspora_meta']) && (! $force_update)) {
 		$diaspora_meta = json_decode($item['diaspora_meta'],true);
 		if($diaspora_meta) {
@@ -333,6 +324,8 @@ function bb2diaspora_itembody($item, $force_update = false) {
 		}
 	}
 
+	create_export_photo_body($item);
+
 	$newitem = $item;
 
 	if(array_key_exists('item_obscured',$item) && intval($item['item_obscured'])) {
@@ -346,6 +339,7 @@ function bb2diaspora_itembody($item, $force_update = false) {
 		}
 	}
 
+
 	bb2diaspora_itemwallwall($newitem);
 
 	$title = $newitem['title'];
diff --git a/include/comanche.php b/include/comanche.php
index ef71886f2..ca3ad336b 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -284,8 +284,12 @@ function comanche_widget($name, $text) {
 
 	$func = 'widget_' . trim($name);
 
-	if((! function_exists($func)) && file_exists('widget/' . trim($name) . '.php'))
-		require_once('widget/' . trim($name) . '.php');
+	if(! function_exists($func)) {
+		if(file_exists('widget/' . trim($name) . '.php'))
+			require_once('widget/' . trim($name) . '.php');
+		elseif(file_exists('widget/' . trim($name) . '/' . trim($name) . '.php'))
+			require_once('widget/' . trim($name) . '/' . trim($name) . '.php');
+	}
 	else {
 		$theme_widget = $func . '.php';
 		if((! function_exists($func)) && theme_include($theme_widget))
diff --git a/include/conversation.php b/include/conversation.php
index 3b534dc69..747bb5d0a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1227,7 +1227,7 @@ function status_editor($a, $x, $popup = false) {
 		'$wait' => t('Please wait'),
 		'$permset' => t('Permission settings'),
 		'$shortpermset' => t('permissions'),
-		'$ptyp' => (($notes_cid) ? 'note' : 'wall'),
+		'$ptyp' => '',
 		'$content' => ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''),
 		'$attachment' => ((x($x, 'attachment')) ? $x['attachment'] : ''),
 		'$post_id' => '',
diff --git a/include/deliver.php b/include/deliver.php
index de93e316e..40df543d5 100644
--- a/include/deliver.php
+++ b/include/deliver.php
@@ -2,6 +2,7 @@
 
 require_once('include/cli_startup.php');
 require_once('include/zot.php');
+require_once('include/queue_fn.php');
 
 
 function deliver_run($argv, $argc) {
@@ -15,7 +16,6 @@ function deliver_run($argv, $argc) {
 
 	logger('deliver: invoked: ' . print_r($argv,true), LOGGER_DATA);
 
-
 	for($x = 1; $x < $argc; $x ++) {
 
 		$dresult = null;
@@ -24,87 +24,6 @@ function deliver_run($argv, $argc) {
 		);
 		if($r) {
 
-			/**
-			 * Check to see if we have any recent communications with this hub (in the last month).
-			 * If not, reduce the outq_priority.
-			 */
-
-			$base = '';
-
-			$h = parse_url($r[0]['outq_posturl']);
-			if($h) {
-				$base = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : '');
-				if($base !== z_root()) {
-					$y = q("select site_update, site_dead from site where site_url = '%s' ",
-						dbesc($base)
-					);
-					if($y) {
-						if(intval($y[0]['site_dead'])) {
-							q("delete from outq where outq_posturl = '%s'",
-								dbesc($r[0]['outq_posturl'])
-							);
-							logger('dead site ignored ' . $base);
-							continue;							
-						}
-						if($y[0]['site_update'] < datetime_convert('UTC','UTC','now - 1 month')) {
-							q("update outq set outq_priority = %d where outq_hash = '%s'",
-								intval($r[0]['outq_priority'] + 10),
-								dbesc($r[0]['outq_hash'])
-							);
-							logger('immediate delivery deferred for site ' . $base);
-							continue;
-						}
-					}
-					else {
-
-						// zot sites should all have a site record, unless they've been dead for as long as 
-						// your site has existed. Since we don't know for sure what these sites are, 
-						// call them unknown
-
-						q("insert into site (site_url, site_update, site_dead, site_type) values ('%s','%s',0,%d) ",
-							dbesc($base),
-							dbesc(datetime_convert()),
-							intval(($r[0]['outq_driver'] === 'post') ? SITE_TYPE_NOTZOT : SITE_TYPE_UNKNOWN)
-						);
-					}
-				}
-			} 
-
-			// "post" queue driver - used for diaspora and friendica-over-diaspora communications.
-
-			if($r[0]['outq_driver'] === 'post') {
-
-
-				$result = z_post_url($r[0]['outq_posturl'],$r[0]['outq_msg']); 
-				if($result['success'] && $result['return_code'] < 300) {
-					logger('deliver: queue post success to ' . $r[0]['outq_posturl'], LOGGER_DEBUG);
-					if($base) {
-						q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
-							dbesc(datetime_convert()),
-							dbesc($base)
-						);
-					}
-					q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s' limit 1",
-						dbesc('accepted for delivery'),
-						dbesc(datetime_convert()),
-						dbesc($argv[$x])
-					);
-
-					$y = q("delete from outq where outq_hash = '%s'",
-						dbesc($argv[$x])
-					);
-
-				}
-				else {
-					logger('deliver: queue post returned ' . $result['return_code'] . ' from ' . $r[0]['outq_posturl'],LOGGER_DEBUG);
-					$y = q("update outq set outq_updated = '%s' where outq_hash = '%s'",
-						dbesc(datetime_convert()),
-						dbesc($argv[$x])
-					);
-				}
-				continue;
-			}
-
 			$notify = json_decode($r[0]['outq_notify'],true);
 
 			// Messages without an outq_msg will need to go via the web, even if it's a
@@ -112,6 +31,7 @@ function deliver_run($argv, $argc) {
 
 			if(($r[0]['outq_posturl'] === z_root() . '/post') && ($r[0]['outq_msg'])) {
 				logger('deliver: local delivery', LOGGER_DEBUG);
+
 				// local delivery
 				// we should probably batch these and save a few delivery processes
 
@@ -127,9 +47,9 @@ function deliver_run($argv, $argc) {
 						$msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $m)))));
 						$dresult = zot_import($msg,z_root());
 					}
-					$r = q("delete from outq where outq_hash = '%s'",
-						dbesc($argv[$x])
-					);
+
+					remove_queue_item($r[0]['outq_hash']);
+
 					if($dresult && is_array($dresult)) {
 						foreach($dresult as $xx) {
 							if(is_array($xx) && array_key_exists('message_id',$xx)) {
@@ -147,27 +67,16 @@ function deliver_run($argv, $argc) {
 						}
 					}
 
-					q("delete from dreport where dreport_queue = '%s' limit 1",
-						dbesc($argv[$x])
-					);
-				}
-			}
-			else {
-				logger('deliver: dest: ' . $r[0]['outq_posturl'], LOGGER_DEBUG);
-				$result = zot_zot($r[0]['outq_posturl'],$r[0]['outq_notify']); 
-				if($result['success']) {
-					logger('deliver: remote zot delivery succeeded to ' . $r[0]['outq_posturl']);
-					zot_process_response($r[0]['outq_posturl'],$result, $r[0]);				
-				}
-				else {
-					logger('deliver: remote zot delivery failed to ' . $r[0]['outq_posturl']);
-					logger('deliver: remote zot delivery fail data: ' . print_r($result,true), LOGGER_DATA);
-					$y = q("update outq set outq_updated = '%s' where outq_hash = '%s'",
-						dbesc(datetime_convert()),
+					q("delete from dreport where dreport_queue = '%s'",
 						dbesc($argv[$x])
 					);
 				}
 			}
+
+			// otherwise it's a remote delivery - call queue_deliver() with the $immediate flag
+
+			queue_deliver($r[0],true);
+
 		}
 	}
 }
diff --git a/include/directory.php b/include/directory.php
index 9ab1d805b..8792a15e1 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -8,6 +8,7 @@ require_once('boot.php');
 require_once('include/zot.php');
 require_once('include/cli_startup.php');
 require_once('include/dir_fns.php');
+require_once('include/queue_fn.php');
 
 /**
  * @brief
@@ -83,20 +84,17 @@ function directory_run($argv, $argc){
 		 */
 
 		$hash = random_string();
-		q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) 
-			values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
-			dbesc($hash),
-			intval($channel['channel_account_id']),
-			intval($channel['channel_id']),
-			dbesc('zot'),
-			dbesc($url),
-			intval(1),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			dbesc($packet),
-			dbesc('')
-		);
-	} else {
+
+		queue_insert(array(
+			'hash'       => $hash,
+			'account_id' => $channel['channel_account_id'],
+			'channel_id' => $channel['channel_id'],
+			'posturl'    => $url,
+			'notify'     => $packet,
+		));
+
+	}
+	else {
 		q("update channel set channel_dirdate = '%s' where channel_id = %d",
 			dbesc(datetime_convert()),
 			intval($channel['channel_id'])
diff --git a/include/follow.php b/include/follow.php
index 40ad2c299..5e1146657 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -122,6 +122,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		else
 			$permissions = $j['permissions'];
 
+
 		foreach($permissions as $k => $v) {
 			if($v) {
 				$their_perms = $their_perms | intval($global_perms[$k][1]);
@@ -161,18 +162,20 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 			}
 		}
 		if($r) {
+			$xchan = $r[0];
 			$xchan_hash = $r[0]['xchan_hash'];
 			$their_perms = 0;
 		}
 	}
 
+
 	if(! $xchan_hash) {
 		$result['message'] = t('Channel discovery failed.');
 		logger('follow: ' . $result['message']);
 		return $result;
 	}
 
-	$x = array('channel_id' => $uid, 'follow_address' => $url, 'xchan' => $r[0], 'allowed' => 1);
+	$x = array('channel_id' => $uid, 'follow_address' => $url, 'xchan' => $r[0], 'allowed' => 1, 'singleton' => 0);
 
 	call_hooks('follow_allow',$x);
 
@@ -180,7 +183,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		$result['message'] = t('Protocol disabled.');
 		return $result;
 	}
-
+	$singleton = intval($x['singleton']);
 
 	if((local_channel()) && $uid == local_channel()) {
 		$aid = get_account_id();
@@ -201,6 +204,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		$default_group = $r[0]['channel_default_group'];
 	}
 
+
 	if($is_http) {
 
 
@@ -221,24 +225,34 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		return $result;
 	}
 
-	$r = q("select abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
+	$r = q("select abook_xchan, abook_instance from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
 		dbesc($xchan_hash),
 		intval($uid)
 	);
+
+
 	if($r) {
-		$x = q("update abook set abook_their_perms = %d where abook_id = %d",
+		$abook_instance = $r[0]['abook_instance'];
+
+		if(($singleton) && strpos($abook_instance,z_root()) === false) {
+			if($abook_instance)
+				$abook_instance .= ',';
+			$abook_instance .= z_root();
+		}
+
+		$x = q("update abook set abook_their_perms = %d, abook_instance = '%s' where abook_id = %d",
 			intval($their_perms),
+			dbesc($abook_instance),
 			intval($r[0]['abook_id'])
 		);		
 	}
 	else {
-
 		$closeness = get_pconfig($uid,'system','new_abook_closeness');
 		if($closeness === false)
 			$closeness = 80;
 
-		$r = q("insert into abook ( abook_account, abook_channel, abook_closeness, abook_xchan, abook_feed, abook_their_perms, abook_my_perms, abook_created, abook_updated )
-			values( %d, %d, %d, '%s', %d, %d, %d, '%s', '%s' ) ",
+		$r = q("insert into abook ( abook_account, abook_channel, abook_closeness, abook_xchan, abook_feed, abook_their_perms, abook_my_perms, abook_created, abook_updated, abook_instance )
+			values( %d, %d, %d, '%s', %d, %d, %d, '%s', '%s', '%s' ) ",
 			intval($aid),
 			intval($uid),
 			intval($closeness),
@@ -247,7 +261,8 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 			intval(($is_http) ? $their_perms|PERMS_R_STREAM|PERMS_A_REPUBLISH : $their_perms),
 			intval($my_perms),
 			dbesc(datetime_convert()),
-			dbesc(datetime_convert())
+			dbesc(datetime_convert()),
+			dbesc(($singleton) ? z_root() : '')
 		);
 	}
 
@@ -259,6 +274,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		dbesc($xchan_hash),
 		intval($uid)
 	);
+
 	if($r) {
 		$result['abook'] = $r[0];
 		proc_run('php', 'include/notifier.php', 'permission_create', $result['abook']['abook_id']);
diff --git a/include/identity.php b/include/identity.php
index 95ade3b28..cfedd243a 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -178,7 +178,7 @@ function create_identity($arr) {
 	$ret = array('success' => false);
 
 	if(! $arr['account_id']) {
-		$ret['message'] = t('No account identifier');
+	$ret['message'] = t('No account identifier');
 		return $ret;
 	}
 	$ret = identity_check_service_class($arr['account_id']);
@@ -352,7 +352,7 @@ function create_identity($arr) {
 	);
 
 	if($role_permissions) {
-		$myperms = ((array_key_exists('perms_auto',$role_permissions) && $role_permissions['perms_auto']) ? intval($role_permissions['perms_accept']) : 0);
+		$myperms = ((array_key_exists('perms_accept',$role_permissions)) ? intval($role_permissions['perms_accept']) : 0);
 	}
 	else
 		$myperms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK
@@ -896,12 +896,6 @@ function profile_load(&$a, $nickname, $profile = '') {
 
 	$_SESSION['theme'] = $p[0]['channel_theme'];
 
-//	$a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
-
-//	$theme_info_file = "view/theme/".current_theme()."/php/theme.php";
-//	if (file_exists($theme_info_file)){
-//		require_once($theme_info_file);
-//	}
 }
 
 /**
diff --git a/include/items.php b/include/items.php
index ef1867c14..44f9633a9 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2349,7 +2349,7 @@ function item_store($arr, $allow_exec = false) {
 				return $ret;
 			}
 
-			if($arr['obj_type'] == ACTIVITY_OBJ_NOTE)
+			if(($arr['obj_type'] == ACTIVITY_OBJ_NOTE) && (! $arr['object']))
 				$arr['obj_type'] = ACTIVITY_OBJ_COMMENT;
 
 			// is the new message multi-level threaded?
@@ -2870,6 +2870,7 @@ function send_status_notifications($post_id,$item) {
 	if($x) {
 		foreach($x as $xx) {
 			if($xx['author_xchan'] === $r[0]['channel_hash']) {
+
 				$notify = true;
 
 				// check for an unfollow thread activity - we should probably decode the obj and check the id
@@ -3334,7 +3335,6 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
 	if((! $private) && $new_public_policy)
 		$private = 1;
 
-
 	$item_wall = 1;
 	$item_origin = 1;
 	$item_uplink = 0;
@@ -3385,8 +3385,13 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
 
 	if($r)
 		proc_run('php','include/notifier.php','tgroup',$item_id);
-	else
+	else {
 		logger('start_delivery_chain: failed to update item');
+		// reset the source xchan to prevent loops
+		$r = q("update item set source_xchan = '' where id = %d",
+			intval($item_id)
+		);
+	}
 }
 
 /**
@@ -3949,6 +3954,8 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
 		return '<at:deleted-entry ref="' . xmlify($item['mid']) . '" when="' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '" />' . "\r\n";
 
 
+	create_export_photo_body($item);
+
 	if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
 		$body = fix_private_photos($item['body'],$owner['uid'],$item,$cid);
 	else
diff --git a/include/message.php b/include/message.php
index 6a9e8328a..940fcc275 100644
--- a/include/message.php
+++ b/include/message.php
@@ -506,3 +506,4 @@ function private_messages_fetch_conversation($channel_id, $messageitem_id, $upda
 	return $messages;
 
 }
+
diff --git a/include/network.php b/include/network.php
index f386afc8e..859a60650 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1796,6 +1796,7 @@ function get_site_info() {
 		'url' => z_root(),
 		'plugins' => $visible_plugins,
 		'register_policy' =>  $register_policy[get_config('system','register_policy')],
+		'invitation_only' => intval(get_config('system','invitation_only')),
 		'directory_mode' =>  $directory_mode[get_config('system','directory_mode')],
 		'language' => get_config('system','language'),
 		'rss_connections' => get_config('system','feed_contacts'),
@@ -1822,6 +1823,13 @@ function check_siteallowed($url) {
 
 	$retvalue = true;
 
+
+	$arr = array('url' => $url);
+	call_hooks('check_siteallowed',$arr);
+
+	if(array_key_exists('allowed',$arr))
+		return $arr['allowed'];
+
 	$bl1 = get_config('system','whitelisted_sites');
 	if(is_array($bl1) && $bl1) {
 		foreach($bl1 as $bl) {
@@ -1848,6 +1856,12 @@ function check_channelallowed($hash) {
 
 	$retvalue = true;
 
+	$arr = array('hash' => $hash);
+	call_hooks('check_channelallowed',$arr);
+
+	if(array_key_exists('allowed',$arr))
+		return $arr['allowed'];
+
 	$bl1 = get_config('system','whitelisted_channels');
 	if(is_array($bl1) && $bl1) {
 		foreach($bl1 as $bl) {
@@ -1870,3 +1884,16 @@ function check_channelallowed($hash) {
 	return $retvalue;
 }
 
+function deliverable_singleton($xchan) {
+	$r = q("select abook_instance from abook where abook_xchan = '%s' limit 1",
+		dbesc($xchan['xchan_hash'])
+	);
+	if($r) {
+		if(! $r[0]['abook_instance'])
+			return true;
+		if(strpos($r[0]['abook_instance'],z_root()) !== false)
+			return true;
+	}
+	return false;
+}
+
diff --git a/include/notifier.php b/include/notifier.php
index b7830285a..32d702cb5 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -44,7 +44,6 @@ require_once('include/html2plain.php');
  *		expire					(in items.php)
  *		like					(in like.php, poke.php)
  *		mail					(in message.php)
- *		suggest					(in fsuggest.php)
  *		tag						(in photos.php, poke.php, tagger.php)
  *		tgroup					(in items.php)
  *		wall-new				(in photos.php, item.php)
@@ -52,11 +51,14 @@ require_once('include/html2plain.php');
  * and ITEM_ID is the id of the item in the database that needs to be sent to others.
  *
  * ZOT 
+ *       permission_create      abook_id
  *       permission_update      abook_id
  *       refresh_all            channel_id
  *       purge_all              channel_id
  *       expire                 channel_id
  *       relay					item_id (item was relayed to owner, we will deliver it as owner)
+ *       single_activity        item_id (deliver to a singleton network from the appropriate clone)
+ *       single_mail            mail_id (deliver to a singleton network from the appropriate clone)
  *       location               channel_id
  *       request                channel_id            xchan_hash             message_id
  *       rating                 xlink_id
@@ -66,6 +68,12 @@ require_once('include/html2plain.php');
 require_once('include/cli_startup.php');
 require_once('include/zot.php');
 require_once('include/queue_fn.php');
+require_once('include/session.php');
+require_once('include/datetime.php');
+require_once('include/items.php');
+require_once('include/bbcode.php');
+require_once('include/identity.php');
+require_once('include/Contact.php');
 
 function notifier_run($argv, $argc){
 
@@ -73,15 +81,10 @@ function notifier_run($argv, $argc){
 
 	$a = get_app();
 
-	require_once("session.php");
-	require_once("datetime.php");
-	require_once('include/items.php');
-	require_once('include/bbcode.php');
 
 	if($argc < 3)
 		return;
 
-
 	logger('notifier: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
 
 	$cmd = $argv[1];
@@ -93,7 +96,6 @@ function notifier_run($argv, $argc){
 	if(! $item_id)
 		return;
 
-	require_once('include/identity.php');
 	$sys = get_sys_channel();
 
 	$deliveries = array();
@@ -108,87 +110,8 @@ function notifier_run($argv, $argc){
 	}
 
 
-	if($cmd == 'permission_update' || $cmd == 'permission_create') {
-		// Get the recipient	
-		$r = q("select abook.*, hubloc.* from abook 
-			left join hubloc on hubloc_hash = abook_xchan
-			where abook_id = %d and abook_self = 0
-			and not (hubloc_flags & %d) > 0  and not (hubloc_status & %d) > 0 limit 1",
-			intval($item_id),
-			intval(HUBLOC_FLAGS_DELETED),
-			intval(HUBLOC_OFFLINE)
-		);
-
-		if($r) {
-			// Get the sender
-			$s = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
-				intval($r[0]['abook_channel'])
-			);
-			if($s) {
-				$perm_update = array('sender' => $s[0], 'recipient' => $r[0], 'success' => false, 'deliveries' => '');
-
-				if($cmd == 'permission_create')
-					call_hooks('permissions_create',$perm_update);
-				else
-					call_hooks('permissions_update',$perm_update);
-
-				if($perm_update['success'] && $perm_update['deliveries'])
-					$deliveries[] = $perm_update['deliveries'];
-
-				if(! $perm_update['success']) {
-					// send a refresh message to each hub they have registered here	
-					$h = q("select * from hubloc where hubloc_hash = '%s' 
-						and not (hubloc_flags & %d) > 0  and not (hubloc_status & %d) > 0",
-						dbesc($r[0]['hubloc_hash']),
-						intval(HUBLOC_FLAGS_DELETED),
-						intval(HUBLOC_OFFLINE)
-					);
-					if($h) {
-						foreach($h as $hh) {
-							if(in_array($hh['hubloc_url'],$dead_hubs)) {
-								logger('skipping dead hub: ' . $hh['hubloc_url'], LOGGER_DEBUG);
-									continue;
-							}
-
-							$data = zot_build_packet($s[0],'refresh',array(array(
-								'guid' => $hh['hubloc_guid'],
-								'guid_sig' => $hh['hubloc_guid_sig'],
-								'url' => $hh['hubloc_url'])
-							));
-							if($data) {
-								$hash = random_string();
-								q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) 
-									values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
-                					dbesc($hash),
-									intval($s[0]['channel_account_id']),
-									intval($s[0]['channel_id']),
-									dbesc('zot'),
-									dbesc($hh['hubloc_callback']),
-									intval(1),
-									dbesc(datetime_convert()),
-									dbesc(datetime_convert()),
-									dbesc($data),
-									dbesc('')
-								);
-								$deliveries[] = $hash;
-							}
-						}
-
-					}
-				}
-
-				if($deliveries) 
-					do_delivery($deliveries);
-			}
-		}
-		return;
-	}	
-
-
-	$expire = false;
 	$request = false;
 	$mail = false;
-	$fsuggest = false;
 	$top_level = false;
 	$location  = false;
 	$recipients = array();
@@ -237,51 +160,43 @@ function notifier_run($argv, $argc){
 		$packet_type = 'request';
 		$normal_mode = false;
 	}
-	elseif($cmd === 'expire') {
-
-		// FIXME
-		// This will require a special zot packet containing a list of item message_id's to be expired. 
-		// This packet will be public, since we cannot selectively deliver here. 
-		// We need the handling on this end to create the array, and the handling on the remote end
-		// to verify permissions (for each item) and process it. Until this is complete, the expire feature will be disabled.
- 
-		return;
-
-		$normal_mode = false;
-		$expire = true;
-		$items = q("SELECT * FROM item WHERE uid = %d AND item_wall = 1
-			AND item_deleted = 1 AND `changed` > %s - INTERVAL %s",
-			intval($item_id),
-			db_utcnow(), db_quoteinterval('10 MINUTE')
+	elseif($cmd == 'permission_update' || $cmd == 'permission_create') {
+		// Get the (single) recipient	
+		$r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_self = 0",
+			intval($item_id)
 		);
-		$uid = $item_id;
-		$item_id = 0;
-		if(! $items)
-			return;
+		if($r) {
+			$uid = $r[0]['abook_channel'];
+			// Get the sender
+			$channel = channelx_by_n($uid);
+			if($channel) {
+				$perm_update = array('sender' => $channel, 'recipient' => $r[0], 'success' => false, 'deliveries' => '');
 
-	}
-	elseif($cmd === 'suggest') {
-		$normal_mode = false;
-		$fsuggest = true;
+				if($cmd == 'permission_create')
+					call_hooks('permissions_create',$perm_update);
+				else
+					call_hooks('permissions_update',$perm_update);
 
-		$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
-			intval($item_id)
-		);
-		if(! count($suggest))
-			return;
-		$uid = $suggest[0]['uid'];
-		$recipients[] = $suggest[0]['cid'];
-		$item = $suggest[0];
+				if($perm_update['success']) {
+					if($perm_update['deliveries']) {
+						$deliveries[] = $perm_update['deliveries'];
+						do_delivery($deliveries);
+					}
+					return;				
+				}
+				else {
+					$recipients[] = $r[0]['abook_xchan'];
+					$private = false;
+					$packet_type = 'refresh';
+					$packet_recips = array(array('guid' => $r[0]['xchan_guid'],'guid_sig' => $r[0]['xchan_guid_sig'],'hash' => $r[0]['xchan_hash']));
+				}
+			}
+		}
 	}
 	elseif($cmd === 'refresh_all') {
 		logger('notifier: refresh_all: ' . $item_id);
-		$s = q("select * from channel where channel_id = %d limit 1",
-			intval($item_id)
-		);
-		if($s)
-			$channel = $s[0];
 		$uid = $item_id;
-		$recipients = array();
+		$channel = channelx_by_n($item_id);
 		$r = q("select abook_xchan from abook where abook_channel = %d",
 			intval($item_id)
 		);
@@ -383,7 +298,7 @@ function notifier_run($argv, $argc){
 			$channel = $s[0];
 
 		if($channel['channel_hash'] !== $target_item['author_xchan'] && $channel['channel_hash'] !== $target_item['owner_xchan']) {
-			logger("notifier: Sending channel {$channel['channel_hash']} is not owner {$target_item['owner_xchan']} or author {$target_item['author_xchan']}");
+			logger("notifier: Sending channel {$channel['channel_hash']} is not owner {$target_item['owner_xchan']} or author {$target_item['author_xchan']}", LOGGER_NORMAL, LOG_WARNING);
 			return;
 		}
 
@@ -402,7 +317,7 @@ function notifier_run($argv, $argc){
 				return;
 
 			if(strpos($r[0]['postopts'],'nodeliver') !== false) {
-				logger('notifier: target item is undeliverable', LOGGER_DEBUG);
+				logger('notifier: target item is undeliverable', LOGGER_DEBUG, LOG_NOTICE);
 				return;
 			}
 
@@ -438,8 +353,8 @@ function notifier_run($argv, $argc){
 		// $cmd === 'relay' indicates the owner is sending it to the original recipients
 		// don't allow the item in the relay command to relay to owner under any circumstances, it will loop
 
-		logger('notifier: relay_to_owner: ' . (($relay_to_owner) ? 'true' : 'false'), LOGGER_DATA);
-		logger('notifier: top_level_post: ' . (($top_level_post) ? 'true' : 'false'), LOGGER_DATA);
+		logger('notifier: relay_to_owner: ' . (($relay_to_owner) ? 'true' : 'false'), LOGGER_DATA, LOG_DEBUG);
+		logger('notifier: top_level_post: ' . (($top_level_post) ? 'true' : 'false'), LOGGER_DATA, LOG_DEBUG);
 
 		// tag_deliver'd post which needs to be sent back to the original author
 
@@ -464,9 +379,12 @@ function notifier_run($argv, $argc){
 			// if our parent is a tag_delivery recipient, uplink to the original author causing
 			// a delivery fork. 
 
-			if(intval($parent_item['item_uplink']) && (! $top_level_post) && ($cmd !== 'uplink')) {
-				logger('notifier: uplinking this item');
-				proc_run('php','include/notifier.php','uplink',$item_id);
+			if(($parent_item) && intval($parent_item['item_uplink']) && (! $top_level_post) && ($cmd !== 'uplink')) {
+				// don't uplink a relayed post to the relay owner
+				if($parent_item['source_xchan'] !== $parent_item['owner_xchan']) {
+					logger('notifier: uplinking this item');
+					proc_run('php','include/notifier.php','uplink',$item_id);
+				}
 			}
 
 			$private = false;
@@ -478,7 +396,7 @@ function notifier_run($argv, $argc){
 			// TODO verify this is needed - copied logic from same place in old code
 
 			if(intval($target_item['item_deleted']) && (! intval($target_item['item_wall']))) {
-				logger('notifier: ignoring delete notification for non-wall item');
+				logger('notifier: ignoring delete notification for non-wall item', LOGGER_NORMAL, LOG_NOTICE);
 				return;
 			}
 		}
@@ -493,13 +411,13 @@ function notifier_run($argv, $argc){
 	$x = $encoded_item;
 	$x['title'] = 'private';
 	$x['body'] = 'private';
-	logger('notifier: encoded item: ' . print_r($x,true), LOGGER_DATA);
+	logger('notifier: encoded item: ' . print_r($x,true), LOGGER_DATA, LOG_DEBUG);
 
 	stringify_array_elms($recipients);
 	if(! $recipients)
 		return;
 
-//	logger('notifier: recipients: ' . print_r($recipients,true));
+//	logger('notifier: recipients: ' . print_r($recipients,true), LOGGER_NORMAL, LOG_DEBUG);
 
 	$env_recips = (($private) ? array() : null);
 
@@ -527,7 +445,7 @@ function notifier_run($argv, $argc){
 
 	if(($private) && (! $env_recips)) {
 		// shouldn't happen
-		logger('notifier: private message with no envelope recipients.' . print_r($argv,true));
+		logger('notifier: private message with no envelope recipients.' . print_r($argv,true), LOGGER_NORMAL, LOG_NOTICE);
 	}
 	
 	logger('notifier: recipients (may be delivered to more if public): ' . print_r($recip_list,true), LOGGER_DEBUG);
@@ -542,7 +460,7 @@ function notifier_run($argv, $argc){
  
 
 	if(! $r) {
-		logger('notifier: no hubs');
+		logger('notifier: no hubs', LOGGER_NORMAL, LOG_NOTICE);
 		return;
 	}
 
@@ -565,7 +483,7 @@ function notifier_run($argv, $argc){
 
 	foreach($hubs as $hub) {
 		if(in_array($hub['hubloc_url'],$dead_hubs)) {
-			logger('skipping dead hub: ' . $hub['hubloc_url'], LOGGER_DEBUG);
+			logger('skipping dead hub: ' . $hub['hubloc_url'], LOGGER_DEBUG, LOG_INFO);
 			continue;
 		}
 
@@ -585,7 +503,7 @@ function notifier_run($argv, $argc){
 		}
 	}
 
-	logger('notifier: will notify/deliver to these hubs: ' . print_r($hublist,true), LOGGER_DEBUG);
+	logger('notifier: will notify/deliver to these hubs: ' . print_r($hublist,true), LOGGER_DEBUG, LOG_DEBUG);
 			 
 
 	foreach($dhubs as $hub) {
@@ -595,6 +513,7 @@ function notifier_run($argv, $argc){
 			$narr = array(
 				'channel' => $channel,
 				'env_recips' => $env_recips,
+				'packet_recips' => $packet_recips,
 				'recipients' => $recipients,
 				'item' => $item,
 				'target_item' => $target_item,
@@ -605,10 +524,8 @@ function notifier_run($argv, $argc){
 				'relay_to_owner' => $relay_to_owner,
 				'uplink' => $uplink,
 				'cmd' => $cmd,
-				'expire' =>	$expire,
 				'mail' => $mail,
 				'location' => $location,
-				'fsuggest' => $fsuggest,
 				'request' => $request,
 				'normal_mode' => $normal_mode,
 				'packet_type' => $packet_type,
@@ -628,52 +545,38 @@ function notifier_run($argv, $argc){
 
 		// default: zot protocol
 
-
 		$hash = random_string();
+		$packet = null;
+
 		if($packet_type === 'refresh' || $packet_type === 'purge') {
-			$n = zot_build_packet($channel,$packet_type);
-			q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
-				dbesc($hash),
-				intval($channel['channel_account_id']),
-				intval($channel['channel_id']),
-				dbesc('zot'),
-				dbesc($hub['hubloc_callback']),
-				intval(1),
-				dbesc(datetime_convert()),
-				dbesc(datetime_convert()),
-				dbesc($n),
-				dbesc('')
-			);
+			$packet = zot_build_packet($channel,$packet_type,(($packet_recips) ? $packet_recips : null));
 		}
 		elseif($packet_type === 'request') {
-			$n = zot_build_packet($channel,'request',$env_recips,$hub['hubloc_sitekey'],$hash,array('message_id' => $request_message_id));
-			q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
-				dbesc($hash),
-				intval($channel['channel_account_id']),
-				intval($channel['channel_id']),
-				dbesc('zot'),
-				dbesc($hub['hubloc_callback']),
-				intval(1),
-				dbesc(datetime_convert()),
-				dbesc(datetime_convert()),
-				dbesc($n),
-				dbesc('')
+			$packet = zot_build_packet($channel,$packet_type,$env_recips,$hub['hubloc_sitekey'],$hash,
+				array('message_id' => $request_message_id)
 			);
 		}
+
+		if($packet) {
+			queue_insert(array(
+				'hash'       => $hash,
+				'account_id' => $channel['channel_account_id'],
+				'channel_id' => $channel['channel_id'],
+				'posturl'    => $hub['hubloc_callback'],
+				'notify'     => $packet
+			));
+		}
 		else {
-			$n = zot_build_packet($channel,'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash);
-			q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
-				dbesc($hash),
-				intval($target_item['aid']),
-				intval($target_item['uid']),
-				dbesc('zot'),
-				dbesc($hub['hubloc_callback']),
-				intval(1),
-				dbesc(datetime_convert()),
-				dbesc(datetime_convert()),
-				dbesc($n),
-				dbesc(json_encode($encoded_item))
-			);
+			$packet = zot_build_packet($channel,'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash);
+			queue_insert(array(
+				'hash'       => $hash,
+				'account_id' => $target_item['aid'],
+				'channel_id' => $target_item['uid'],
+				'posturl'    => $hub['hubloc_callback'],
+				'notify'     => $packet,
+				'msg'        => json_encode($encoded_item)
+			));
+
 			// only create delivery reports for normal undeleted items
 			if(is_array($target_item) && array_key_exists('postopts',$target_item) && (! $target_item['item_deleted'])) {
 				q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan, dreport_queue ) values ( '%s','%s','%s','%s','%s','%s','%s' ) ",
diff --git a/include/oauth.php b/include/oauth.php
index 80336f906..f3d144158 100644
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -1,4 +1,5 @@
 <?php /** @file */
+
 /** 
  * OAuth server
  * Based on oauth2-php <http://code.google.com/p/oauth2-php/>
@@ -9,16 +10,17 @@ define('REQUEST_TOKEN_DURATION', 300);
 define('ACCESS_TOKEN_DURATION', 31536000);
 
 require_once("library/OAuth1.php");
-require_once("library/oauth2-php/lib/OAuth2.inc");
 
-class FKOAuthDataStore extends OAuthDataStore {
-  function gen_token(){
+//require_once("library/oauth2-php/lib/OAuth2.inc");
+
+class ZotOAuth1DataStore extends OAuth1DataStore {
+
+	function gen_token(){
 		return md5(base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand(), uniqid())));
-  }
+	}
 	
-  function lookup_consumer($consumer_key) {
-		logger(__function__.":".$consumer_key);
-//      echo "<pre>"; var_dump($consumer_key); killme();
+	function lookup_consumer($consumer_key) {
+		logger('consumer_key: ' . $consumer_key, LOGGER_DEBUG);
 
 		$r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id = '%s'",
 			dbesc($consumer_key)
@@ -26,13 +28,14 @@ class FKOAuthDataStore extends OAuthDataStore {
 
 		if($r) {
 			get_app()->set_oauth_key($consumer_key);
-			return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']);
+			return new OAuth1Consumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']);
 		}
 		return null;
-  }
+	}
 
-  function lookup_token($consumer, $token_type, $token) {
-		logger(__function__.":".$consumer.", ". $token_type.", ".$token);
+	function lookup_token($consumer, $token_type, $token) {
+
+		logger(__function__.":".$consumer.", ". $token_type.", ".$token, LOGGER_DEBUG);
 
 		$r = q("SELECT id, secret, scope, expires, uid  FROM tokens WHERE client_id = '%s' AND scope = '%s' AND id = '%s'",
 			dbesc($consumer->key),
@@ -41,17 +44,16 @@ class FKOAuthDataStore extends OAuthDataStore {
 		);
 
 		if (count($r)){
-			$ot=new OAuthToken($r[0]['id'],$r[0]['secret']);
+			$ot=new OAuth1Token($r[0]['id'],$r[0]['secret']);
 			$ot->scope=$r[0]['scope'];
 			$ot->expires = $r[0]['expires'];
 			$ot->uid = $r[0]['uid'];
 			return $ot;
 		}
 		return null;
-  }
+	}
 
-  function lookup_nonce($consumer, $token, $nonce, $timestamp) {
-//		echo __file__.":".__line__."<pre>"; var_dump($consumer,$key); killme();
+	function lookup_nonce($consumer, $token, $nonce, $timestamp) {
 
 		$r = q("SELECT id, secret FROM tokens WHERE client_id = '%s' AND id = '%s' AND expires = %d",
 			dbesc($consumer->key),
@@ -60,12 +62,14 @@ class FKOAuthDataStore extends OAuthDataStore {
 		);
 
 		if (count($r))
-			return new OAuthToken($r[0]['id'],$r[0]['secret']);
+			return new OAuth1Token($r[0]['id'],$r[0]['secret']);
 		return null;
-  }
+	}
+
+	function new_request_token($consumer, $callback = null) {
+
+		logger(__function__.":".$consumer.", ". $callback, LOGGER_DEBUG);
 
-  function new_request_token($consumer, $callback = null) {
-		logger(__function__.":".$consumer.", ". $callback);
 		$key = $this->gen_token();
 		$sec = $this->gen_token();
 		
@@ -82,29 +86,31 @@ class FKOAuthDataStore extends OAuthDataStore {
 				'request',
 				time()+intval(REQUEST_TOKEN_DURATION));
 
-		if (!$r) return null;
-		return new OAuthToken($key,$sec);
-  }
+		if(! $r)
+			return null;
+		return new OAuth1Token($key,$sec);
+	}
 
-  function new_access_token($token, $consumer, $verifier = null) {
-    logger(__function__.":".$token.", ". $consumer.", ". $verifier);
-    
-    // return a new access token attached to this consumer
-    // for the user associated with this token if the request token
-    // is authorized
-    // should also invalidate the request token
-    
-    $ret=Null;
+	function new_access_token($token, $consumer, $verifier = null) {
+
+		logger(__function__.":".$token.", ". $consumer.", ". $verifier, LOGGER_DEBUG);
     
-    // get user for this verifier
-    $uverifier = get_config("oauth", $verifier);
-    logger(__function__.":".$verifier.",".$uverifier);
-    if (is_null($verifier) || ($uverifier!==false)){
+		// return a new access token attached to this consumer
+		// for the user associated with this token if the request token
+		// is authorized
+		// should also invalidate the request token
+	
+		$ret=Null;
+	
+		// get user for this verifier
+		$uverifier = get_config("oauth", $verifier);
+		logger(__function__.":".$verifier.",".$uverifier, LOGGER_DEBUG);
+		if (is_null($verifier) || ($uverifier!==false)) {
 		
-		$key = $this->gen_token();
-		$sec = $this->gen_token();
+			$key = $this->gen_token();
+			$sec = $this->gen_token();
 
-		$r = q("INSERT INTO tokens (id, secret, client_id, scope, expires, uid) VALUES ('%s','%s','%s','%s', %d, %d)",
+			$r = q("INSERT INTO tokens (id, secret, client_id, scope, expires, uid) VALUES ('%s','%s','%s','%s', %d, %d)",
 				dbesc($key),
 				dbesc($sec),
 				dbesc($consumer->key),
@@ -112,81 +118,70 @@ class FKOAuthDataStore extends OAuthDataStore {
 				time()+intval(ACCESS_TOKEN_DURATION),
 				intval($uverifier));
 
-		if ($r)
-			$ret = new OAuthToken($key,$sec);		
-	}
+			if ($r)
+				$ret = new OAuth1Token($key,$sec);		
+		}
 		
 		
-	q("DELETE FROM tokens WHERE id='%s'", $token->key);
+		q("DELETE FROM tokens WHERE id='%s'", $token->key);
 	
 	
-	if (!is_null($ret) && $uverifier!==false){
-		del_config("oauth", $verifier);
-	/*	$apps = get_pconfig($uverifier, "oauth", "apps");
-		if ($apps===false) $apps=array();
-		$apps[] = $consumer->key;
-		set_pconfig($uverifier, "oauth", "apps", $apps);*/
+		if (!is_null($ret) && $uverifier!==false) {
+			del_config("oauth", $verifier);
+	
+			//	$apps = get_pconfig($uverifier, "oauth", "apps");
+			//	if ($apps===false) $apps=array();
+			//  $apps[] = $consumer->key;
+			// set_pconfig($uverifier, "oauth", "apps", $apps);
+		}
+		return $ret;
 	}
-		
-    return $ret;
-    
-  }
 }
 
-class FKOAuth1 extends OAuthServer {
+class ZotOAuth1 extends OAuth1Server {
 
 	function __construct() {
-		parent::__construct(new FKOAuthDataStore());
-		$this->add_signature_method(new OAuthSignatureMethod_PLAINTEXT());
-		$this->add_signature_method(new OAuthSignatureMethod_HMAC_SHA1());
+		parent::__construct(new ZotOAuth1DataStore());
+		$this->add_signature_method(new OAuth1SignatureMethod_PLAINTEXT());
+		$this->add_signature_method(new OAuth1SignatureMethod_HMAC_SHA1());
 	}
 	
 	function loginUser($uid){
-		logger("RedOAuth1::loginUser $uid");
-		$a = get_app();
+
+		logger("ZotOAuth1::loginUser $uid");
+
 		$r = q("SELECT * FROM channel WHERE channel_id = %d LIMIT 1",
 			intval($uid)
 		);
 		if(count($r)){
 			$record = $r[0];
 		} else {
-		   logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
-		    header('HTTP/1.0 401 Unauthorized');
-		    die('This api requires login');
+			logger('ZotOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
+			header('HTTP/1.0 401 Unauthorized');
+			echo('This api requires login');
+			killme();
 		}
 
 		$_SESSION['uid'] = $record['channel_id'];
-		$_SESSION['theme'] = $record['channel_theme'];
-		$_SESSION['account_id'] = $record['channel_account_id'];
-		$_SESSION['mobile_theme'] = get_pconfig($record['channel_id'], 'system', 'mobile_theme');
-		$_SESSION['authenticated'] = 1;
-		$_SESSION['my_url'] = $a->get_baseurl() . '/channel/' . $record['channel_address'];
 		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
-		$_SESSION['allow_api'] = true;
+
 		$x = q("select * from account where account_id = %d limit 1",
 			intval($record['channel_account_id'])
 		);
-		if($x)
-			$a->account = $x[0];
-
-		change_channel($record['channel_id']);
-
-		$a->channel = $record;
-
-		if(strlen($a->channel['channel_timezone'])) {
-			date_default_timezone_set($a->channel['channel_timezone']);
+		if($x) {
+			require_once('include/security.php');
+			authenticate_success($x[0],true,false,true,true);
+			$_SESSION['allow_api'] = true;
 		}
-
-//		q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
-//			dbesc(datetime_convert()),
-//			intval($_SESSION['uid'])
-//		);
-//
-//		call_hooks('logged_in', $a->user);		
 	}
 	
 }
+
 /*
+ *
+
+ not yet used
+
 class FKOAuth2 extends OAuth2 {
 
 	private function db_secret($client_secret){
diff --git a/include/photos.php b/include/photos.php
index c7360a956..93511d2c0 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -292,17 +292,35 @@ function photo_upload($channel, $observer, $args) {
 		$tag = (($r2) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]');
 	}
 
-	$body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' 
+	$author_link = '[zrl=' . z_root() . '/channel/' . $channel['channel_address'] . ']' . $channel['channel_name'] . '[/zrl]';
+
+	$photo_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' . t('a new photo') . '[/zrl]';
+
+	$album_link = '[zrl=' . z_root() . '/photos/album/' . bin2hex($album) . ']' . $album . '[/zrl]';
+
+	$activity_format = sprintf(t('%1$s posted %2$s to %3$s','photo_upload'), $author_link, $photo_link, $album_link);
+
+	$summary = $activity_format . "\n\n" . (($args['body']) ? $args['body'] . "\n\n" : ''); 	
+
+	$obj_body =  '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' 
 		. $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]' 
 		. '[/zrl]';
 
 	// Create item object
 	$object = array(
-		'type'   => ACTIVITY_OBJ_PHOTO,
-		'title'  => $title,
-		'id'     => rawurlencode(z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash),
-		'link'   => $link,
-		'bbcode' => $body
+		'type'    => ACTIVITY_OBJ_PHOTO,
+		'title'   => $title,
+		'created' => $p['created'],
+		'edited'  => $p['edited'],
+		'id'      => rawurlencode(z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash),
+		'link'    => $link,
+		'body'    => $obj_body
+	);
+
+	$target = array(
+		'type'    => ACTIVITY_OBJ_ALBUM,
+		'title'   => (($album) ? $album : '/'),
+		'id'      => rawurlencode(z_root() . '/photos/' . $channel['channel_address'] . '/album/' . bin2hex($album))
 	);
 
 	// Create item container
@@ -314,9 +332,12 @@ function photo_upload($channel, $observer, $args) {
 
 			if($item['mid'] === $item['parent_mid']) {
 
-				$item['body'] = (($object) ? $args['body'] : $body . "\r\n" . $args['body']);
-				$item['obj_type'] = (($object) ? ACTIVITY_OBJ_PHOTO : '');
-				$item['object']	= (($object) ? json_encode($object) : '');
+				$item['body'] = $args['body'];
+				$item['obj_type'] = ACTIVITY_OBJ_PHOTO;
+				$item['object']	= json_encode($object);
+
+				$item['tgt_type'] = ACTIVITY_OBJ_ALBUM;
+				$item['target']	= json_encode($target);
 
 				if($item['author_xchan'] === $channel['channel_hash']) {
 					$item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey']));
@@ -370,14 +391,16 @@ function photo_upload($channel, $observer, $args) {
 		$arr['deny_cid']        = $ac['deny_cid'];
 		$arr['deny_gid']        = $ac['deny_gid'];
 		$arr['verb']            = ACTIVITY_POST;
-		$arr['obj_type']	= (($object) ? ACTIVITY_OBJ_PHOTO : '');
-		$arr['object']		= (($object) ? json_encode($object) : '');
+		$arr['obj_type']	    = ACTIVITY_OBJ_PHOTO;
+		$arr['object']		    = json_encode($object);
+		$arr['tgt_type']        = ACTIVITY_OBJ_ALBUM;
+		$arr['target']	        = json_encode($target);
 		$arr['item_wall']       = 1;
 		$arr['item_origin']     = 1;
 		$arr['item_thread_top'] = 1;
 		$arr['item_private']    = intval($acl->is_private());
 		$arr['plink']           = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid'];
-		$arr['body']		= (($object) ? $args['body'] : $body . "\r\n" . $args['body']);
+		$arr['body']		    = $summary; 
 
 
 		// this one is tricky because the item and the photo have the same permissions, those of the photo.
@@ -402,7 +425,7 @@ function photo_upload($channel, $observer, $args) {
 
 	$ret['success'] = true;
 	$ret['item'] = $arr;
-	$ret['body'] = $body;
+	$ret['body'] = $obj_body;
 	$ret['resource_id'] = $photo_hash;
 	$ret['photoitem_id'] = $item_id;
 
diff --git a/include/plugin.php b/include/plugin.php
index 1d4caac0f..4da73dfd8 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -313,7 +313,6 @@ function call_hooks($name, &$data = null) {
  *   * Version: 1.2.3
  *   * Author: John <profile url>
  *   * Author: Jane <email>
- *   * Compat: Red [(version)], Friendica [(version)]
  *   *
  *\endcode
  * @param string $plugin the name of the plugin
@@ -325,8 +324,8 @@ function get_plugin_info($plugin){
 		'name' => $plugin,
 		'description' => '',
 		'author' => array(),
-		'version' => '',
-		'compat' => ''
+		'maintainer' => array(),
+		'version' => ''
 	);
 
 	if (!is_file("addon/$plugin/$plugin.php"))
@@ -342,22 +341,23 @@ function get_plugin_info($plugin){
 			if ($l != ""){
 				list($k, $v) = array_map("trim", explode(":", $l, 2));
 				$k = strtolower($k);
-				if ($k == 'author'){
+				if ($k == 'author' || $k == 'maintainer'){
 					$r = preg_match("|([^<]+)<([^>]+)>|", $v, $m);
 					if ($r) {
-						$info['author'][] = array('name' => $m[1], 'link' => $m[2]);
+						$info[$k][] = array('name' => $m[1], 'link' => $m[2]);
 					} else {
-						$info['author'][] = array('name' => $v);
+						$info[$k][] = array('name' => $v);
 					}
 				} else {
-					if (array_key_exists($k, $info)){
+//					if (array_key_exists($k, $info)){
 						$info[$k] = $v;
-					}
+//					}
 				}
 			}
 		}
 	}
 
+
 	return $info;
 }
 
@@ -495,6 +495,15 @@ function format_css_if_exists($source) {
 		return '<link rel="stylesheet" href="' . script_path() . '/' . $path . '" type="text/css" media="' . $source[1] . '">' . "\r\n";
 }
 
+/*
+ * This basically calculates the baseurl. We have other functions to do that, but
+ * there was an issue with script paths and mixed-content whose details are arcane 
+ * and perhaps lost in the message archives. The short answer is that we're ignoring 
+ * the URL which we are "supposed" to use, and generating script paths relative to 
+ * the URL which we are currently using; in order to ensure they are found and aren't
+ * blocked due to mixed content issues. 
+ */
+
 function script_path() {
 	if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
 		$scheme = 'https';
@@ -627,3 +636,13 @@ function get_std_version() {
 		return STD_VERSION;
 	return '0.0.0';
 }
+
+
+function folder_exists($folder)
+{
+    // Get canonicalized absolute pathname
+    $path = realpath($folder);
+
+    // If it exist, check if it's a directory
+    return (($path !== false) && is_dir($path)) ? $path : false;
+}
\ No newline at end of file
diff --git a/include/queue.php b/include/queue.php
index 71ac50c83..8a3b2aa58 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -18,11 +18,8 @@ function queue_run($argv, $argc){
 	else
 		$queue_id = 0;
 
-	$deadguys = array();
-
 	logger('queue: start');
 
-
 	// delete all queue items more than 3 days old
 	// but first mark these sites dead if we haven't heard from them in a month
 
@@ -88,59 +85,7 @@ function queue_run($argv, $argc){
 		return;
 
 	foreach($r as $rr) {
-
-		$dresult = null;
-
-		if(in_array($rr['outq_posturl'],$deadguys))
-			continue;
-
-		$base = '';
-		$h = parse_url($rr['outq_posturl']);
-		if($h)
-			$base = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : '');
-
-		if($rr['outq_driver'] === 'post') {
-			$result = z_post_url($rr['outq_posturl'],$rr['outq_msg']); 
-			if($result['success'] && $result['return_code'] < 300) {
-				logger('queue: queue post success to ' . $rr['outq_posturl'], LOGGER_DEBUG);
-				if($base) {
-					q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
-						dbesc(datetime_convert()),
-						dbesc($base)
-					);
-				}
-				q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s' limit 1",
-					dbesc('accepted for delivery'),
-					dbesc(datetime_convert()),
-					dbesc($rr['outq_hash'])
-				);
-				$y = q("delete from outq where outq_hash = '%s'",
-					dbesc($rr['outq_hash'])
-				);
-			}
-			else {
-				logger('queue: queue post returned ' . $result['return_code'] . ' from ' . $rr['outq_posturl'],LOGGER_DEBUG);
-				$y = q("update outq set outq_updated = '%s', outq_priority = outq_priority + 10 where outq_hash = '%s'",
-					dbesc(datetime_convert()),
-					dbesc($rr['outq_hash'])
-				);
-				$deadguys[] = $rr['outq_posturl'];
-			}
-			continue;
-		}
-		$result = zot_zot($rr['outq_posturl'],$rr['outq_notify']); 
-		if($result['success']) {
-			logger('queue: deliver zot success to ' . $rr['outq_posturl'], LOGGER_DEBUG);			
-			zot_process_response($rr['outq_posturl'],$result, $rr);				
-		}
-		else {
-			$deadguys[] = $rr['outq_posturl'];
-			logger('queue: deliver zot returned ' . $result['return_code'] . ' from ' . $rr['outq_posturl'],LOGGER_DEBUG);
-			$y = q("update outq set outq_updated = '%s', outq_priority = outq_priority + 10 where outq_hash = '%s'",
-				dbesc(datetime_convert()),
-				dbesc($rr['outq_hash'])
-			);
-		}
+		queue_deliver($rr);
 	}
 }
 
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 22580bc48..0708aab56 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -1,18 +1,171 @@
 <?php /** @file */
 
-function update_queue_time($id) {
-	logger('queue: requeue item ' . $id);
-	q("UPDATE outq SET outq_updated = '%s' WHERE outq_hash = '%s'",
+function update_queue_item($id, $add_priority = 0) {
+	logger('queue: requeue item ' . $id,LOGGER_DEBUG);
+	q("UPDATE outq SET outq_updated = '%s', outq_priority = outq_priority + %d WHERE outq_hash = '%s'",
 		dbesc(datetime_convert()),
+		intval($add_priority),
 		dbesc($id)
 	);
 }
 
-function remove_queue_item($id) {
-	logger('queue: remove queue item ' . $id);
-	q("DELETE FROM outq WHERE hash = '%s'",
+function remove_queue_item($id,$channel_id = 0) {
+	logger('queue: remove queue item ' . $id,LOGGER_DEBUG);
+	$sql_extra = (($channel_id) ? " and outq_channel = " . intval($channel_id) . " " : '');
+		
+	q("DELETE FROM outq WHERE outq_hash = '%s' $sql_extra",
 		dbesc($id)
 	);
 }
 
 
+function remove_queue_by_posturl($posturl) {
+	logger('queue: remove queue posturl ' . $posturl,LOGGER_DEBUG);
+		
+	q("DELETE FROM outq WHERE outq_posturl = '%s' ",
+		dbesc($posturl)
+	);
+}
+
+
+
+function queue_set_delivered($id,$channel = 0) {
+	logger('queue: set delivered ' . $id,LOGGER_DEBUG);
+	$sql_extra = (($channel_id) ? " and outq_channel = " . intval($channel_id) . " " : '');
+
+	q("update outq set outq_delivered = 1, outq_updated = '%s' where outq_hash = '%s' $sql_extra ",
+		dbesc(datetime_convert()),
+		dbesc($id)
+	);
+}
+
+
+
+function queue_insert($arr) {
+
+	$x = q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_priority,
+		outq_created, outq_updated, outq_notify, outq_msg ) 
+		values ( '%s', %d, %d, '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' )",
+		dbesc($arr['hash']),
+		intval($arr['account_id']),
+		intval($arr['channel_id']),
+		dbesc(($arr['driver']) ? $arr['driver'] : 'zot'),
+		dbesc($arr['posturl']),
+		intval(1),
+		intval(($arr['priority']) ? $arr['priority'] : 0),
+		dbesc(datetime_convert()),
+		dbesc(datetime_convert()),
+		dbesc($arr['notify']),
+		dbesc(($arr['msg']) ? $arr['msg'] : '')
+	);
+	return $x;
+
+}
+
+
+
+function queue_deliver($outq, $immediate = false) {
+
+	$base = null;
+	$h = parse_url($outq['outq_posturl']);
+	if($h) 
+		$base = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : '');
+
+	if(($base) && ($base !== z_root()) && ($immediate)) {
+		$y = q("select site_update, site_dead from site where site_url = '%s' ",
+			dbesc($base)
+		);
+		if($y) {
+			if(intval($y[0]['site_dead'])) {
+				remove_queue_by_posturl($outq['outq_posturl']);
+				logger('dead site ignored ' . $base);
+				return;
+			}
+			if($y[0]['site_update'] < datetime_convert('UTC','UTC','now - 1 month')) {
+				update_queue_item($outq['outq_hash'],10);
+				logger('immediate delivery deferred for site ' . $base);
+				return;
+			}
+		}
+		else {
+
+			// zot sites should all have a site record, unless they've been dead for as long as
+			// your site has existed. Since we don't know for sure what these sites are,
+			// call them unknown
+
+			q("insert into site (site_url, site_update, site_dead, site_type) values ('%s','%s',0,%d) ",
+				dbesc($base),
+				dbesc(datetime_convert()),
+				intval(($outq['outq_driver'] === 'post') ? SITE_TYPE_NOTZOT : SITE_TYPE_UNKNOWN)
+			);
+		}
+	}
+
+	$arr = array('outq' => $outq, 'handled' => false, 'immediate' => $immediate);
+	call_hooks('queue_deliver',$arr);
+	if($arr['handled'])
+		return;
+
+	// "post" queue driver - used for diaspora and friendica-over-diaspora communications.
+
+	if($outq['outq_driver'] === 'post') {
+		$result = z_post_url($outq['outq_posturl'],$outq['outq_msg']);
+		if($result['success'] && $result['return_code'] < 300) {
+			logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG);
+			if($base) {
+				q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
+					dbesc(datetime_convert()),
+					dbesc($base)
+				);
+			}
+			q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s' limit 1",
+				dbesc('accepted for delivery'),
+				dbesc(datetime_convert()),
+				dbesc($outq['outq_hash'])
+			);
+			remove_queue_item($outq['outq_hash']);
+
+			// server is responding - see if anything else is going to this destination and is piled up 
+			// and try to send some more. We're relying on the fact that delivery_loop() results in an 
+			// immediate delivery otherwise we could get into a queue loop. 
+
+			if(! $immediate) {
+				$x = q("select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0",
+					dbesc($outq['outq_posturl'])
+				);
+
+				$piled_up = array();
+				if($x) {
+					foreach($x as $xx) {
+						 $piled_up[] = $xx['outq_hash'];
+					}
+				}
+				if($piled_up) {
+					delivery_loop($piled_up);
+				}
+			}
+		}
+		else {
+			logger('deliver: queue post returned ' . $result['return_code'] 
+				. ' from ' . $outq['outq_posturl'],LOGGER_DEBUG);
+				update_queue_item($outq['outq_posturl']);
+		}
+		return;
+	}
+
+	// normal zot delivery
+
+	logger('deliver: dest: ' . $outq['outq_posturl'], LOGGER_DEBUG);
+	$result = zot_zot($outq['outq_posturl'],$outq['outq_notify']);
+	if($result['success']) {
+		logger('deliver: remote zot delivery succeeded to ' . $outq['outq_posturl']);
+		zot_process_response($outq['outq_posturl'],$result, $outq);
+	}
+	else {
+		logger('deliver: remote zot delivery failed to ' . $outq['outq_posturl']);
+		logger('deliver: remote zot delivery fail data: ' . print_r($result,true), LOGGER_DATA);
+		update_queue_item($outq['outq_hash'],10);
+	}
+	return;
+}
+
diff --git a/include/ratenotif.php b/include/ratenotif.php
index 63fd7c2ee..e94f30247 100644
--- a/include/ratenotif.php
+++ b/include/ratenotif.php
@@ -82,18 +82,14 @@ function ratenotif_run($argv, $argc){
 				$hash = random_string();
 				$n = zot_build_packet($channel,'notify',null,null,$hash);
 
-				q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
-					dbesc($hash),
-					intval($channel['channel_account_id']),
-					intval($channel['channel_id']),
-					dbesc('zot'),
-					dbesc($h . '/post'),
-					intval(1),
-					dbesc(datetime_convert()),
-					dbesc(datetime_convert()),
-					dbesc($n),
-					dbesc(json_encode($encoded_item))
-				);
+				queue_insert(array(
+					'hash'       => $hash,
+					'account_id' => $channel['channel_account_id'],
+					'channel_id' => $channel['channel_id'],
+					'posturl'    => $h . '/post',
+					'notify'     => $n,
+					'msg'        => json_encode($encoded_item)
+				));
 
 				$deliver[] = $hash;
 
diff --git a/include/security.php b/include/security.php
index 9a25d9e0e..d4ebe0024 100644
--- a/include/security.php
+++ b/include/security.php
@@ -93,6 +93,7 @@ function change_channel($change_channel) {
 	$ret = false;
 
 	if($change_channel) {
+
 		$r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel_id = %d and channel_account_id = %d and channel_removed = 0 limit 1",
 			intval($change_channel),
 			intval(get_account_id())
@@ -136,14 +137,14 @@ function change_channel($change_channel) {
 }
 
 /**
- * @brief Creates an addiontal SQL where statement to check permissions.
+ * @brief Creates an additional SQL where statement to check permissions.
  *
  * @param int $owner_id
- * @param bool $remote_verified default false, not used at all
- * @param string $groups this param is not used at all
+ * @param bool $remote_observer - if unset use current observer
  *
  * @return string additional SQL where statement
  */
+
 function permissions_sql($owner_id, $remote_observer = null) {
 
 	$local_channel = local_channel();
@@ -208,8 +209,7 @@ function permissions_sql($owner_id, $remote_observer = null) {
  * @brief Creates an addiontal SQL where statement to check permissions for an item.
  *
  * @param int $owner_id
- * @param bool $remote_verified default false, not used at all
- * @param string $groups this param is not used at all
+ * @param bool $remote_observer, use current observer if unset
  *
  * @return string additional SQL where statement
  */
@@ -400,11 +400,9 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f
 }
 
 
-// Returns an array of group id's this contact is a member of.
-// This array will only contain group id's related to the uid of this
-// DFRN contact. They are *not* neccessarily unique across the entire site. 
+// Returns an array of group hash id's on this entire site (across all channels) that this connection is a member of.
+// var $contact_id = xchan_hash of connection
 
-if(! function_exists('init_groups_visitor')) {
 function init_groups_visitor($contact_id) {
 	$groups = array();
 	$r = q("SELECT hash FROM `groups` left join group_member on groups.id = group_member.gid WHERE xchan = '%s' ",
@@ -415,7 +413,7 @@ function init_groups_visitor($contact_id) {
 			$groups[] = $rr['hash'];
 	}
 	return $groups;
-}}
+}
 
 
 
diff --git a/include/text.php b/include/text.php
index 4777e7a61..6f7297bb0 100644
--- a/include/text.php
+++ b/include/text.php
@@ -536,9 +536,10 @@ function attribute_contains($attr, $s) {
  *
  * @param string $msg Message to log
  * @param int $level A log level.
+ * @param int $priority - compatible with syslog
  */
 
-function logger($msg, $level = 0) {
+function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) {
 	// turn off logger in install mode
 	global $a;
 	global $db;
@@ -559,8 +560,8 @@ function logger($msg, $level = 0) {
 		$where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': ';
 	}
 
-	$s = datetime_convert() . ':' . session_id() . ' ' . $where . $msg . PHP_EOL;
-	$pluginfo = array('filename' => $logfile, 'loglevel' => $level, 'message' => $s,'logged' => false);
+	$s = datetime_convert() . ':' . log_priority_str($priority) . ':' . session_id() . ':' . $where . $msg . PHP_EOL;
+	$pluginfo = array('filename' => $logfile, 'loglevel' => $level, 'message' => $s,'priority' => $priority, 'logged' => false);
 
 	call_hooks('logger',$pluginfo);
 
@@ -568,6 +569,23 @@ function logger($msg, $level = 0) {
 		@file_put_contents($pluginfo['filename'], $pluginfo['message'], FILE_APPEND);
 }
 
+function log_priority_str($priority) {
+	$parr = array(
+		LOG_EMERG   => 'LOG_EMERG',
+		LOG_ALERT   => 'LOG_ALERT',
+		LOG_CRIT    => 'LOG_CRIT',
+		LOG_ERR     => 'LOG_ERR',
+		LOG_WARNING => 'LOG_WARNING',
+		LOG_NOTICE  => 'LOG_NOTICE',
+		LOG_INFO    => 'LOG_INFO',
+		LOG_DEBUG   => 'LOG_DEBUG'
+	);
+
+	if($parr[$priority])
+		return $parr[$priority];
+	return 'LOG_UNDEFINED';
+}
+
 /**
  * @brief This is a special logging facility for developers.
  *
@@ -972,7 +990,7 @@ function get_mood_verbs() {
 		'tired'      => t('tired'),
 		'perky'      => t('perky'),
 		'angry'      => t('angry'),
-		'stupefied'  => t('stupified'),
+		'stupefied'  => t('stupefied'),
 		'puzzled'    => t('puzzled'),
 		'interested' => t('interested'),
 		'bitter'     => t('bitter'),
@@ -1416,20 +1434,14 @@ function format_event($jobject) {
 function prepare_body(&$item,$attach = false) {
 	require_once('include/identity.php');
 
-//	if($item['html']) {
-//		$s = bb_observer($item['html']);
-//	}
-//	else {
-		call_hooks('prepare_body_init', $item); 
-//		unobscure($item);
-		$s = prepare_text($item['body'],$item['mimetype'], false);
-//	}
+	call_hooks('prepare_body_init', $item); 
 
 
 	$photo = '';
-	$is_photo = (($item['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false);
+	$is_photo = ((($item['verb'] === ACTIVITY_POST) && ($item['obj_type'] === ACTIVITY_OBJ_PHOTO)) ? true : false);
 
 	if($is_photo) {
+
 		$object = json_decode($item['object'],true);
 
 		// if original photo width is <= 640px prepend it to item body
@@ -1444,6 +1456,8 @@ function prepare_body(&$item,$attach = false) {
 		}
 	}
 
+	$s = prepare_text($item['body'],$item['mimetype'], false);
+
 	$event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event($item['object']) : false);
 
 	$prep_arr = array(
@@ -1602,6 +1616,16 @@ function prepare_text($text, $content_type = 'text/bbcode', $cache = false) {
 }
 
 
+function create_export_photo_body(&$item) {
+	if(($item['verb'] === ACTIVITY_POST) && ($item['obj_type'] === ACTIVITY_OBJ_PHOTO)) {
+		$j = json_decode($item['object'],true);
+		if($j) {
+			$item['body'] .= "\n\n" . (($j['body']) ? $j['body'] : $j['bbcode']);
+			$item['sig'] = '';
+		}
+	}
+}
+
 /**
  * zidify_callback() and zidify_links() work together to turn any HTML a tags with class="zrl" into zid links
  * These will typically be generated by a bbcode '[zrl]' tag. This is done inside prepare_text() rather than bbcode()
diff --git a/include/widgets.php b/include/widgets.php
index 89836f90c..4b14d6c94 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -1299,7 +1299,6 @@ function widget_album($args) {
 	//edit album name
 	$album_edit = null;
 
-
 	$photos = array();
 	if($r) {
 		$twist = 'rotright';
@@ -1338,6 +1337,7 @@ function widget_album($args) {
 	$o .= replace_macros($tpl, array(
 		'$photos' => $photos,
 		'$album' => (($title) ? $title : $album),
+		'$album_id' => rand(),
 		'$album_edit' => array(t('Edit Album'), $album_edit),
 		'$can_post' => false,
 		'$upload' => array(t('Upload'), z_root() . '/photos/' . get_app()->profile['channel_address'] . '/upload/' . bin2hex($album)),
diff --git a/include/zot.php b/include/zot.php
index 6764072aa..a644bbd06 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -12,6 +12,7 @@ require_once('include/crypto.php');
 require_once('include/items.php');
 require_once('include/hubloc.php');
 require_once('include/DReport.php');
+require_once('include/queue_fn.php');
 
 
 /**
@@ -141,7 +142,7 @@ function zot_build_packet($channel, $type = 'notify', $recipients = null, $remot
 			$data[$k] = $v;
 	}
 
-	logger('zot_build_packet: ' . print_r($data,true), LOGGER_DATA);
+	logger('zot_build_packet: ' . print_r($data,true), LOGGER_DATA, LOG_DEBUG);
 
 	// Hush-hush ultra top-secret mode
 
@@ -193,7 +194,7 @@ function zot_finger($webbie, $channel = null, $autofallback = true) {
 		logger('zot_finger: no address :' . $webbie);
 		return array('success' => false);
 	}
-	logger('using xchan_addr: ' . $xchan_addr, LOGGER_DATA);
+	logger('using xchan_addr: ' . $xchan_addr, LOGGER_DATA, LOG_DEBUG);
 
 	// potential issue here; the xchan_addr points to the primary hub.
 	// The webbie we were called with may not, so it might not be found
@@ -210,7 +211,7 @@ function zot_finger($webbie, $channel = null, $autofallback = true) {
 
 		if ($r[0]['hubloc_network'] && $r[0]['hubloc_network'] !== 'zot') {
 			logger('zot_finger: alternate network: ' . $webbie);
-			logger('url: '.$url.', net: '.var_export($r[0]['hubloc_network'],true), LOGGER_DATA);
+			logger('url: '.$url.', net: '.var_export($r[0]['hubloc_network'],true), LOGGER_DATA, LOG_DEBUG);
 			return array('success' => false);
 		}
 	} else {
@@ -287,9 +288,9 @@ function zot_refresh($them, $channel = null, $force = false) {
 		return true;
 	}
 
-	logger('zot_refresh: them: ' . print_r($them,true), LOGGER_DATA);
+	logger('zot_refresh: them: ' . print_r($them,true), LOGGER_DATA, LOG_DEBUG);
 	if ($channel)
-		logger('zot_refresh: channel: ' . print_r($channel,true), LOGGER_DATA);
+		logger('zot_refresh: channel: ' . print_r($channel,true), LOGGER_DATA, LOG_DEBUG);
 
 	$url = null;
 
@@ -352,7 +353,7 @@ function zot_refresh($them, $channel = null, $force = false) {
 
 	$result = z_post_url($url . $rhs,$postvars);
 
-	logger('zot_refresh: zot-info: ' . print_r($result,true), LOGGER_DATA);
+	logger('zot_refresh: zot-info: ' . print_r($result,true), LOGGER_DATA, LOG_DEBUG);
 
 	if ($result['success']) {
 
@@ -380,7 +381,7 @@ function zot_refresh($them, $channel = null, $force = false) {
 					$channel['channel_prvkey']);
 				if($permissions)
 					$permissions = json_decode($permissions,true);
-				logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA);
+				logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA, LOG_DEBUG);
 			}
 			else
 				$permissions = $j['permissions'];
@@ -613,7 +614,7 @@ function zot_register_hub($arr) {
 
 		$x = z_fetch_url($url);
 
-		logger('zot_register_hub: ' . print_r($x,true), LOGGER_DATA);
+		logger('zot_register_hub: ' . print_r($x,true), LOGGER_DATA, LOG_DEBUG);
 
 		if($x['success']) {
 			$record = json_decode($x['body'],true);
@@ -753,8 +754,8 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 				dbesc($xchan_hash)
 			);
 
-			logger('import_xchan: update: existing: ' . print_r($r[0],true), LOGGER_DATA);
-			logger('import_xchan: update: new: ' . print_r($arr,true), LOGGER_DATA);
+			logger('import_xchan: update: existing: ' . print_r($r[0],true), LOGGER_DATA, LOG_DEBUG);
+			logger('import_xchan: update: new: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
 			$what .= 'xchan ';
 			$changed = true;
 		}
@@ -954,7 +955,7 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 		$ret['hash'] = $xchan_hash;
 	}
 
-	logger('import_xchan: result: ' . print_r($ret,true), LOGGER_DATA);
+	logger('import_xchan: result: ' . print_r($ret,true), LOGGER_DATA, LOG_DEBUG);
 	return $ret;
 }
 
@@ -979,7 +980,7 @@ function zot_process_response($hub, $arr, $outq) {
 
 	if (! $x) {
 		logger('zot_process_response: No json from ' . $hub);
-		logger('zot_process_response: headers: ' . print_r($arr['header'],true), LOGGER_DATA);
+		logger('zot_process_response: headers: ' . print_r($arr['header'],true), LOGGER_DATA, LOG_DEBUG);
 	}
 
 	if(is_array($x) && array_key_exists('delivery_report',$x) && is_array($x['delivery_report'])) {
@@ -997,7 +998,9 @@ function zot_process_response($hub, $arr, $outq) {
 		}
 	}
 
-	q("delete from dreport where dreport_queue = '%s' limit 1",
+	// we have a more descriptive delivery report, so discard the per hub 'queued' report. 
+
+	q("delete from dreport where dreport_queue = '%s' ",
 		dbesc($outq['outq_hash'])
 	);
 								
@@ -1011,18 +1014,8 @@ function zot_process_response($hub, $arr, $outq) {
 	// synchronous message types are handled immediately
 	// async messages remain in the queue until processed.
 
-	if (intval($outq['outq_async'])) {
-		q("update outq set outq_delivered = 1, outq_updated = '%s' where outq_hash = '%s' and outq_channel = %d",
-			dbesc(datetime_convert()),
-			dbesc($outq['outq_hash']),
-			intval($outq['outq_channel'])
-		);
-	} else {
-		q("delete from outq where outq_hash = '%s' and outq_channel = %d",
-			dbesc($outq['outq_hash']),
-			intval($outq['outq_channel'])
-		);
-	}
+	if(intval($outq['outq_async']))
+		remove_queue_item($outq['outq_hash'],$outq['outq_channel']);
 
 	logger('zot_process_response: ' . print_r($x,true), LOGGER_DEBUG);
 }
@@ -1044,7 +1037,7 @@ function zot_process_response($hub, $arr, $outq) {
  */
 function zot_fetch($arr) {
 
-	logger('zot_fetch: ' . print_r($arr,true), LOGGER_DATA);
+	logger('zot_fetch: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
 
 	$url = $arr['sender']['url'] . $arr['callback'];
 
@@ -1141,7 +1134,7 @@ function zot_import($arr, $sender_url) {
 				$i['notify'] = json_decode(crypto_unencapsulate($i['notify'],get_config('system','prvkey')),true);
 			}
 
-			logger('zot_import: notify: ' . print_r($i['notify'],true), LOGGER_DATA);
+			logger('zot_import: notify: ' . print_r($i['notify'],true), LOGGER_DATA, LOG_DEBUG);
 
 			$hub = zot_gethub($i['notify']['sender']);
 			if((! $hub) || ($hub['hubloc_url'] != $sender_url)) {
@@ -1158,7 +1151,7 @@ function zot_import($arr, $sender_url) {
 
 			if(array_key_exists('message',$i) && array_key_exists('type',$i['message']) && $i['message']['type'] === 'rating') {
 				// rating messages are processed only by directory servers
-				logger('Rating received: ' . print_r($arr,true), LOGGER_DATA);
+				logger('Rating received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
 				$result = process_rating_delivery($i['notify']['sender'],$i['message']);
 				continue;
 			}
@@ -1268,8 +1261,8 @@ function zot_import($arr, $sender_url) {
 						continue;
 					}
 
-					logger('Activity received: ' . print_r($arr,true), LOGGER_DATA);
-					logger('Activity recipients: ' . print_r($deliveries,true), LOGGER_DATA);
+					logger('Activity received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
+					logger('Activity recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG);
 
 					$relay = ((array_key_exists('flags',$i['message']) && in_array('relay',$i['message']['flags'])) ? true : false);
 					$result = process_delivery($i['notify']['sender'],$arr,$deliveries,$relay,false,$message_request);
@@ -1277,16 +1270,16 @@ function zot_import($arr, $sender_url) {
 				elseif($i['message']['type'] === 'mail') {
 					$arr = get_mail_elements($i['message']);
 
-					logger('Mail received: ' . print_r($arr,true), LOGGER_DATA);
-					logger('Mail recipients: ' . print_r($deliveries,true), LOGGER_DATA);
+					logger('Mail received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
+					logger('Mail recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG);
 
 					$result = process_mail_delivery($i['notify']['sender'],$arr,$deliveries);
 				}
 				elseif($i['message']['type'] === 'profile') {
 					$arr = get_profile_elements($i['message']);
 
-					logger('Profile received: ' . print_r($arr,true), LOGGER_DATA);
-					logger('Profile recipients: ' . print_r($deliveries,true), LOGGER_DATA);
+					logger('Profile received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
+					logger('Profile recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG);
 
 					$result = process_profile_delivery($i['notify']['sender'],$arr,$deliveries);
 				}
@@ -1295,16 +1288,16 @@ function zot_import($arr, $sender_url) {
 
 					$arr = $i['message'];
 
-					logger('Channel sync received: ' . print_r($arr,true), LOGGER_DATA);
-					logger('Channel sync recipients: ' . print_r($deliveries,true), LOGGER_DATA);
+					logger('Channel sync received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
+					logger('Channel sync recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG);
 
 					$result = process_channel_sync_delivery($i['notify']['sender'],$arr,$deliveries);
 				}
 				elseif($i['message']['type'] === 'location') {
 					$arr = $i['message'];
 
-					logger('Location message received: ' . print_r($arr,true), LOGGER_DATA);
-					logger('Location message recipients: ' . print_r($deliveries,true), LOGGER_DATA);
+					logger('Location message received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
+					logger('Location message recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG);
 
 					$result = process_location_delivery($i['notify']['sender'],$arr,$deliveries);
 				}
@@ -1490,7 +1483,7 @@ function public_recips($msg) {
 		}
 	}
 
-	logger('public_recips: ' . print_r($r,true), LOGGER_DATA);
+	logger('public_recips: ' . print_r($r,true), LOGGER_DATA, LOG_DEBUG);
 	return $r;
 }
 
@@ -1508,7 +1501,7 @@ function public_recips($msg) {
  */
 function allowed_public_recips($msg) {
 
-	logger('allowed_public_recips: ' . print_r($msg,true),LOGGER_DATA);
+	logger('allowed_public_recips: ' . print_r($msg,true),LOGGER_DATA, LOG_DEBUG);
 
 	if(array_key_exists('public_scope',$msg['message']))
 		$scope = $msg['message']['public_scope'];
@@ -1611,6 +1604,14 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
 		$channel = $r[0];
 		$DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');
 
+		/* blacklisted channels get a permission denied, no special message to tip them off */
+
+		if(! check_channelallowed($sender['hash'])) {
+			$DR->update('permission denied');
+			$result[] = $DR->get();
+			continue;
+		}
+
 		/**
 		 * @FIXME: Somehow we need to block normal message delivery from our clones, as the delivered
 		 * message doesn't have ACL information in it as the cloned copy does. That copy 
@@ -2082,6 +2083,14 @@ function process_mail_delivery($sender, $arr, $deliveries) {
 		$channel = $r[0];
 		$DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');
 
+		/* blacklisted channels get a permission denied, no special message to tip them off */
+
+		if(! check_channelallowed($sender['hash'])) {
+			$DR->update('permission denied');
+			$result[] = $DR->get();
+			continue;
+		}
+
 		if(! perm_is_allowed($channel['channel_id'],$sender['hash'],'post_mail')) {
 			logger("permission denied for mail delivery {$channel['channel_id']}");
 			$DR->update('permission denied');
@@ -2864,7 +2873,7 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 	logger('build_sync_packet');
 
 	if($packet)
-		logger('packet: ' . print_r($packet, true),LOGGER_DATA);
+		logger('packet: ' . print_r($packet, true),LOGGER_DATA, LOG_DEBUG);
 
 	if(! $uid)
 		$uid = local_channel();
@@ -2958,24 +2967,19 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 	$interval = ((get_config('system','delivery_interval') !== false)
 			? intval(get_config('system','delivery_interval')) : 2 );
 
-
-	logger('build_sync_packet: packet: ' . print_r($info,true), LOGGER_DATA);
+	logger('build_sync_packet: packet: ' . print_r($info,true), LOGGER_DATA, LOG_DEBUG);
 
 	foreach($synchubs as $hub) {
 		$hash = random_string();
 		$n = zot_build_packet($channel,'notify',$env_recips,$hub['hubloc_sitekey'],$hash);
-		q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
-			dbesc($hash),
-			intval($channel['channel_account']),
-			intval($channel['channel_id']),
-			dbesc('zot'),
-			dbesc($hub['hubloc_callback']),
-			intval(1),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			dbesc($n),
-			dbesc(json_encode($info))
-		);
+		queue_insert(array(
+			'hash'       => $hash,
+			'account_id' => $channel['channel_account_id'],
+			'channel_id' => $channel['channel_id'],
+			'posturl'    => $hub['hubloc_callback'],
+			'notify'     => $n,
+			'msg'        => json_encode($info)
+		));
 
 		proc_run('php', 'include/deliver.php', $hash);
 		if($interval)
@@ -3478,13 +3482,13 @@ function import_author_zot($x) {
  * @param array $data
  * @return array
  */
-function zot_process_message_request($data) {
+function zot_reply_message_request($data) {
 	$ret = array('success' => false);
 
 	if (! $data['message_id']) {
 		$ret['message'] = 'no message_id';
 		logger('no message_id');
-		return $ret;
+		json_return_and_die($ret);
 	}
 
 	$sender = $data['sender'];
@@ -3502,7 +3506,7 @@ function zot_process_message_request($data) {
 	if (! $c) {
 		logger('recipient channel not found.');
 		$ret['message'] .= 'recipient not found.' . EOL;
-		return $ret;
+		json_return_and_die($ret);
 	}
 
 	/*
@@ -3514,13 +3518,13 @@ function zot_process_message_request($data) {
 	if ($messages) {
 		$env_recips = null;
 
-		$r = q("select * from hubloc where hubloc_hash = '%s' and not hubloc_error and not hubloc_deleted 
+		$r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_error = 0 and hubloc_deleted = 0 
 			group by hubloc_sitekey",
 			dbesc($sender_hash)
 		);
 		if (! $r) {
 			logger('no hubs');
-			return $ret;
+			json_return_and_die($ret);
 		}
 		$hubs = $r;
 
@@ -3538,20 +3542,15 @@ function zot_process_message_request($data) {
 			 */
 
 			$n = zot_build_packet($c[0],'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash,array('message_id' => $data['message_id']));
-			q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async,
-				outq_created, outq_updated, outq_notify, outq_msg )
-				values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
-				dbesc($hash),
-				intval($c[0]['channel_account_id']),
-				intval($c[0]['channel_id']),
-				dbesc('zot'),
-				dbesc($hub['hubloc_callback']),
-				intval(1),
-				dbesc(datetime_convert()),
-				dbesc(datetime_convert()),
-				dbesc($n),
-				dbesc($data_packet)
-			);
+
+			queue_insert(array(
+				'hash'       => $hash,
+				'account_id' => $c[0]['channel_account_id'],
+				'channel_id' => $c[0]['channel_id'],
+				'posturl'    => $hub['hubloc_callback'],
+				'notify'     => $n,
+				'msg'        => $data_packet
+			));
 
 			/*
 			 * invoke delivery to send out the notify packet
@@ -3561,8 +3560,7 @@ function zot_process_message_request($data) {
 		}
 	}
 	$ret['success'] = true;
-
-	return $ret;
+	json_return_and_die($ret);
 }
 
 
@@ -3783,6 +3781,7 @@ function zotinfo($arr) {
 	$ret['site'] = array();
 	$ret['site']['url'] = z_root();
 	$ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),$e['channel_prvkey']));
+	$ret['site']['zot_auth'] = z_root() . '/magic';
 
 	$dirmode = get_config('system','directory_mode');
 	if(($dirmode === false) || ($dirmode == DIRECTORY_MODE_NORMAL))
@@ -3865,7 +3864,7 @@ function zotinfo($arr) {
 function check_zotinfo($channel,$locations,&$ret) {
 
 
-//	logger('locations: ' . print_r($locations,true),LOGGER_DATA);
+//	logger('locations: ' . print_r($locations,true),LOGGER_DATA, LOG_DEBUG);
 
 	// This function will likely expand as we find more things to detect and fix.
 	// 1. Because magic-auth is reliant on it, ensure that the system channel has a valid hubloc
@@ -3973,3 +3972,420 @@ function delivery_report_is_storable($dr) {
 }
 
 
+
+function update_hub_connected($hub,$sitekey = '') {
+
+	if($sitekey) {
+
+		/*
+		 * This hub has now been proven to be valid.
+		 * Any hub with the same URL and a different sitekey cannot be valid.
+		 * Get rid of them (mark them deleted). There's a good chance they were re-installs.
+		 */
+	
+		q("update hubloc set hubloc_deleted = 1, hubloc_error = 1 where hubloc_url = '%s' and hubloc_sitekey != '%s' ",
+			dbesc($hub['hubloc_url']),
+			dbesc($sitekey)
+		);
+
+	}
+	else {
+		$sitekey = $hub['sitekey'];
+	}
+
+	// $sender['sitekey'] is a new addition to the protcol to distinguish 
+	// hublocs coming from re-installed sites. Older sites will not provide
+	// this field and we have to still mark them valid, since we can't tell
+	// if this hubloc has the same sitekey as the packet we received.
+
+
+	// Update our DB to show when we last communicated successfully with this hub
+	// This will allow us to prune dead hubs from using up resources
+
+	$r = q("update hubloc set hubloc_connected = '%s' where hubloc_id = %d and hubloc_sitekey = '%s' ",
+		dbesc(datetime_convert()),
+		intval($hub['hubloc_id']),
+		dbesc($sitekey)
+	);
+
+	// a dead hub came back to life - reset any tombstones we might have
+
+	if(intval($hub['hubloc_error'])) {
+		q("update hubloc set hubloc_error = 0 where hubloc_id = %d and hubloc_sitekey = '%s' ",
+			intval($hub['hubloc_id']),
+			dbesc($sitekey)		
+		);
+		if(intval($r[0]['hubloc_orphancheck'])) {
+			q("update hubloc set hubloc_orhpancheck = 0 where hubloc_id = %d and hubloc_sitekey = '%s' ",
+				intval($hub['hubloc_id']),
+				dbesc($sitekey)
+			);
+		}
+		q("update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'",
+			dbesc($hub['hubloc_hash'])
+		);
+	}
+		
+	return $hub['hubloc_url'];
+}
+
+
+function zot_reply_ping() {
+
+	$ret = array('success'=> false);
+
+	// Useful to get a health check on a remote site.
+	// This will let us know if any important communication details
+	// that we may have stored are no longer valid, regardless of xchan details.
+	logger('POST: got ping send pong now back: ' . z_root() , LOGGER_DEBUG );
+ 
+	$ret['success'] = true;
+	$ret['site'] = array();
+	$ret['site']['url'] = z_root();
+	$ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),get_config('system','prvkey')));
+	$ret['site']['sitekey'] = get_config('system','pubkey');
+	json_return_and_die($ret);
+}
+
+function zot_reply_pickup($data) {
+
+	$ret = array('success'=> false);
+
+	/*
+	 * The 'pickup' message arrives with a tracking ID which is associated with a particular outq_hash
+	 * First verify that that the returned signatures verify, then check that we have an outbound queue item
+	 * with the correct hash.
+	 * If everything verifies, find any/all outbound messages in the queue for this hubloc and send them back
+	 */
+
+	if((! $data['secret']) || (! $data['secret_sig'])) {
+		$ret['message'] = 'no verification signature';
+		logger('mod_zot: pickup: ' . $ret['message'], LOGGER_DEBUG);
+		json_return_and_die($ret);
+	}
+
+	$r = q("select distinct hubloc_sitekey from hubloc where hubloc_url = '%s' and hubloc_callback = '%s' and hubloc_sitekey != '' group by hubloc_sitekey ",
+		dbesc($data['url']),
+		dbesc($data['callback'])
+	);
+	if(! $r) {
+		$ret['message'] = 'site not found';
+		logger('mod_zot: pickup: ' . $ret['message']);
+		json_return_and_die($ret);
+	}
+
+	foreach ($r as $hubsite) {
+
+		// verify the url_sig
+		// If the server was re-installed at some point, there could be multiple hubs with the same url and callback.
+		// Only one will have a valid key.
+
+		$forgery = true;
+		$secret_fail = true;
+
+		$sitekey = $hubsite['hubloc_sitekey'];
+
+		logger('mod_zot: Checking sitekey: ' . $sitekey, LOGGER_DATA, LOG_DEBUG);
+
+		if(rsa_verify($data['callback'],base64url_decode($data['callback_sig']),$sitekey)) {
+			$forgery = false;
+		}
+		if(rsa_verify($data['secret'],base64url_decode($data['secret_sig']),$sitekey)) {
+			$secret_fail = false;
+		}
+		if((! $forgery) && (! $secret_fail))
+			break;
+	}
+
+	if($forgery) {
+		$ret['message'] = 'possible site forgery';
+		logger('mod_zot: pickup: ' . $ret['message']);
+		json_return_and_die($ret);
+	}
+
+	if($secret_fail) {
+		$ret['message'] = 'secret validation failed';
+		logger('mod_zot: pickup: ' . $ret['message']);
+		json_return_and_die($ret);
+	}
+
+	/*
+	 * If we made it to here, the signatures verify, but we still don't know if the tracking ID is valid.
+	 * It wouldn't be an error if the tracking ID isn't found, because we may have sent this particular
+	 * queue item with another pickup (after the tracking ID for the other pickup  was verified). 
+	 */
+
+	$r = q("select outq_posturl from outq where outq_hash = '%s' and outq_posturl = '%s' limit 1",
+		dbesc($data['secret']),
+		dbesc($data['callback'])
+	);
+	if(! $r) {
+		$ret['message'] = 'nothing to pick up';
+		logger('mod_zot: pickup: ' . $ret['message']);
+		json_return_and_die($ret);
+	}
+
+	/*
+	 * Everything is good if we made it here, so find all messages that are going to this location
+	 * and send them all.
+	 */
+
+	$r = q("select * from outq where outq_posturl = '%s'",
+		dbesc($data['callback'])
+	);
+	if($r) {
+		logger('mod_zot: successful pickup message received from ' . $data['callback'] . ' ' . count($r) . ' message(s) picked up', LOGGER_DEBUG);
+
+		$ret['success'] = true;
+		$ret['pickup'] = array();
+		foreach($r as $rr) {
+			if($rr['outq_msg']) {
+				$x = json_decode($rr['outq_msg'],true);
+
+				if(! $x)
+					continue;
+
+				if(is_array($x) && array_key_exists('message_list',$x)) {
+					foreach($x['message_list'] as $xx) {
+						$ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $xx);
+					}
+				}
+				else
+					$ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $x);
+				
+				remove_queue_item($rr['outq_hash']);
+			}
+		}
+	}
+
+	$encrypted = crypto_encapsulate(json_encode($ret),$sitekey);
+	json_return_and_die($encrypted);
+
+	/* pickup: end */
+}
+
+
+
+function zot_reply_auth_check($data,$encrypted_packet) {
+
+	$ret = array('success' => false);
+
+	/*
+	 * Requestor visits /magic/?dest=somewhere on their own site with a browser
+	 * magic redirects them to $destsite/post [with auth args....]
+	 * $destsite sends an auth_check packet to originator site
+	 * The auth_check packet is handled here by the originator's site 
+	 * - the browser session is still waiting
+	 * inside $destsite/post for everything to verify
+	 * If everything checks out we'll return a token to $destsite
+	 * and then $destsite will verify the token, authenticate the browser
+	 * session and then redirect to the original destination.
+	 * If authentication fails, the redirection to the original destination
+	 * will still take place but without authentication.
+	 */
+	logger('mod_zot: auth_check', LOGGER_DEBUG);
+
+	if (! $encrypted_packet) {
+		logger('mod_zot: auth_check packet was not encrypted.');
+		$ret['message'] .= 'no packet encryption' . EOL;
+		json_return_and_die($ret);
+	}
+
+	$arr = $data['sender'];
+	$sender_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
+
+	// garbage collect any old unused notifications
+
+	// This was and should be 10 minutes but my hosting provider has time lag between the DB and 
+	// the web server. We should probably convert this to webserver time rather than DB time so 
+	// that the different clocks won't affect it and allow us to keep the time short. 
+
+	q("delete from verify where type = 'auth' and created < %s - INTERVAL %s",
+		db_utcnow(), db_quoteinterval('30 MINUTE')
+	);
+
+	$y = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1",
+		dbesc($sender_hash)
+	);
+
+	// We created a unique hash in mod/magic.php when we invoked remote auth, and stored it in
+	// the verify table. It is now coming back to us as 'secret' and is signed by a channel at the other end.
+	// First verify their signature. We will have obtained a zot-info packet from them as part of the sender
+	// verification. 
+
+	if ((! $y) || (! rsa_verify($data['secret'], base64url_decode($data['secret_sig']),$y[0]['xchan_pubkey']))) {
+		logger('mod_zot: auth_check: sender not found or secret_sig invalid.');
+		$ret['message'] .= 'sender not found or sig invalid ' . print_r($y,true) . EOL;
+		json_return_and_die($ret);
+	}
+
+	// There should be exactly one recipient, the original auth requestor
+
+	$ret['message'] .= 'recipients ' . print_r($recipients,true) . EOL;
+
+	if ($data['recipients']) {
+
+		$arr = $data['recipients'][0];
+		$recip_hash = make_xchan_hash($arr['guid'], $arr['guid_sig']);
+		$c = q("select channel_id, channel_account_id, channel_prvkey from channel where channel_hash = '%s' limit 1",
+			dbesc($recip_hash)
+		);
+		if (! $c) {
+			logger('mod_zot: auth_check: recipient channel not found.');
+			$ret['message'] .= 'recipient not found.' . EOL;
+			json_return_and_die($ret);
+		}
+
+		$confirm = base64url_encode(rsa_sign($data['secret'] . $recip_hash,$c[0]['channel_prvkey']));
+
+		// This additionally checks for forged sites since we already stored the expected result in meta
+		// and we've already verified that this is them via zot_gethub() and that their key signed our token
+
+		$z = q("select id from verify where channel = %d and type = 'auth' and token = '%s' and meta = '%s' limit 1",
+			intval($c[0]['channel_id']),
+			dbesc($data['secret']),
+			dbesc($data['sender']['url'])
+		);
+		if (! $z) {
+			logger('mod_zot: auth_check: verification key not found.');
+			$ret['message'] .= 'verification key not found' . EOL;
+			json_return_and_die($ret);
+		}
+		$r = q("delete from verify where id = %d",
+			intval($z[0]['id'])
+		);
+
+		$u = q("select account_service_class from account where account_id = %d limit 1",
+			intval($c[0]['channel_account_id'])
+		);
+
+		logger('mod_zot: auth_check: success', LOGGER_DEBUG);
+		$ret['success'] = true;
+		$ret['confirm'] = $confirm;
+		if ($u && $u[0]['account_service_class'])
+			$ret['service_class'] = $u[0]['account_service_class'];
+
+		// Set "do not track" flag if this site or this channel's profile is restricted
+		// in some way
+
+		if (intval(get_config('system','block_public')))
+			$ret['DNT'] = true;
+		if (! perm_is_allowed($c[0]['channel_id'],'','view_profile'))
+			$ret['DNT'] = true;
+		if (get_pconfig($c[0]['channel_id'],'system','do_not_track'))
+			$ret['DNT'] = true;
+		if (get_pconfig($c[0]['channel_id'],'system','hide_online_status'))
+			$ret['DNT'] = true;
+
+		json_return_and_die($ret);
+	}
+	json_return_and_die($ret);
+}
+
+
+function zot_reply_purge($sender,$recipients) {
+
+	$ret = array('success' => false);
+
+	if ($recipients) {
+		// basically this means "unfriend"
+		foreach ($recipients as $recip) {
+			$r = q("select channel.*,xchan.* from channel 
+				left join xchan on channel_hash = xchan_hash
+				where channel_guid = '%s' and channel_guid_sig = '%s' limit 1",
+				dbesc($recip['guid']),
+				dbesc($recip['guid_sig'])
+			);
+			if ($r) {
+				$r = q("select abook_id from abook where uid = %d and abook_xchan = '%s' limit 1",
+					intval($r[0]['channel_id']),
+					dbesc(make_xchan_hash($sender['guid'],$sender['guid_sig']))
+				);
+				if ($r) {
+					contact_remove($r[0]['channel_id'],$r[0]['abook_id']);
+				}
+			}
+		}
+		$ret['success'] = true;
+	} 
+	else {
+		// Unfriend everybody - basically this means the channel has committed suicide
+		$arr = $sender;
+		$sender_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
+
+		require_once('include/Contact.php');
+		remove_all_xchan_resources($sender_hash);	
+
+		$ret['success'] = true;
+	}
+
+	json_return_and_die($ret);
+}
+
+
+function zot_reply_refresh($sender,$recipients) {
+
+	$ret = array('success' => false);
+
+	// remote channel info (such as permissions or photo or something)
+	// has been updated. Grab a fresh copy and sync it.
+	// The difference between refresh and force_refresh is that 
+	// force_refresh unconditionally creates a directory update record,
+	// even if no changes were detected upon processing.
+
+	if($recipients) {
+
+		// This would be a permissions update, typically for one connection
+
+		foreach ($recipients as $recip) {
+			$r = q("select channel.*,xchan.* from channel 
+				left join xchan on channel_hash = xchan_hash
+				where channel_guid = '%s' and channel_guid_sig = '%s' limit 1",
+				dbesc($recip['guid']),
+				dbesc($recip['guid_sig'])
+			);
+
+			$x = zot_refresh(array(
+					'xchan_guid'     => $sender['guid'], 
+					'xchan_guid_sig' => $sender['guid_sig'],
+					'hubloc_url'     => $sender['url']
+			), $r[0], (($msgtype === 'force_refresh') ? true : false));
+		}
+	} 
+	else {
+			// system wide refresh
+
+		$x = zot_refresh(array(
+			'xchan_guid'     => $sender['guid'], 
+			'xchan_guid_sig' => $sender['guid_sig'],
+			'hubloc_url'     => $sender['url']
+		), null, (($msgtype === 'force_refresh') ? true : false));
+	}
+
+	$ret['success'] = true;
+	json_return_and_die($ret);
+
+}
+
+
+function zot_reply_notify($data) {
+
+	$ret = array('success' => false);
+
+	logger('notify received from ' . $data['sender']['url']);
+
+	$async = get_config('system','queued_fetch');
+
+	if($async) {
+		// add to receive queue
+		// qreceive_add($data);
+	} 
+	else {
+		$x = zot_fetch($data);
+		$ret['delivery_report'] = $x;
+	}
+
+	$ret['success'] = true;
+	json_return_and_die($ret);
+
+}
\ No newline at end of file
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 25852497b..8ca74c23b 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -382,3 +382,8 @@ stuff on your server that might access MySQL, and Hubzilla's poller which
 needs MySQL access, too. A good setting for a medium-sized hub might be to
 keep MySQL's max_connections at 100 and set mpm_prefork's
 MaxRequestWorkers to 70.
+
+Here you can read more about Apache performance tuning:
+https://httpd.apache.org/docs/2.4/misc/perf-tuning.html
+
+There are tons of scripts to help you with fine-tuning your Apache installation. Just search with your favorite search engine 'apache fine-tuning script'.
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 3dab6c822..3d7ea41df 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -23,6 +23,7 @@ CREATE TABLE IF NOT EXISTS `abook` (
   `abook_profile` char(64) NOT NULL DEFAULT '',
   `abook_incl` TEXT NOT NULL DEFAULT '',
   `abook_excl` TEXT NOT NULL DEFAULT '',
+  `abook_instance` TEXT NOT NULL DEFAULT '',
   PRIMARY KEY (`abook_id`),
   KEY `abook_account` (`abook_account`),
   KEY `abook_channel` (`abook_channel`),
@@ -771,15 +772,6 @@ CREATE TABLE IF NOT EXISTS `mail` (
   KEY `mail_obscured` (`mail_obscured`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `manage` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `uid` int(11) NOT NULL DEFAULT '0',
-  `xchan` char(255) NOT NULL DEFAULT '',
-  PRIMARY KEY (`id`),
-  KEY `uid` (`uid`),
-  KEY `xchan` (`xchan`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 CREATE TABLE IF NOT EXISTS `menu` (
   `menu_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `menu_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 95ed9acb7..5cabbc2c9 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -22,6 +22,7 @@ CREATE TABLE "abook" (
   "abook_profile" char(64) NOT NULL DEFAULT '',
   "abook_incl" TEXT NOT NULL DEFAULT '',
   "abook_excl" TEXT NOT NULL DEFAULT '',
+  "abook_instance" TEXT NOT NULL DEFAULT '',
   PRIMARY KEY ("abook_id")
 );
   create index  "abook_account" on abook ("abook_account");
@@ -766,15 +767,6 @@ create index "mail_isreply" on mail ("mail_isreply");
 create index "mail_seen" on mail ("mail_seen");
 create index "mail_recalled" on mail ("mail_recalled");
 create index "mail_obscured" on mail ("mail_obscured");
-CREATE TABLE "manage" (
-  "id" serial NOT NULL,
-  "uid" bigint NOT NULL,
-  "xchan" text NOT NULL DEFAULT '',
-  PRIMARY KEY ("id")
-
-);
-create index "manage_uid" on manage ("uid");
-create index "manage_xchan" on manage ("xchan");
 CREATE TABLE "menu" (
   "menu_id" serial  NOT NULL,
   "menu_channel_id" bigint  NOT NULL DEFAULT '0',
diff --git a/install/update.php b/install/update.php
index 10ae6725e..24f4f21d5 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1160 );
+define( 'UPDATE_VERSION' , 1161 );
 
 /**
  *
@@ -1950,3 +1950,10 @@ function update_r1159() {
 }
 
 
+function update_r1160() {
+	$r = q("alter table abook add abook_instance text not null default '' ");
+	if($r)
+		return UPDATE_SUCCESS;
+    return UPDATE_FAILED;
+}
+
diff --git a/library/OAuth1.php b/library/OAuth1.php
index b790655af..0a6b20b0a 100644
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
@@ -3,11 +3,11 @@
 
 /* Generic exception class
  */
-class OAuthException extends Exception {
+class OAuth1Exception extends Exception {
   // pass
 }
 
-class OAuthConsumer {
+class OAuth1Consumer {
   public $key;
   public $secret;
 
@@ -18,11 +18,11 @@ class OAuthConsumer {
   }
 
   function __toString() {
-    return "OAuthConsumer[key=$this->key,secret=$this->secret]";
+    return "OAuth1Consumer[key=$this->key,secret=$this->secret]";
   }
 }
 
-class OAuthToken {
+class OAuth1Token {
   // access tokens and request tokens
   public $key;
   public $secret;
@@ -46,9 +46,9 @@ class OAuthToken {
    */
   function to_string() {
     return "oauth_token=" .
-           OAuthUtil::urlencode_rfc3986($this->key) .
+           OAuth1Util::urlencode_rfc3986($this->key) .
            "&oauth_token_secret=" .
-           OAuthUtil::urlencode_rfc3986($this->secret);
+           OAuth1Util::urlencode_rfc3986($this->secret);
   }
 
   function __toString() {
@@ -60,7 +60,7 @@ class OAuthToken {
  * A class for implementing a Signature Method
  * See section 9 ("Signing Requests") in the spec
  */
-abstract class OAuthSignatureMethod {
+abstract class OAuth1SignatureMethod {
   /**
    * Needs to return the name of the Signature Method (ie HMAC-SHA1)
    * @return string
@@ -70,20 +70,20 @@ abstract class OAuthSignatureMethod {
   /**
    * Build up the signature
    * NOTE: The output of this function MUST NOT be urlencoded.
-   * the encoding is handled in OAuthRequest when the final
+   * the encoding is handled in OAuth1Request when the final
    * request is serialized
-   * @param OAuthRequest $request
-   * @param OAuthConsumer $consumer
-   * @param OAuthToken $token
+   * @param OAuth1Request $request
+   * @param OAuth1Consumer $consumer
+   * @param OAuth1Token $token
    * @return string
    */
   abstract public function build_signature($request, $consumer, $token);
 
   /**
    * Verifies that a given signature is correct
-   * @param OAuthRequest $request
-   * @param OAuthConsumer $consumer
-   * @param OAuthToken $token
+   * @param OAuth1Request $request
+   * @param OAuth1Consumer $consumer
+   * @param OAuth1Token $token
    * @param string $signature
    * @return bool
    */
@@ -101,7 +101,7 @@ abstract class OAuthSignatureMethod {
  * character (ASCII code 38) even if empty.
  *   - Chapter 9.2 ("HMAC-SHA1")
  */
-class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
+class OAuth1SignatureMethod_HMAC_SHA1 extends OAuth1SignatureMethod {
   function get_name() {
     return "HMAC-SHA1";
   }
@@ -115,7 +115,7 @@ class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
       ($token) ? $token->secret : ""
     );
 
-    $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
+    $key_parts = OAuth1Util::urlencode_rfc3986($key_parts);
     $key = implode('&', $key_parts);
 
 
@@ -129,7 +129,7 @@ class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
  * over a secure channel such as HTTPS. It does not use the Signature Base String.
  *   - Chapter 9.4 ("PLAINTEXT")
  */
-class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
+class OAuth1SignatureMethod_PLAINTEXT extends OAuth1SignatureMethod {
   public function get_name() {
     return "PLAINTEXT";
   }
@@ -141,7 +141,7 @@ class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
    *   - Chapter 9.4.1 ("Generating Signatures")
    *
    * Please note that the second encoding MUST NOT happen in the SignatureMethod, as
-   * OAuthRequest handles this!
+   * OAuth1Request handles this!
    */
   public function build_signature($request, $consumer, $token) {
     $key_parts = array(
@@ -149,7 +149,7 @@ class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
       ($token) ? $token->secret : ""
     );
 
-    $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
+    $key_parts = OAuth1Util::urlencode_rfc3986($key_parts);
     $key = implode('&', $key_parts);
     $request->base_string = $key;
 
@@ -165,7 +165,7 @@ class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
  * specification.
  *   - Chapter 9.3 ("RSA-SHA1")
  */
-abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {
+abstract class OAuth1SignatureMethod_RSA_SHA1 extends OAuth1SignatureMethod {
   public function get_name() {
     return "RSA-SHA1";
   }
@@ -224,7 +224,7 @@ abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {
   }
 }
 
-class OAuthRequest {
+class OAuth1Request {
   private $parameters;
   private $http_method;
   private $http_url;
@@ -235,7 +235,7 @@ class OAuthRequest {
 
   function __construct($http_method, $http_url, $parameters=NULL) {
     @$parameters or $parameters = array();
-    $parameters = array_merge( OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters);
+    $parameters = array_merge( OAuth1Util::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters);
     $this->parameters = $parameters;
     $this->http_method = $http_method;
     $this->http_url = $http_url;
@@ -262,10 +262,10 @@ class OAuthRequest {
     // parsed parameter-list
     if (!$parameters) {
       // Find request headers
-      $request_headers = OAuthUtil::get_headers();
+      $request_headers = OAuth1Util::get_headers();
 
       // Parse the query-string to find GET parameters
-      $parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']);
+      $parameters = OAuth1Util::parse_parameters($_SERVER['QUERY_STRING']);
 
       // It's a POST request of the proper content-type, so parse POST
       // parameters and add those overriding any duplicates from GET
@@ -274,7 +274,7 @@ class OAuthRequest {
                      "application/x-www-form-urlencoded")
           ) {
 
-        $post_data = OAuthUtil::parse_parameters(
+        $post_data = OAuth1Util::parse_parameters(
           file_get_contents(self::$POST_INPUT)
         );
         $parameters = array_merge($parameters, $post_data);
@@ -283,7 +283,7 @@ class OAuthRequest {
       // We have a Authorization-header with OAuth data. Parse the header
       // and add those overriding any duplicates from GET or POST
       if (@substr($request_headers['Authorization'], 0, 6) == "OAuth ") {
-        $header_parameters = OAuthUtil::split_header(
+        $header_parameters = OAuth1Util::split_header(
           $request_headers['Authorization']
         );
         $parameters = array_merge($parameters, $header_parameters);
@@ -296,7 +296,7 @@ class OAuthRequest {
     $http_url =  substr($http_url, 0, strpos($http_url,$parameters['q'])+strlen($parameters['q']));
     unset( $parameters['q'] );
     
-    return new OAuthRequest($http_method, $http_url, $parameters);
+    return new OAuth1Request($http_method, $http_url, $parameters);
   }
 
   /**
@@ -304,16 +304,16 @@ class OAuthRequest {
    */
   public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) {
     @$parameters or $parameters = array();
-    $defaults = array("oauth_version" => OAuthRequest::$version,
-                      "oauth_nonce" => OAuthRequest::generate_nonce(),
-                      "oauth_timestamp" => OAuthRequest::generate_timestamp(),
+    $defaults = array("oauth_version" => OAuth1Request::$version,
+                      "oauth_nonce" => OAuth1Request::generate_nonce(),
+                      "oauth_timestamp" => OAuth1Request::generate_timestamp(),
                       "oauth_consumer_key" => $consumer->key);
     if ($token)
       $defaults['oauth_token'] = $token->key;
 
     $parameters = array_merge($defaults, $parameters);
 
-    return new OAuthRequest($http_method, $http_url, $parameters);
+    return new OAuth1Request($http_method, $http_url, $parameters);
   }
 
   public function set_parameter($name, $value, $allow_duplicates = true) {
@@ -357,7 +357,7 @@ class OAuthRequest {
       unset($params['oauth_signature']);
     }
 
-    return OAuthUtil::build_http_query($params);
+    return OAuth1Util::build_http_query($params);
   }
 
   /**
@@ -374,7 +374,7 @@ class OAuthRequest {
       $this->get_signable_parameters()
     );
 
-    $parts = OAuthUtil::urlencode_rfc3986($parts);
+    $parts = OAuth1Util::urlencode_rfc3986($parts);
 
     return implode('&', $parts);
   }
@@ -423,7 +423,7 @@ class OAuthRequest {
    * builds the data one would send in a POST request
    */
   public function to_postdata() {
-    return OAuthUtil::build_http_query($this->parameters);
+    return OAuth1Util::build_http_query($this->parameters);
   }
 
   /**
@@ -432,7 +432,7 @@ class OAuthRequest {
   public function to_header($realm=null) {
     $first = true;
 	if($realm) {
-      $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"';
+      $out = 'Authorization: OAuth realm="' . OAuth1Util::urlencode_rfc3986($realm) . '"';
       $first = false;
     } else
       $out = 'Authorization: OAuth';
@@ -441,12 +441,12 @@ class OAuthRequest {
     foreach ($this->parameters as $k => $v) {
       if (substr($k, 0, 5) != "oauth") continue;
       if (is_array($v)) {
-        throw new OAuthException('Arrays not supported in headers');
+        throw new OAuth1Exception('Arrays not supported in headers');
       }
       $out .= ($first) ? ' ' : ',';
-      $out .= OAuthUtil::urlencode_rfc3986($k) .
+      $out .= OAuth1Util::urlencode_rfc3986($k) .
               '="' .
-              OAuthUtil::urlencode_rfc3986($v) .
+              OAuth1Util::urlencode_rfc3986($v) .
               '"';
       $first = false;
     }
@@ -491,7 +491,7 @@ class OAuthRequest {
   }
 }
 
-class OAuthServer {
+class OAuth1Server {
   protected $timestamp_threshold = 300; // in seconds, five minutes
   protected $version = '1.0';             // hi blaine
   protected $signature_methods = array();
@@ -572,7 +572,7 @@ class OAuthServer {
       $version = '1.0';
     }
     if ($version !== $this->version) {
-      throw new OAuthException("OAuth version '$version' not supported");
+      throw new OAuth1Exception("OAuth1 version '$version' not supported");
     }
     return $version;
   }
@@ -587,12 +587,12 @@ class OAuthServer {
     if (!$signature_method) {
       // According to chapter 7 ("Accessing Protected Ressources") the signature-method
       // parameter is required, and we can't just fallback to PLAINTEXT
-      throw new OAuthException('No signature method parameter. This parameter is required');
+      throw new OAuth1Exception('No signature method parameter. This parameter is required');
     }
 
     if (!in_array($signature_method,
                   array_keys($this->signature_methods))) {
-      throw new OAuthException(
+      throw new OAuth1Exception(
         "Signature method '$signature_method' not supported " .
         "try one of the following: " .
         implode(", ", array_keys($this->signature_methods))
@@ -607,12 +607,12 @@ class OAuthServer {
   private function get_consumer(&$request) {
     $consumer_key = @$request->get_parameter("oauth_consumer_key");
     if (!$consumer_key) {
-      throw new OAuthException("Invalid consumer key");
+      throw new OAuth1Exception("Invalid consumer key");
     }
 
     $consumer = $this->data_store->lookup_consumer($consumer_key);
     if (!$consumer) {
-      throw new OAuthException("Invalid consumer");
+      throw new OAuth1Exception("Invalid consumer");
     }
 
     return $consumer;
@@ -627,7 +627,7 @@ class OAuthServer {
       $consumer, $token_type, $token_field
     );
     if (!$token) {
-      throw new OAuthException("Invalid $token_type token: $token_field");
+      throw new OAuth1Exception("Invalid $token_type token: $token_field");
     }
     return $token;
   }
@@ -656,7 +656,7 @@ class OAuthServer {
 	
 
     if (!$valid_sig) {
-      throw new OAuthException("Invalid signature");
+      throw new OAuth1Exception("Invalid signature");
     }
   }
 
@@ -665,14 +665,14 @@ class OAuthServer {
    */
   private function check_timestamp($timestamp) {
     if( ! $timestamp )
-      throw new OAuthException(
+      throw new OAuth1Exception(
         'Missing timestamp parameter. The parameter is required'
       );
     
     // verify that timestamp is recentish
     $now = time();
     if (abs($now - $timestamp) > $this->timestamp_threshold) {
-      throw new OAuthException(
+      throw new OAuth1Exception(
         "Expired timestamp, yours $timestamp, ours $now"
       );
     }
@@ -683,7 +683,7 @@ class OAuthServer {
    */
   private function check_nonce($consumer, $token, $nonce, $timestamp) {
     if( ! $nonce )
-      throw new OAuthException(
+      throw new OAuth1Exception(
         'Missing nonce parameter. The parameter is required'
       );
 
@@ -695,13 +695,13 @@ class OAuthServer {
       $timestamp
     );
     if ($found) {
-      throw new OAuthException("Nonce already used: $nonce");
+      throw new OAuth1Exception("Nonce already used: $nonce");
     }
   }
 
 }
 
-class OAuthDataStore {
+class OAuth1DataStore {
   function lookup_consumer($consumer_key) {
     // implement me
   }
@@ -727,10 +727,10 @@ class OAuthDataStore {
 
 }
 
-class OAuthUtil {
+class OAuth1Util {
   public static function urlencode_rfc3986($input) {
   if (is_array($input)) {
-    return array_map(array('OAuthUtil', 'urlencode_rfc3986'), $input);
+    return array_map(array('OAuth1Util', 'urlencode_rfc3986'), $input);
   } else if (is_scalar($input)) {
     return str_replace(
       '+',
@@ -762,7 +762,7 @@ class OAuthUtil {
       $header_name = $matches[2][0];
       $header_content = (isset($matches[5])) ? $matches[5][0] : $matches[4][0];
       if (preg_match('/^oauth_/', $header_name) || !$only_allow_oauth_parameters) {
-        $params[$header_name] = OAuthUtil::urldecode_rfc3986($header_content);
+        $params[$header_name] = OAuth1Util::urldecode_rfc3986($header_content);
       }
       $offset = $match[1] + strlen($match[0]);
     }
@@ -834,8 +834,8 @@ class OAuthUtil {
     $parsed_parameters = array();
     foreach ($pairs as $pair) {
       $split = explode('=', $pair, 2);
-      $parameter = OAuthUtil::urldecode_rfc3986($split[0]);
-      $value = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : '';
+      $parameter = OAuth1Util::urldecode_rfc3986($split[0]);
+      $value = isset($split[1]) ? OAuth1Util::urldecode_rfc3986($split[1]) : '';
 
       if (isset($parsed_parameters[$parameter])) {
         // We have already recieved parameter(s) with this name, so add to the list
@@ -859,8 +859,8 @@ class OAuthUtil {
     if (!$params) return '';
 
     // Urlencode both keys and values
-    $keys = OAuthUtil::urlencode_rfc3986(array_keys($params));
-    $values = OAuthUtil::urlencode_rfc3986(array_values($params));
+    $keys = OAuth1Util::urlencode_rfc3986(array_keys($params));
+    $values = OAuth1Util::urlencode_rfc3986(array_values($params));
     $params = array_combine($keys, $values);
 
     // Parameters are sorted by name, using lexicographical byte value ordering.
@@ -885,5 +885,3 @@ class OAuthUtil {
     return implode('&', $pairs);
   }
 }
-
-?>
diff --git a/library/Smarty/NEW_FEATURES.txt b/library/Smarty/NEW_FEATURES.txt
new file mode 100644
index 000000000..595dc4d3c
--- /dev/null
+++ b/library/Smarty/NEW_FEATURES.txt
@@ -0,0 +1,133 @@
+
+
+This file contains a brief description of new features which have been added to Smarty 3.1
+
+Smarty 3.1.28
+
+    OPCACHE
+    =======
+    Smarty does now invalidate automatically updated and cleared compiled or cached template files in OPCACHE.
+    Correct operation is no longer dependent on OPCACHE configuration settings.
+
+    Template inheritance
+    ====================
+    Template inheritance is now processed in run time.
+    See the INHERITANCE_RELEASE_NOTES
+
+    Modifier regex_replace
+    ======================
+    An optional limit parameter was added
+
+    fetch() and display()
+    =====================
+    The fetch() and display() methods of the template object accept now optionally the same parameter
+    as the corresponding Smarty methods to get tne content of another template.
+    Example:
+        $template->display();           Does display template of template object
+        $template->dispaly('foo.tpl');  Does display template 'foo.bar' 
+
+    File: resource
+    ==============
+    Multiple template_dir entries can now be selected  by a comma separated list of indices.
+    The template_dir array is searched in the order of the indices. (Could be used to change the default search order)
+    Example:
+        $smarty->display([1],[0]foo.bar');
+        
+    Filter support
+    ==============
+    Optional filter names
+      An optional filter name was added to $smarty->registerFilter(). It can be used to unregister a filter by name.
+      - $smarty->registerFilter('output', $callback, 'name');
+        $smarty->unregister('output', 'name');
+
+    Closures
+      $smarty->registerFilter() does now accept closures.
+      - $smarty->registerFilter('pre', function($source) {return $source;});
+      If no optional filter name was specified it gets the default name 'closure'.
+      If you register multiple closures register each with a unique filter name.
+      - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_1');
+      - $smarty->registerFilter('pre', function($source) {return $source;}, 'closure_2');
+      
+
+Smarty 3.1.22
+
+    Namespace support within templates
+    ==================================
+    Within templates you can now use namespace specifications on:
+     - Constants                like    foo\bar\FOO
+     - Class names              like    foo\bar\Baz::FOO, foo\bar\Baz::$foo, foo\bar\Baz::foo()
+     - PHP function names       like    foo\bar\baz()
+
+    Security
+    ========
+    - disable special $smarty variable -
+    The Smarty_Security class has the new property $disabled_special_smarty_vars.
+    It's an array which can be loaded with the $smarty special variable names like
+    'template_object', 'template', 'current_dir' and others which will be disabled.
+    Note: That this security check is performed at compile time.
+
+    - limit template nesting -
+    Property $max_template_nesting of Smarty_Security does set the maximum template nesting level.
+    The main template is level 1. The nesting level is checked at run time. When the maximum will be exceeded
+    an Exception will be thrown. The default setting is 0 which does disable this check.
+
+    - trusted static methods -
+   The Smarty_Security class has the new property $trusted_static_methods to restrict access to static methods.
+   It's an nested array of trusted class and method names.
+         Format:
+         array (
+                    'class_1' => array('method_1', 'method_2'), // allowed methods
+                    'class_2' => array(),                       // all methods of class allowed
+               )
+   To disable access for all methods of all classes set $trusted_static_methods = null;
+   The default value is an empty array() which does enables all methods of all classes, but for backward compatibility
+   the setting of $static_classes will be checked.
+   Note: That this security check is performed at compile time.
+
+    - trusted static properties -
+   The Smarty_Security class has the new property $trusted_static_properties to restrict access to static properties.
+   It's an nested array of trusted class and property names.
+         Format:
+         array (
+                    'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+                    'class_2' => array(),                   // all properties of class allowed
+                }
+   To disable access for all properties of all classes set $trusted_static_properties = null;
+   The default value is an empty array() which does enables all properties of all classes, but for backward compatibility
+   the setting of $static_classes will be checked.
+   Note: That this security check is performed at compile time.
+
+    - trusted constants .
+   The Smarty_Security class has the new property $trusted_constants to restrict access to constants.
+   It's an array of trusted constant names.
+         Format:
+         array (
+                    'SMARTY_DIR' , // allowed constant
+                }
+   If the array is empty (default) the usage of constants  can be controlled with the
+   Smarty_Security::$allow_constants property (default true)
+
+
+
+    Compiled Templates
+    ==================
+    Smarty does now automatically detects a change of the $merge_compiled_includes and $escape_html
+    property and creates different compiled templates files depending on the setting.
+
+    Same applies to config files and the $config_overwrite, $config_booleanize and
+    $config_read_hidden properties.
+
+    Debugging
+    =========
+    The layout of the debug window has been changed for better readability
+    
+    New class constants
+        Smarty::DEBUG_OFF
+        Smarty::DEBUG_ON
+        Smarty::DEBUG_INDIVIDUAL
+    have been introduced for setting the $debugging property.
+
+    Smarty::DEBUG_INDIVIDUAL will create for each display() and fetch() call an individual debug window.
+
+    .
+    
\ No newline at end of file
diff --git a/library/Smarty/README b/library/Smarty/README
index 6367f030e..08b397c3f 100644
--- a/library/Smarty/README
+++ b/library/Smarty/README
@@ -1,4 +1,4 @@
-Smarty 3.1.21
+Smarty 3.x
 
 Author: Monte Ohrt <monte at ohrt dot com >
 Author: Uwe Tews
@@ -460,12 +460,13 @@ included template.
 PLUGINS
 =======
 
-Smarty3 are following the same coding rules as in Smarty2. 
-The only difference is that the template object is passed as additional third parameter.
+Smarty 3 plugins follow the same coding rules as in Smarty 2. 
+The main difference is that the template object is now passed in place of the smarty object. 
+The smarty object can be still be accessed through $template->smarty.
 
-smarty_plugintype_name (array $params, object $smarty, object $template)
+smarty_plugintype_name (array $params, Smarty_Internal_Template $template)
 
-The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty2 internals.
+The Smarty 2 plugins are still compatible as long as they do not make use of specific Smarty 2 internals.
 
 
 TEMPLATE INHERITANCE:
diff --git a/library/Smarty/SMARTY_2_BC_NOTES.txt b/library/Smarty/SMARTY_2_BC_NOTES.txt
deleted file mode 100644
index 79a2cb1b6..000000000
--- a/library/Smarty/SMARTY_2_BC_NOTES.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-= Known incompatibilities with Smarty 2 =
-
-== Syntax ==
-
-Smarty 3 API has a new syntax. Much of the Smarty 2 syntax is supported 
-by a wrapper but deprecated. See the README that comes with Smarty 3 for more 
-information.
-
-The {$array|@mod} syntax has always been a bit confusing, where an "@" is required
-to apply a modifier to an array instead of the individual elements. Normally you
-always want the modifier to apply to the variable regardless of its type. In Smarty 3,
-{$array|mod} and {$array|@mod} behave identical. It is safe to drop the "@" and the
-modifier will still apply to the array. If you really want the modifier to apply to
-each array element, you must loop the array in-template, or use a custom modifier that
-supports array iteration. Most smarty functions already escape values where necessary
-such as {html_options}
-
-== PHP Version ==
-Smarty 3 is PHP 5 only. It will not work with PHP 4.
-
-== {php} Tag ==
-The {php} tag is disabled by default. The use of {php} tags is
-deprecated. It can be enabled with $smarty->allow_php_tag=true.
-
-But if you scatter PHP code which belongs together into several
-{php} tags it may not work any longer.
-
-== Delimiters and whitespace ==
-Delimiters surrounded by whitespace are no longer treated as Smarty tags.
-Therefore, { foo } will not compile as a tag, you must use {foo}. This change
-Makes Javascript/CSS easier to work with, eliminating the need for {literal}.
-This can be disabled by setting $smarty->auto_literal = false;
-
-== Unquoted Strings ==
-Smarty 2 was a bit more forgiving (and ambiguous) when it comes to unquoted strings 
-in parameters. Smarty3 is more restrictive. You can still pass strings without quotes 
-so long as they contain no special characters. (anything outside of A-Za-z0-9_) 
-
-For example filename strings must be quoted
-<source lang="smarty">
-{include file='path/foo.tpl'}
-</source>
-
-== Extending the Smarty class ==
-Smarty 3 makes use of the __construct method for initialization. If you are extending 
-the Smarty class, its constructor is not called implicitly if the your child class defines 
-its own constructor. In order to run Smarty's constructor, a call to parent::__construct() 
-within your child constructor is required. 
-
-<source lang="php">
-class MySmarty extends Smarty {
-   function __construct() {
-       parent::__construct();
-    
-       // your initialization code goes here
-
-   }
-}
-</source>
-
-== Autoloader ==
-Smarty 3 does register its own autoloader with spl_autoload_register. If your code has 
-an existing __autoload function then this function must be explicitly registered on 
-the __autoload stack. See http://us3.php.net/manual/en/function.spl-autoload-register.php 
-for further details.
-
-== Plugin Filenames ==
-Smarty 3 optionally supports the PHP spl_autoloader. The autoloader requires filenames 
-to be lower case. Because of this, Smarty plugin file names must also be lowercase. 
-In Smarty 2, mixed case file names did work.
-
-== Scope of Special Smarty Variables ==
-In Smarty 2 the special Smarty variables $smarty.section... and $smarty.foreach... 
-had global scope. If you had loops with the same name in subtemplates you could accidentally 
-overwrite values of parent template.
-
-In Smarty 3 these special Smarty variable have only local scope in the template which 
-is defining the loop. If you need their value in a subtemplate you have to pass them 
-as parameter.
-<source lang="smarty">
-{include file='path/foo.tpl' index=$smarty.section.foo.index}
-</source>
-
-== SMARTY_RESOURCE_CHAR_SET ==
-Smarty 3 sets the constant SMARTY_RESOURCE_CHAR_SET to utf-8 as default template charset. 
-This is now used also on modifiers like escape as default charset. If your templates use 
-other charsets make sure that you define the constant accordingly. Otherwise you may not 
-get any output.
-
-== newline at {if} tags ==
-A \n was added to the compiled code of the {if},{else},{elseif},{/if} tags to get output of newlines as expected by the template source. 
-If one of the {if} tags is at the line end you will now get a newline in the HTML output.
-
-== trigger_error() ==
-The API function trigger_error() has been removed because it did just map to PHP trigger_error.
-However it's still included in the Smarty2 API wrapper.
-
-== Smarty constants ==
-The constants 
-SMARTY_PHP_PASSTHRU
-SMARTY_PHP_QUOTE
-SMARTY_PHP_REMOVE
-SMARTY_PHP_ALLOW
-have been replaced with class constants
-Smarty::PHP_PASSTHRU
-Smarty::PHP_QUOTE
-Smarty::PHP_REMOVE
-Smarty::PHP_ALLOW
-
diff --git a/library/Smarty/SMARTY_3.0_BC_NOTES.txt b/library/Smarty/SMARTY_3.0_BC_NOTES.txt
deleted file mode 100644
index fd8b540c2..000000000
--- a/library/Smarty/SMARTY_3.0_BC_NOTES.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-== Smarty2 backward compatibility ==
-All Smarty2 specific API functions and deprecated functionallity has been moved
-to the SmartyBC class.
-
-== {php} Tag ==
-The {php} tag is no longer available in the standard Smarty calls. 
-The use of {php} tags is deprecated and only available in the SmartyBC class. 
-
-== {include_php} Tag ==
-The {include_php} tag is no longer available in the standard Smarty calls. 
-The use of {include_php} tags is deprecated and only available in the SmartyBC class. 
-
-== php template resource ==
-The support of the php template resource is removed.
-
-== $cache_dir, $compile_dir, $config_dir, $template_dir access ==
-The mentioned properties can't be accessed directly any longer. You must use
-corresponding getter/setters like addConfigDir(), setConfigDir(), getConfigDir()
-
-== obsolete Smarty class properties ==
-The following no longer used properties are removed:
-$allow_php_tag
-$allow_php_template
-$deprecation_notices
\ No newline at end of file
diff --git a/library/Smarty/SMARTY_3.1_NOTES.txt b/library/Smarty/SMARTY_3.1_NOTES.txt
deleted file mode 100644
index 57709f0d7..000000000
--- a/library/Smarty/SMARTY_3.1_NOTES.txt
+++ /dev/null
@@ -1,306 +0,0 @@
-Smarty 3.1 Notes
-================
-
-Smarty 3.1 is a departure from 2.0 compatibility. Most notably, all
-backward compatibility has been moved to a separate class file named
-SmartyBC.class.php. If you require compatibility with 2.0, you will
-need to use this class.
-
-Some differences from 3.0 are also present. 3.1 begins the journey of
-requiring setters/getters for property access. So far this is only
-implemented on the five directory properties: template_dir,
-plugins_dir, configs_dir, compile_dir and cache_dir. These properties
-are now protected, it is required to use the setters/getters instead.
-That said, direct property access will still work, however slightly
-slower since they will now fall through __set() and __get() and in
-turn passed through the setter/getter methods. 3.2 will exhibit a full
-list of setter/getter methods for all (currently) public properties,
-so code-completion in your IDE will work as expected.
-
-There is absolutely no PHP allowed in templates any more. All
-deprecated features of Smarty 2.0 are gone. Again, use the SmartyBC
-class if you need any backward compatibility.
-
-Internal Changes
-
-  Full UTF-8 Compatibility
-
-The plugins shipped with Smarty 3.1 have been rewritten to fully
-support UTF-8 strings if Multibyte String is available. Without
-MBString UTF-8 cannot be handled properly. For those rare cases where
-templates themselves have to juggle encodings, the new modifiers
-to_charset and from_charset may come in handy.
-
-  Plugin API and Performance
-
-All Plugins (modifiers, functions, blocks, resources,
-default_template_handlers, etc) are now receiving the
-Smarty_Internal_Template instance, where they were supplied with the
-Smarty instance in Smarty 3.0. *. As The Smarty_Internal_Template
-mimics the behavior of Smarty, this API simplification should not
-require any changes to custom plugins.
-
-The plugins shipped with Smarty 3.1 have been rewritten for better
-performance. Most notably {html_select_date} and {html_select_time}
-have been improved vastly. Performance aside, plugins have also been
-reviewed and generalized in their API. {html_select_date} and
-{html_select_time} now share almost all available options.
-
-The escape modifier now knows the $double_encode option, which will
-prevent entities from being encoded again.
-
-The capitalize modifier now know the $lc_rest option, which makes sure
-all letters following a captial letter are lower-cased.
-
-The count_sentences modifier now accepts (.?!) as
-legitimate endings of a sentence - previously only (.) was
-accepted
-
-The new unescape modifier is there to reverse the effects of the
-escape modifier. This applies to the escape formats html, htmlall and
-entity.
-
-  default_template_handler_func
-
-The invocation of $smarty->$default_template_handler_func had to be 
-altered. Instead of a Smarty_Internal_Template, the fifth argument is
-now provided with the Smarty instance. New footprint:
-
-
-/**
- * Default Template Handler
- *
- * called when Smarty's file: resource is unable to load a requested file
- * 
- * @param string   $type     resource type (e.g. "file", "string", "eval", "resource")
- * @param string   $name     resource name (e.g. "foo/bar.tpl")
- * @param string  &$content  template's content
- * @param integer &$modified template's modification time
- * @param Smarty   $smarty   Smarty instance
- * @return string|boolean   path to file or boolean true if $content and $modified 
- *                          have been filled, boolean false if no default template 
- *                          could be loaded
- */
-function default_template_handler_func($type, $name, &$content, &$modified, Smarty $smarty) {
-    if (false) {
-        // return corrected filepath
-        return "/tmp/some/foobar.tpl";
-    } elseif (false) {
-        // return a template directly
-        $content = "the template source";
-        $modified = time();
-        return true;
-    } else {
-        // tell smarty that we failed
-        return false;
-    }
-}
-
-  Stuff done to the compiler
-
-Many performance improvements have happened internally. One notable
-improvement is that all compiled templates are now handled as PHP
-functions. This speeds up repeated templates tremendously, as each one
-calls an (in-memory) PHP function instead of performing another file
-include/scan.
-
-New Features
-
-  Template syntax
-
- {block}..{/block}
-
-The {block} tag has a new hide option flag. It does suppress the block
-content if no corresponding child block exists.
-EXAMPLE:
-parent.tpl
-{block name=body hide} child content "{$smarty.block.child}" was
-inserted {block}
-In the above example the whole block will be suppressed if no child
-block "body" is existing.
-
- {setfilter}..{/setfilter}
-
-The new {setfilter} block tag allows the definition of filters which
-run on variable output.
-SYNTAX:
-{setfilter filter1|filter2|filter3....}
-Smarty3 will lookup up matching filters in the following search order:
-1. varibale filter plugin in plugins_dir.
-2. a valid modifier. A modifier specification will also accept
-additional parameter like filter2:'foo'
-3. a PHP function
-{/setfilter} will turn previous filter setting off again.
-{setfilter} tags can be nested.
-EXAMPLE:
-{setfilter filter1}
-  {$foo}
-  {setfilter filter2}
-    {$bar}
-  {/setfilter}
-  {$buh}
-{/setfilter}
-{$blar}
-In the above example filter1 will run on the output of $foo, filter2
-on $bar, filter1 again on $buh and no filter on $blar.
-NOTES:
-- {$foo nofilter} will suppress the filters
-- These filters will run in addition to filters defined by
-registerFilter('variable',...), autoLoadFilter('variable',...) and
-defined default modifier.
-- {setfilter} will effect only the current template, not included
-subtemplates.
-
-  Resource API
-
-Smarty 3.1 features a new approach to resource management. The
-Smarty_Resource API allows simple, yet powerful integration of custom
-resources for templates and configuration files. It offers simple
-functions for loading data from a custom resource (e.g. database) as
-well as define new template types adhering to the special
-non-compiling (e,g, plain php) and non-compile-caching (e.g. eval:
-resource type) resources.
-
-See demo/plugins/resource.mysql.php for an example custom database
-resource.
-
-Note that old-fashioned registration of callbacks for resource
-management has been deprecated but is still possible with SmartyBC.
-
-  CacheResource API
-
-In line with the Resource API, the CacheResource API offers a more
-comfortable handling of output-cache data. With the
-Smarty_CacheResource_Custom accessing databases is made simple. With
-the introduction of Smarty_CacheResource_KeyValueStore the
-implementation of resources like memcache or APC became a no-brainer;
-simple hash-based storage systems are now supporting hierarchical
-output-caches.
-
-See demo/plugins/cacheresource.mysql.php for an example custom
-database CacheResource.
-See demo/plugins/cacheresource.memcache.php for an example custom
-memcache CacheResource using the KeyValueStore helper.
-
-Note that old-fashioned registration of $cache_handler is not possible
-anymore. As the functionality had not been ported to Smarty 3.0.x
-properly, it has been dropped from 3.1 completely.
-
-Locking facilities have been implemented to avoid concurrent cache 
-generation. Enable cache locking by setting 
-$smarty->cache_locking = true;
-
-  Relative Paths in Templates (File-Resource)
-
-As of Smarty 3.1 {include file="../foo.tpl"} and {include
-file="./foo.tpl"} will resolve relative to the template they're in.
-Relative paths are available with {include file="..."} and
-{extends file="..."}. As $smarty->fetch('../foo.tpl') and
-$smarty->fetch('./foo.tpl') cannot be relative to a template, an
-exception is thrown.
-
-  Addressing a specific $template_dir
-
-Smarty 3.1 introduces the $template_dir index notation.
-$smarty->fetch('[foo]bar.tpl') and {include file="[foo]bar.tpl"}
-require the template bar.tpl to be loaded from $template_dir['foo'];
-Smarty::setTemplateDir() and Smarty::addTemplateDir() offer ways to
-define indexes along with the actual directories.
-
-  Mixing Resources in extends-Resource
-
-Taking the php extends: template resource one step further, it is now
-possible to mix resources within an extends: call like
-$smarty->fetch("extends:file:foo.tpl|db:bar.tpl");
-
-To make eval: and string: resources available to the inheritance
-chain, eval:base64:TPL_STRING and eval:urlencode:TPL_STRING have been
-introduced. Supplying the base64 or urlencode flags will trigger
-decoding the TPL_STRING in with either base64_decode() or urldecode().
-
-  extends-Resource in template inheritance
-
-Template based inheritance may now inherit from php's extends:
-resource like {extends file="extends:foo.tpl|db:bar.tpl"}.
-
-  New Smarty property escape_html
-
-$smarty->escape_html = true will autoescape all template variable
-output by calling htmlspecialchars({$output}, ENT_QUOTES,
-SMARTY_RESOURCE_CHAR_SET).
-NOTE:
-This is a compile time option. If you change the setting you must make
-sure that the templates get recompiled.
-
-  New option at Smarty property compile_check
-
-The automatic recompilation of modified templates can now be
-controlled by the following settings:
-$smarty->compile_check = COMPILECHECK_OFF (false) - template files
-will not be checked
-$smarty->compile_check = COMPILECHECK_ON (true) - template files will
-always be checked
-$smarty->compile_check = COMPILECHECK_CACHEMISS - template files will
-be checked if caching is enabled and there is no existing cache file
-or it has expired
-
-  Automatic recompilation on Smarty version change
-
-Templates will now be automatically recompiled on Smarty version
-changes to avoide incompatibillities in the compiled code. Compiled
-template checked against the current setting of the SMARTY_VERSION
-constant.
-
-  default_config_handler_func()
-
-Analogous to the default_template_handler_func()
-default_config_handler_func() has been introduced.
-
-  default_plugin_handler_func()
-
-An optional default_plugin_handler_func() can be defined which gets called 
-by the compiler on tags which can't be resolved internally or by plugins.
-The default_plugin_handler() can map tags to plugins on the fly.
-
-New getters/setters
-
-The following setters/getters will be part of the official
-documentation, and will be strongly recommended. Direct property
-access will still work for the foreseeable future... it will be
-transparently routed through the setters/getters, and consequently a
-bit slower.
-
-array|string getTemplateDir( [string $index] )
-replaces $smarty->template_dir; and $smarty->template_dir[$index];
-Smarty setTemplateDir( array|string $path )
-replaces $smarty->template_dir = "foo"; and $smarty->template_dir =
-array("foo", "bar");
-Smarty addTemplateDir( array|string $path, [string $index])
-replaces $smarty->template_dir[] = "bar"; and
-$smarty->template_dir[$index] = "bar";
-
-array|string getConfigDir( [string $index] )
-replaces $smarty->config_dir; and $smarty->config_dir[$index];
-Smarty setConfigDir( array|string $path )
-replaces $smarty->config_dir = "foo"; and $smarty->config_dir =
-array("foo", "bar");
-Smarty addConfigDir( array|string $path, [string $index])
-replaces $smarty->config_dir[] = "bar"; and
-$smarty->config_dir[$index] = "bar";
-
-array getPluginsDir()
-replaces $smarty->plugins_dir;
-Smarty setPluginsDir( array|string $path )
-replaces $smarty->plugins_dir = "foo";
-Smarty addPluginsDir( array|string $path )
-replaces $smarty->plugins_dir[] = "bar";
-
-string getCompileDir()
-replaces $smarty->compile_dir;
-Smarty setCompileDir( string $path )
-replaces $smarty->compile_dir = "foo";
-
-string getCacheDir()
-replaces $smarty->cache_dir;
-Smarty setCacheDir( string $path )
-replaces $smarty->cache_dir;
diff --git a/library/Smarty/change_log.txt b/library/Smarty/change_log.txt
index a0161659d..cecda63d1 100644
--- a/library/Smarty/change_log.txt
+++ b/library/Smarty/change_log.txt
@@ -1,8 +1,421 @@
- ===== 3.1.22-dev ===== (xx.xx.2014)
+ ===== 3.1.28 ===== (13.12.2015)
+ 13.12.2015
+  - bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819)
+  - bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811)
+  - bugfix Debug Console could display incorrect data when using subtemplates
+  
+ 09.12.2015
+  - bugix Smarty did fail under PHP 7.0.0 with use_include_path = true;
+  
+ 09.12.2015
+  -bugfix {strip} should exclude some html tags from stripping, related to fix for https://github.com/smarty-php/smarty/issues/111
+ 
+ 08.12.2015
+  - bugfix internal template function data got stored in wrong compiled file https://github.com/smarty-php/smarty/issues/114
+  
+ 05.12.2015
+  -bugfix {strip} should insert a single space https://github.com/smarty-php/smarty/issues/111
+  
+ 25.11.2015
+  -bugfix a left delimter like '[%' did fail on [%$var_[%$variable%]%] (forum topic 25798)
+
+ 02.11.2015
+  - bugfix {include} with variable file name like {include file="foo_`$bar`.tpl"} did fail in 3.1.28-dev https://github.com/smarty-php/smarty/issues/102
+
+ 01.11.2015
+  - update config file processing
+  
+ 31.10.2015
+  - bugfix add missing $trusted_dir property to SmartyBC class (forum topic 25751)
+
+ 29.10.2015
+  - improve template scope handling
+
+ 24.10.2015
+  - more optimizations of template processing
+  - bugfix Error when using {include} within {capture} https://github.com/smarty-php/smarty/issues/100
+
+ 21.10.2015
+  - move some code into runtime extensions
+
+ 18.10.2015
+  - optimize filepath normalization
+  - rework of template inheritance
+  - speed and size optimizations
+  - bugfix under HHVM temporary cache file must only be created when caches template was updated
+  - fix compiled code for new {block} assign attribute
+  - update code generated by template function call handler
+
+ 18.09.2015
+  - bugfix {if $foo instanceof $bar} failed to compile if 2nd value is a variable https://github.com/smarty-php/smarty/issues/92
+  
+ 17.09.2015
+  - bugfix {foreach} first attribute was not correctly reset since commit 05a8fa2 of 02.08.2015 https://github.com/smarty-php/smarty/issues/90
+
+ 16.09.2015
+  - update compiler by moving no longer needed properties, code optimizations and other
+
+ 14.09.2015
+  - optimize autoloader
+  - optimize subtemplate handling
+  - update template inheritance processing
+  - move code of {call} processing back into Smarty_Internal_Template class
+  - improvement invalidate OPCACHE for cleared compiled and cached template files (forum topic 25557)
+  - bugfix unintended multiple debug windows (forum topic 25699)
+  
+ 30.08.2015
+  - size optimization move some runtime functions into extension
+  - optimize inline template processing
+  - optimization merge inheritance child and parent templates into one compiled template file
+
+ 29.08.2015
+  - improvement convert template inheritance into runtime processing
+  - bugfix {$smarty.block.parent} did always reference the root parent block https://github.com/smarty-php/smarty/issues/68
+
+ 23.08.2015
+  - introduce Smarty::$resource_cache_mode and cache template object of {include} inside loop
+  - load seldom used Smarty API methods dynamically to reduce memory footprint
+  - cache template object of {include} if same template is included several times
+  - convert debug console processing to object
+  - use output buffers for better performance and less memory usage
+  - optimize nocache hash processing
+  - remove not really needed properties
+  - optimize rendering
+  - move caching to Smarty::_cache
+  - remove properties with redundant content
+  - optimize Smarty::templateExists()
+  - optimize use_include_path processing
+  - relocate properties for size optimization
+  - remove redundant code
+  - bugfix compiling super globals like {$smarty.get.foo} did fail in the master branch https://github.com/smarty-php/smarty/issues/77
+
+ 06.08.2015
+  - avoid possible circular object references caused by parser/lexer objects
+  - rewrite compileAll... utility methods
+  - commit several  internal improvements
+  - bugfix Smarty failed when compile_id did contain "|"
+
+ 03.08.2015
+  - rework clear cache methods
+  - bugfix compileAllConfig() was broken since 3.1.22 because of the changes in config file processing
+  - improve getIncludePath() to return directory if no file was given
+
+ 02.08.2015
+  - optimization and code cleanup of {foreach} and {section} compiler
+  - rework {capture} compiler
+
+ 01.08.2015
+  - update DateTime object can be instance of DateTimeImmutable since PHP5.5 https://github.com/smarty-php/smarty/pull/75
+  - improvement show resource type and start of template source instead of uid on eval: and string: resource (forum topic 25630)
+
+ 31.07.2015
+  - optimize {foreach} and {section} compiler
+
+ 29.07.2015
+  - optimize {section} compiler for speed and size of compiled code
+
+ 28.07.2015
+  - update for PHP 7 compatibility
+
+ 26.07.2015
+  - improvement impement workaround for HHVM PHP incompatibillity https://github.com/facebook/hhvm/issues/4797
+
+ 25.07.2015
+  - bugfix parser did hang on text starting <?something https://github.com/smarty-php/smarty/issues/74
+
+ 20.07.2015
+  - bugfix config files got recompiled on each request
+  - improvement invalidate PHP 5.5 opcache for recompiled and cached templates  https://github.com/smarty-php/smarty/issues/72
+
+ 12.07.2015
+  - optimize {extends} compilation
+
+ 10.07.2015
+  - bugfix force file: resource in demo resource.extendsall.php
+
+ 08.07.2015
+  - bugfix convert each word of class names to ucfirst in in compiler. (forum topic 25588)
+
+ 07.07.2015
+  - improvement allow fetch() or display() called on a template object to get output from other template
+     like $template->fetch('foo.tpl') https://github.com/smarty-php/smarty/issues/70
+  - improvement Added $limit parameter to regex_replace modifier #71
+  - new feature multiple indices on file: resource
+
+ 06.07.2015
+  - optimize {block} compilation
+  - optimization get rid of __get and __set in source object
+
+ 01.07.2015
+  - optimize compile check handling
+  - update {foreach} compiler
+  - bugfix debugging console did not display string values containing \n, \r or \t correctly https://github.com/smarty-php/smarty/issues/66
+  - optimize source resources
+
+ 28.06.2015
+  - move $smarty->enableSecurity() into Smarty_Security class
+  - optimize security isTrustedResourceDir()
+  - move auto load filter methods into extension
+  - move $smarty->getTemplateVars() into extension
+  - move getStreamVariable() into extension
+  - move $smarty->append() and $smarty->appendByRef() into extension
+  - optimize autoloader
+  - optimize file path normalization
+  - bugfix PATH_SEPARATOR was replaced by mistake in autoloader
+  - remove redundant code
+
+ 27.06.2015
+  - bugfix resolve naming conflict between custom Smarty delimiter '<%' and PHP ASP tags https://github.com/smarty-php/smarty/issues/64
+  - update $smarty->_realpath for relative path not starting with './'
+  - update Smarty security with new realpath handling
+  - update {include_php} with new realpath handling
+  - move $smarty->loadPlugin() into extension
+  - minor compiler optimizations
+  - bugfix allow function plugins with name ending with 'close' https://github.com/smarty-php/smarty/issues/52
+  - rework of $smarty->clearCompiledTemplate() and move it to its own extension
+
+ 19.06.2015
+  - improvement allow closures as callback at $smarty->registerFilter() https://github.com/smarty-php/smarty/issues/59
+
+ ===== 3.1.27===== (18.06.2015)
+ 18.06.2015
+  - bugfix another update on file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56
+
+ ===== 3.1.26===== (18.06.2015)
+ 18.06.2015
+  - bugfix file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56
+
+ 17.06.2015
+  - bugfix calling a plugin with nocache option but no other attributes like {foo nocache} caused call to undefined function https://github.com/smarty-php/smarty/issues/55
+
+ ===== 3.1.25===== (15.06.2015)
+ 15.06.2015
+  - optimization of smarty_cachereource_keyvaluestore.php code
+
+ 14.06.2015
+  - bugfix a relative sub template path could fail if template_dir path did contain /../ https://github.com/smarty-php/smarty/issues/50
+  - optimization rework of path normalization
+  - bugfix an output tag with variable, modifier followed by an operator like {$foo|modifier+1} did fail https://github.com/smarty-php/smarty/issues/53
+
+ 13.06.2015
+  - bugfix a custom cache resource using smarty_cachereource_keyvaluestore.php did fail if php.ini mbstring.func_overload = 2 (forum topic 25568)
+
+ 11.06.2015
+  - bugfix the lexer could hang on very large quoted strings (forum topic 25570)
+
+ 08.06.2015
+  - bugfix using {$foo} as array index like $bar.{$foo} or in double quoted string like "some {$foo} thing" failed https://github.com/smarty-php/smarty/issues/49
+
+ 04.06.2015
+  - bugfix possible error message on unset() while compiling {block} tags https://github.com/smarty-php/smarty/issues/46
+
+ 01.06.2015
+  - bugfix <?xml ... ?> including template variables broken  since 3.1.22 https://github.com/smarty-php/smarty/issues/47
+  
+ 27.05.2015
+  - bugfix {include} with variable file name must not create by default individual cache file (since 3.1.22) https://github.com/smarty-php/smarty/issues/43
+  
+ 24.05.2015
+  - bugfix if condition string 'neq' broken due to a typo https://github.com/smarty-php/smarty/issues/42
+
+ ===== 3.1.24===== (23.05.2015)
+ 23.05.2015
+  - improvement on php_handling to allow very large PHP sections, better error handling
+  - improvement allow extreme large comment sections (forum 25538)
+  
+ 21.05.2015
+  - bugfix broken PHP 5.2 compatibility when compiling <?php tags https://github.com/smarty-php/smarty/issues/40
+  - bugfix named {foreach} comparison like $smarty.foreach.foobar.index > 1 did compile into wrong code https://github.com/smarty-php/smarty/issues/41
+  
+ 19.05.2015
+  - bugfix compiler did overwrite existing variable value when setting the nocache attribute https://github.com/smarty-php/smarty/issues/39
+  - bugfix output filter trimwhitespace could run into the pcre.backtrack_limit on large output (code.google issue 220)
+  - bugfix compiler could run into the pcre.backtrack_limit on larger comment or {php} tag sections (forum 25538)
+
+ 18.05.2015
+  - improvement introduce shortcuts in lexer/parser rules for most frequent terms for higher
+    compilation speed 
+
+ 16.05.2015
+  - bugfix {php}{/php} did work just for single lines https://github.com/smarty-php/smarty/issues/33
+  - improvement remove not needed ?><?php transitions from compiled code
+  - improvement reduce number of lexer tokens on operators and if conditions
+  - improvement higher compilation speed by modified lexer/parser generator at "smarty/smarty-lexer"
+ 
+ 13.05.2015
+  - improvement remove not needed ?><?php transitions from compiled code
+  - improvement of debugging:
+      - use fresh Smarty object to display the debug console because of possible problems when the Smarty
+        was extended or Smarty properties had been modified in the class source
+      - display Smarty version number
+      - Truncate lenght of Origin display and extend strin value display to 80 character
+  - bugfix in Smarty_Security  'nl2br' should be a trusted modifier, not PHP function (code.google issue 223)
+  
+ 12.05.2015
+  - bugfix {$smarty.constant.TEST} did fail  on undefined constant https://github.com/smarty-php/smarty/issues/28
+  - bugfix access to undefined config variable like {#undef#} did fail https://github.com/smarty-php/smarty/issues/29
+  - bugfix in nested {foreach} saved item attributes got overwritten https://github.com/smarty-php/smarty/issues/33
+
+ ===== 3.1.23 ===== (12.05.2015)
+ 12.05.2015
+  - bugfix of smaller performance issue introduce in 3.1.22 when caching is enabled
+  - bugfix missig entry for smarty-temmplate-config in autoloader
+   
+ ===== 3.1.22 ===== tag was deleted because 3.1.22 did fail caused by the missing entry for smarty-temmplate-config in autoloader
+ 10.05.2015
+  - bugfix custom cache resource did not observe compile_id and cache_id when $cache_locking == true
+  - bugfix cache lock was not handled correctly after timeout when $cache_locking == true
+  - improvement added constants for $debugging
+
+ 07.05.2015
+  - improvement of the debugging console. Read NEW_FEATURES.txt
+  - optimization of resource class loading
+
+ 06.05.2015
+  - bugfix in 3.1.22-dev cache resource must not be loaded for subtemplates
+  - bugfix/improvement in 3.1.22-dev cache locking did not work as expected
+  
+ 05.05.2015
+  - optimization on cache update when main template is modified
+  - optimization move <?php ?> handling from parser to new compiler module
+
+ 05.05.2015
+  - bugfix code could be messed up when {tags} are used in multiple attributes https://github.com/smarty-php/smarty/issues/23
+ 
+ 04.05.2015
+  - bugfix Smarty_Resource::parseResourceName incompatible with Google AppEngine (https://github.com/smarty-php/smarty/issues/22)
+  - improvement use is_file() checks to avoid errors suppressed by @ which could still cause problems (https://github.com/smarty-php/smarty/issues/24)
+
+ 28.04.2015
+  - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508) 2nd fix
+
+ 28.04.2015
+  - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508)
+ 
+ 23.04.2015 
+  - bugfix a nocache template variable used as parameter at {insert} was by mistake cached
+  
+ 20.04.2015
+  - bugfix at a template function containing nocache code a parmeter could overwrite a template variable of same name
+  
+ 27.03.2015
+  - bugfix Smarty_Security->allow_constants=false; did also disable true, false and null (change of 16.03.2015)
+  - improvement added a whitelist for trusted constants to security Smarty_Security::$trusted_constants (forum topic 25471)
+
+ 20.03.2015
+  - bugfix make sure that function properties get saved only in compiled files containing the fuction definition {forum topic 25452}
+  - bugfix correct update of global variable values on exit of template functions. (reported under Smarty Developers)
+  
+ 16.03.2015
+ - bugfix  problems with {function}{/function} and {call} tags in different subtemplate cache files {forum topic 25452}
+ - bugfix  Smarty_Security->allow_constants=false; did not disallow direct usage of defined constants like {SMARTY_DIR} {forum topic 25457}
+ - bugfix  {block}{/block} tags did not work inside double quoted strings https://github.com/smarty-php/smarty/issues/18
+ 
+ 
+ 15.03.2015
+ - bugfix  $smarty->compile_check must be restored before rendering of a just updated cache file {forum 25452}
+ 
+ 14.03.2015
+ - bugfix  {nocache}  {/nocache} tags corrupted code when used within a nocache section caused by a nocache template variable.
+ 
+ - bugfix  template functions defined with {function} in an included subtemplate could not be called in nocache
+           mode with {call... nocache} if the subtemplate had it's own cache file {forum 25452}
+ 
+ 10.03.2015
+ - bugfix {include ... nocache} whith variable file or compile_id attribute was not executed in nocache mode.
+ 
+ 12.02.2015
+ - bugfix multiple Smarty::fetch() of same template when $smarty->merge_compiled_includes = true; could cause function already defined error
+ 
+ 11.02.2015
+ - bugfix recursive {includes} did create E_NOTICE message when $smarty->merge_compiled_includes = true; (github issue #16)
+ 
+ 22.01.2015
+ - new feature security can now control access to static methods and properties
+                see also NEW_FEATURES.txt
+
+ 21.01.2015
+ - bugfix clearCompiledTemplates(), clearAll() and clear() could try to delete whole drive at wrong path permissions because realpath() fail (forum 25397)
+ - bugfix 'self::' and 'parent::' was interpreted in template syntax as static class 
+ 
+ 04.01.2015
+ - push last weeks changes to github
+
+ - different optimizations
+ - improvement automatically create different versions of compiled templates and config files depending
+   on property settings.
+ - optimization restructure template processing by moving code into classes it better belongs to
+ - optimization restructure config file processing
+
+ 31.12.2014
+ - bugfix use function_exists('mb_get_info') for setting Smarty::$_MBSTRING. 
+   Function mb_split could be overloaded depending on php.ini mbstring.func_overload
+   
+   
+ 29.12.2014
+ - new feature security can now limit the template nesting level by property $max_template_nesting
+                see also NEW_FEATURES.txt (forum 25370)
+
+ 29.12.2014
+ - new feature security can now disable special $smarty variables listed in property $disabled_special_smarty_vars
+                see also NEW_FEATURES.txt (forum 25370)
+
+ 27.12.2014
+  - bugfix clear internal _is_file_cache when plugins_dir was modified
+
+ 13.12.2014
+  - improvement optimization of lexer and parser resulting in a up to 30% higher compiling speed
+ 
+ 11.12.2014
+  - bugfix resolve parser ambiguity between constant print tag {CONST} and other smarty tags after change of 09.12.2014
+  
+ 09.12.2014
+  - bugfix variables $null, $true and $false did not work after the change of 12.11.2014 (forum 25342)
+  - bugfix call of template function by a variable name did not work after latest changes (forum 25342)
+  
+ 23.11.2014
+  - bugfix a plugin with attached modifier could fail if the tag was immediately followed by another Smarty tag (since 3.1.21) (forum 25326)
+
+ 13.11.2014
+  - improvement move autoload code into Autoloader.php. Use Composer autoloader when possible
+
+ 12.11.2014
+ - new feature added support of namespaces to template code
+
+ 08.11.2014 - 10.11.2014
+ - bugfix subtemplate called in nocache mode could be called with wrong compile_id when it did change on one of the calling templates
+ - improvement add code of template functions called in nocache mode dynamically to cache file (related to bugfix of 01.11.2014)
+ - bugfix Debug Console did not include all data from merged compiled subtemplates
+
+ 04.11.2014
+ - new feature $smarty->debugging = true; => overwrite existing Debug Console window (old behaviour)
+               $smarty->debugging = 2; => individual Debug Console window by template name
+ 
+ 03.11.2014
+ - bugfix Debug Console did not show included subtemplates since 3.1.17 (forum 25301)
+ - bugfix Modifier debug_print_var did not limit recursion or prevent recursive object display at Debug Console
+    (ATTENTION: parameter order has changed to be able to specify maximum recursion)
+ - bugfix Debug consol did not include subtemplate information with $smarty->merge_compiled_includes = true 
+ - improvement The template variables are no longer displayed as objects on the Debug Console
+ - improvement $smarty->createData($parent = null, $name = null) new optional name parameter for display at Debug Console
+ - addition of some hooks for future extension of Debug Console
+
+ 01.11.2014
+ - bugfix and enhancement on subtemplate {include} and template {function} tags.
+   * Calling a template which has a nocache section could fail if it was called from a cached and a not cached subtemplate.
+   * Calling the same subtemplate cached and not cached with the $smarty->merge_compiled_includes enabled could cause problems
+   * Many smaller related changes
+
+ 30.10.2014
+ - bugfix access to class constant by object like {$object::CONST} or variable class name {$class::CONST} did not work (forum 25301)
+
+ 26.10.2014
+ - bugfix E_NOTICE message was created during compilation when ASP tags '<%' or '%>' are in template source text
+ - bugfix merge_compiled_includes option failed when caching  enables and same subtemplate was included cached and not cached
+ 
  ===== 3.1.21 ===== (18.10.2014)
  18.10.2014
- - composer moved to github
- - add COMPOSER_RELEASE_NOTES
+  - composer moved to github
 
  17.10.2014
  - bugfix on $php_handling security and optimization of smarty_internal_parsetree (Thue Kristensen)
@@ -43,7 +456,7 @@
  04.07.2014
  - bugfix the bufix of 02.06.2014 broke correct handling of child templates with same name but different template folders in extends resource (issue 194 and topic 25099)
  
- ===== 3.1.19 ===== (06.30.2014)
+ ===== 3.1.19 ===== (30.06.2014)
  20.06.2014
  - bugfix template variables could not be passed as parameter in {include} when the include was in a {nocache} section (topic 25131)
  
@@ -732,7 +1145,7 @@
 
 15/07/2011
 - bugfix individual cache_lifetime of {include} did not work correctly inside {block} tags
-- added caches for Smarty_Template_Source and Smarty_Template_Compiled to reduce I/O for multiple cache_id rendering
+- added caches for Smarty_Internal_TemplateSource and Smarty_Internal_TemplateCompiled to reduce I/O for multiple cache_id rendering
 
 14/07/2011
 - made Smarty::loadPlugin() respect the include_path if required
diff --git a/library/Smarty/demo/configs/test.conf b/library/Smarty/demo/configs/test.conf
deleted file mode 100644
index 5eac748ec..000000000
--- a/library/Smarty/demo/configs/test.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-title = Welcome to Smarty!
-cutoff_size = 40
-
-[setup]
-bold = true
diff --git a/library/Smarty/demo/index.php b/library/Smarty/demo/index.php
deleted file mode 100644
index 33f3035c5..000000000
--- a/library/Smarty/demo/index.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Example Application
- *
- * @package Example-application
- */
-
-require '../libs/Smarty.class.php';
-
-$smarty = new Smarty;
-
-//$smarty->force_compile = true;
-$smarty->debugging = true;
-$smarty->caching = true;
-$smarty->cache_lifetime = 120;
-
-$smarty->assign("Name", "Fred Irving Johnathan Bradley Peppergill", true);
-$smarty->assign("FirstName", array("John", "Mary", "James", "Henry"));
-$smarty->assign("LastName", array("Doe", "Smith", "Johnson", "Case"));
-$smarty->assign("Class", array(array("A", "B", "C", "D"), array("E", "F", "G", "H"),
-                               array("I", "J", "K", "L"), array("M", "N", "O", "P")));
-
-$smarty->assign("contacts", array(array("phone" => "1", "fax" => "2", "cell" => "3"),
-                                  array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")));
-
-$smarty->assign("option_values", array("NY", "NE", "KS", "IA", "OK", "TX"));
-$smarty->assign("option_output", array("New York", "Nebraska", "Kansas", "Iowa", "Oklahoma", "Texas"));
-$smarty->assign("option_selected", "NE");
-
-$smarty->display('index.tpl');
diff --git a/library/Smarty/demo/plugins/cacheresource.apc.php b/library/Smarty/demo/plugins/cacheresource.apc.php
deleted file mode 100644
index d7336f2bf..000000000
--- a/library/Smarty/demo/plugins/cacheresource.apc.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * APC CacheResource
- * CacheResource Implementation based on the KeyValueStore API to use
- * memcache as the storage resource for Smarty's output caching.
- * *
- *
- * @package CacheResource-examples
- * @author  Uwe Tews
- */
-class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
-{
-    public function __construct()
-    {
-        // test if APC is present
-        if (!function_exists('apc_cache_info')) {
-            throw new Exception('APC Template Caching Error: APC is not installed');
-        }
-    }
-
-    /**
-     * Read values for a set of keys from cache
-     *
-     * @param  array $keys list of keys to fetch
-     *
-     * @return array   list of values with the given keys used as indexes
-     * @return boolean true on success, false on failure
-     */
-    protected function read(array $keys)
-    {
-        $_res = array();
-        $res = apc_fetch($keys);
-        foreach ($res as $k => $v) {
-            $_res[$k] = $v;
-        }
-
-        return $_res;
-    }
-
-    /**
-     * Save values for a set of keys to cache
-     *
-     * @param  array $keys   list of values to save
-     * @param  int   $expire expiration time
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function write(array $keys, $expire = null)
-    {
-        foreach ($keys as $k => $v) {
-            apc_store($k, $v, $expire);
-        }
-
-        return true;
-    }
-
-    /**
-     * Remove values from cache
-     *
-     * @param  array $keys list of keys to delete
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function delete(array $keys)
-    {
-        foreach ($keys as $k) {
-            apc_delete($k);
-        }
-
-        return true;
-    }
-
-    /**
-     * Remove *all* values from cache
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function purge()
-    {
-        return apc_clear_cache('user');
-    }
-}
diff --git a/library/Smarty/demo/plugins/cacheresource.memcache.php b/library/Smarty/demo/plugins/cacheresource.memcache.php
deleted file mode 100644
index e265365fb..000000000
--- a/library/Smarty/demo/plugins/cacheresource.memcache.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * Memcache CacheResource
- * CacheResource Implementation based on the KeyValueStore API to use
- * memcache as the storage resource for Smarty's output caching.
- * Note that memcache has a limitation of 256 characters per cache-key.
- * To avoid complications all cache-keys are translated to a sha1 hash.
- *
- * @package CacheResource-examples
- * @author  Rodney Rehm
- */
-class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
-{
-    /**
-     * memcache instance
-     *
-     * @var Memcache
-     */
-    protected $memcache = null;
-
-    public function __construct()
-    {
-        $this->memcache = new Memcache();
-        $this->memcache->addServer('127.0.0.1', 11211);
-    }
-
-    /**
-     * Read values for a set of keys from cache
-     *
-     * @param  array $keys list of keys to fetch
-     *
-     * @return array   list of values with the given keys used as indexes
-     * @return boolean true on success, false on failure
-     */
-    protected function read(array $keys)
-    {
-        $_keys = $lookup = array();
-        foreach ($keys as $k) {
-            $_k = sha1($k);
-            $_keys[] = $_k;
-            $lookup[$_k] = $k;
-        }
-        $_res = array();
-        $res = $this->memcache->get($_keys);
-        foreach ($res as $k => $v) {
-            $_res[$lookup[$k]] = $v;
-        }
-
-        return $_res;
-    }
-
-    /**
-     * Save values for a set of keys to cache
-     *
-     * @param  array $keys   list of values to save
-     * @param  int   $expire expiration time
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function write(array $keys, $expire = null)
-    {
-        foreach ($keys as $k => $v) {
-            $k = sha1($k);
-            $this->memcache->set($k, $v, 0, $expire);
-        }
-
-        return true;
-    }
-
-    /**
-     * Remove values from cache
-     *
-     * @param  array $keys list of keys to delete
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function delete(array $keys)
-    {
-        foreach ($keys as $k) {
-            $k = sha1($k);
-            $this->memcache->delete($k);
-        }
-
-        return true;
-    }
-
-    /**
-     * Remove *all* values from cache
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function purge()
-    {
-        $this->memcache->flush();
-    }
-}
diff --git a/library/Smarty/demo/plugins/cacheresource.mysql.php b/library/Smarty/demo/plugins/cacheresource.mysql.php
deleted file mode 100644
index d8d00ab26..000000000
--- a/library/Smarty/demo/plugins/cacheresource.mysql.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * MySQL CacheResource
- * CacheResource Implementation based on the Custom API to use
- * MySQL as the storage resource for Smarty's output caching.
- * Table definition:
- * <pre>CREATE TABLE IF NOT EXISTS `output_cache` (
- *   `id` CHAR(40) NOT NULL COMMENT 'sha1 hash',
- *   `name` VARCHAR(250) NOT NULL,
- *   `cache_id` VARCHAR(250) NULL DEFAULT NULL,
- *   `compile_id` VARCHAR(250) NULL DEFAULT NULL,
- *   `modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
- *   `content` LONGTEXT NOT NULL,
- *   PRIMARY KEY (`id`),
- *   INDEX(`name`),
- *   INDEX(`cache_id`),
- *   INDEX(`compile_id`),
- *   INDEX(`modified`)
- * ) ENGINE = InnoDB;</pre>
- *
- * @package CacheResource-examples
- * @author  Rodney Rehm
- */
-class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
-{
-    // PDO instance
-    protected $db;
-    protected $fetch;
-    protected $fetchTimestamp;
-    protected $save;
-
-    public function __construct()
-    {
-        try {
-            $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
-        }
-        catch (PDOException $e) {
-            throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
-        }
-        $this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
-        $this->fetchTimestamp = $this->db->prepare('SELECT modified FROM output_cache WHERE id = :id');
-        $this->save = $this->db->prepare('REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
-            VALUES  (:id, :name, :cache_id, :compile_id, :content)');
-    }
-
-    /**
-     * fetch cached content and its modification time from data source
-     *
-     * @param  string  $id         unique cache content identifier
-     * @param  string  $name       template name
-     * @param  string  $cache_id   cache id
-     * @param  string  $compile_id compile id
-     * @param  string  $content    cached content
-     * @param  integer $mtime      cache modification timestamp (epoch)
-     *
-     * @return void
-     */
-    protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime)
-    {
-        $this->fetch->execute(array('id' => $id));
-        $row = $this->fetch->fetch();
-        $this->fetch->closeCursor();
-        if ($row) {
-            $content = $row['content'];
-            $mtime = strtotime($row['modified']);
-        } else {
-            $content = null;
-            $mtime = null;
-        }
-    }
-
-    /**
-     * Fetch cached content's modification timestamp from data source
-     *
-     * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the complete cached content.
-     *
-     * @param  string $id         unique cache content identifier
-     * @param  string $name       template name
-     * @param  string $cache_id   cache id
-     * @param  string $compile_id compile id
-     *
-     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-     */
-    protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
-    {
-        $this->fetchTimestamp->execute(array('id' => $id));
-        $mtime = strtotime($this->fetchTimestamp->fetchColumn());
-        $this->fetchTimestamp->closeCursor();
-
-        return $mtime;
-    }
-
-    /**
-     * Save content to cache
-     *
-     * @param  string       $id         unique cache content identifier
-     * @param  string       $name       template name
-     * @param  string       $cache_id   cache id
-     * @param  string       $compile_id compile id
-     * @param  integer|null $exp_time   seconds till expiration time in seconds or null
-     * @param  string       $content    content to cache
-     *
-     * @return boolean      success
-     */
-    protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
-    {
-        $this->save->execute(array(
-                                 'id'         => $id,
-                                 'name'       => $name,
-                                 'cache_id'   => $cache_id,
-                                 'compile_id' => $compile_id,
-                                 'content'    => $content,
-                             ));
-
-        return !!$this->save->rowCount();
-    }
-
-    /**
-     * Delete content from cache
-     *
-     * @param  string       $name       template name
-     * @param  string       $cache_id   cache id
-     * @param  string       $compile_id compile id
-     * @param  integer|null $exp_time   seconds till expiration or null
-     *
-     * @return integer      number of deleted caches
-     */
-    protected function delete($name, $cache_id, $compile_id, $exp_time)
-    {
-        // delete the whole cache
-        if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
-            // returning the number of deleted caches would require a second query to count them
-            $query = $this->db->query('TRUNCATE TABLE output_cache');
-
-            return - 1;
-        }
-        // build the filter
-        $where = array();
-        // equal test name
-        if ($name !== null) {
-            $where[] = 'name = ' . $this->db->quote($name);
-        }
-        // equal test compile_id
-        if ($compile_id !== null) {
-            $where[] = 'compile_id = ' . $this->db->quote($compile_id);
-        }
-        // range test expiration time
-        if ($exp_time !== null) {
-            $where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)';
-        }
-        // equal test cache_id and match sub-groups
-        if ($cache_id !== null) {
-            $where[] = '(cache_id = ' . $this->db->quote($cache_id)
-                . ' OR cache_id LIKE ' . $this->db->quote($cache_id . '|%') . ')';
-        }
-        // run delete query
-        $query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where));
-
-        return $query->rowCount();
-    }
-}
diff --git a/library/Smarty/demo/plugins/resource.extendsall.php b/library/Smarty/demo/plugins/resource.extendsall.php
deleted file mode 100644
index 500b3c862..000000000
--- a/library/Smarty/demo/plugins/resource.extendsall.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Extends All Resource
- * Resource Implementation modifying the extends-Resource to walk
- * through the template_dirs and inherit all templates of the same name
- *
- * @package Resource-examples
- * @author  Rodney Rehm
- */
-class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $uid = '';
-        $sources = array();
-        $exists = true;
-        foreach ($_template->smarty->getTemplateDir() as $key => $directory) {
-            try {
-                $s = Smarty_Resource::source(null, $source->smarty, '[' . $key . ']' . $source->name);
-                if (!$s->exists) {
-                    continue;
-                }
-                $sources[$s->uid] = $s;
-                $uid .= $s->filepath;
-            }
-            catch (SmartyException $e) {
-            }
-        }
-
-        if (!$sources) {
-            $source->exists = false;
-            $source->template = $_template;
-
-            return;
-        }
-
-        $sources = array_reverse($sources, true);
-        reset($sources);
-        $s = current($sources);
-
-        $source->components = $sources;
-        $source->filepath = $s->filepath;
-        $source->uid = sha1($uid);
-        $source->exists = $exists;
-        if ($_template && $_template->smarty->compile_check) {
-            $source->timestamp = $s->timestamp;
-        }
-        // need the template at getContent()
-        $source->template = $_template;
-    }
-}
diff --git a/library/Smarty/demo/plugins/resource.mysql.php b/library/Smarty/demo/plugins/resource.mysql.php
deleted file mode 100644
index dfc9606b4..000000000
--- a/library/Smarty/demo/plugins/resource.mysql.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * MySQL Resource
- * Resource Implementation based on the Custom API to use
- * MySQL as the storage resource for Smarty's templates and configs.
- * Table definition:
- * <pre>CREATE TABLE IF NOT EXISTS `templates` (
- *   `name` varchar(100) NOT NULL,
- *   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- *   `source` text,
- *   PRIMARY KEY (`name`)
- * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
- * Demo data:
- * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
- *
- * @package Resource-examples
- * @author  Rodney Rehm
- */
-class Smarty_Resource_Mysql extends Smarty_Resource_Custom
-{
-    // PDO instance
-    protected $db;
-    // prepared fetch() statement
-    protected $fetch;
-    // prepared fetchTimestamp() statement
-    protected $mtime;
-
-    public function __construct()
-    {
-        try {
-            $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
-        }
-        catch (PDOException $e) {
-            throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
-        }
-        $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
-        $this->mtime = $this->db->prepare('SELECT modified FROM templates WHERE name = :name');
-    }
-
-    /**
-     * Fetch a template and its modification time from database
-     *
-     * @param  string  $name   template name
-     * @param  string  $source template source
-     * @param  integer $mtime  template modification timestamp (epoch)
-     *
-     * @return void
-     */
-    protected function fetch($name, &$source, &$mtime)
-    {
-        $this->fetch->execute(array('name' => $name));
-        $row = $this->fetch->fetch();
-        $this->fetch->closeCursor();
-        if ($row) {
-            $source = $row['source'];
-            $mtime = strtotime($row['modified']);
-        } else {
-            $source = null;
-            $mtime = null;
-        }
-    }
-
-    /**
-     * Fetch a template's modification time from database
-     *
-     * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source.
-     *
-     * @param  string $name template name
-     *
-     * @return integer timestamp (epoch) the template was modified
-     */
-    protected function fetchTimestamp($name)
-    {
-        $this->mtime->execute(array('name' => $name));
-        $mtime = $this->mtime->fetchColumn();
-        $this->mtime->closeCursor();
-
-        return strtotime($mtime);
-    }
-}
diff --git a/library/Smarty/demo/plugins/resource.mysqls.php b/library/Smarty/demo/plugins/resource.mysqls.php
deleted file mode 100644
index f694ddf11..000000000
--- a/library/Smarty/demo/plugins/resource.mysqls.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * MySQL Resource
- * Resource Implementation based on the Custom API to use
- * MySQL as the storage resource for Smarty's templates and configs.
- * Note that this MySQL implementation fetches the source and timestamps in
- * a single database query, instead of two separate like resource.mysql.php does.
- * Table definition:
- * <pre>CREATE TABLE IF NOT EXISTS `templates` (
- *   `name` varchar(100) NOT NULL,
- *   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- *   `source` text,
- *   PRIMARY KEY (`name`)
- * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
- * Demo data:
- * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
- *
- * @package Resource-examples
- * @author  Rodney Rehm
- */
-class Smarty_Resource_Mysqls extends Smarty_Resource_Custom
-{
-    // PDO instance
-    protected $db;
-    // prepared fetch() statement
-    protected $fetch;
-
-    public function __construct()
-    {
-        try {
-            $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
-        }
-        catch (PDOException $e) {
-            throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
-        }
-        $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
-    }
-
-    /**
-     * Fetch a template and its modification time from database
-     *
-     * @param  string  $name   template name
-     * @param  string  $source template source
-     * @param  integer $mtime  template modification timestamp (epoch)
-     *
-     * @return void
-     */
-    protected function fetch($name, &$source, &$mtime)
-    {
-        $this->fetch->execute(array('name' => $name));
-        $row = $this->fetch->fetch();
-        $this->fetch->closeCursor();
-        if ($row) {
-            $source = $row['source'];
-            $mtime = strtotime($row['modified']);
-        } else {
-            $source = null;
-            $mtime = null;
-        }
-    }
-}
diff --git a/library/Smarty/demo/templates/footer.tpl b/library/Smarty/demo/templates/footer.tpl
deleted file mode 100644
index e04310fdd..000000000
--- a/library/Smarty/demo/templates/footer.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-</BODY>
-</HTML>
diff --git a/library/Smarty/demo/templates/header.tpl b/library/Smarty/demo/templates/header.tpl
deleted file mode 100644
index 13fa6cb5a..000000000
--- a/library/Smarty/demo/templates/header.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<HTML>
-<HEAD>
-    <TITLE>{$title} - {$Name}</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
diff --git a/library/Smarty/demo/templates/index.tpl b/library/Smarty/demo/templates/index.tpl
deleted file mode 100644
index 1fbb6d379..000000000
--- a/library/Smarty/demo/templates/index.tpl
+++ /dev/null
@@ -1,87 +0,0 @@
-{config_load file="test.conf" section="setup"}
-{include file="header.tpl" title=foo}
-
-<PRE>
-
-{* bold and title are read from the config file *}
-    {if #bold#}<b>{/if}
-        {* capitalize the first letters of each word of the title *}
-        Title: {#title#|capitalize}
-        {if #bold#}</b>{/if}
-
-    The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
-
-    The value of global assigned variable $SCRIPT_NAME is {$SCRIPT_NAME}
-
-    Example of accessing server environment variable SERVER_NAME: {$smarty.server.SERVER_NAME}
-
-    The value of {ldelim}$Name{rdelim} is <b>{$Name}</b>
-
-variable modifier example of {ldelim}$Name|upper{rdelim}
-
-<b>{$Name|upper}</b>
-
-
-An example of a section loop:
-
-    {section name=outer
-    loop=$FirstName}
-        {if $smarty.section.outer.index is odd by 2}
-            {$smarty.section.outer.rownum} . {$FirstName[outer]} {$LastName[outer]}
-        {else}
-            {$smarty.section.outer.rownum} * {$FirstName[outer]} {$LastName[outer]}
-        {/if}
-        {sectionelse}
-        none
-    {/section}
-
-    An example of section looped key values:
-
-    {section name=sec1 loop=$contacts}
-        phone: {$contacts[sec1].phone}
-        <br>
-
-            fax: {$contacts[sec1].fax}
-        <br>
-
-            cell: {$contacts[sec1].cell}
-        <br>
-    {/section}
-    <p>
-
-        testing strip tags
-        {strip}
-<table border=0>
-    <tr>
-        <td>
-            <A HREF="{$SCRIPT_NAME}">
-                <font color="red">This is a test </font>
-            </A>
-        </td>
-    </tr>
-</table>
-    {/strip}
-
-</PRE>
-
-This is an example of the html_select_date function:
-
-<form>
-    {html_select_date start_year=1998 end_year=2010}
-</form>
-
-This is an example of the html_select_time function:
-
-<form>
-    {html_select_time use_24_hours=false}
-</form>
-
-This is an example of the html_options function:
-
-<form>
-    <select name=states>
-        {html_options values=$option_values selected=$option_selected output=$option_output}
-    </select>
-</form>
-
-{include file="footer.tpl"}
diff --git a/library/Smarty/libs/Autoloader.php b/library/Smarty/libs/Autoloader.php
new file mode 100644
index 000000000..7d0c388a6
--- /dev/null
+++ b/library/Smarty/libs/Autoloader.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Smarty Autoloader
+ *
+ * @package    Smarty
+ */
+
+/**
+ * Smarty Autoloader
+ *
+ * @package    Smarty
+ * @author     Uwe Tews
+ *             Usage:
+ *             require_once '...path/Autoloader.php';
+ *             Smarty_Autoloader::register();
+ *             $smarty = new Smarty();
+ *             Note:       This autoloader is not needed if you use Composer.
+ *             Composer will automatically add the classes of the Smarty package to it common autoloader.
+ */
+class Smarty_Autoloader
+{
+    /**
+     * Filepath to Smarty root
+     *
+     * @var string
+     */
+    public static $SMARTY_DIR = '';
+
+    /**
+     * Filepath to Smarty internal plugins
+     *
+     * @var string
+     */
+    public static $SMARTY_SYSPLUGINS_DIR = '';
+
+    /**
+     * Array with Smarty core classes and their filename
+     *
+     * @var array
+     */
+    public static $rootClasses = array('smarty' => 'Smarty.class.php', 'smartybc' => 'SmartyBC.class.php',);
+
+    /**
+     * Registers Smarty_Autoloader backward compatible to older installations.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not.
+     */
+    public static function registerBC($prepend = false)
+    {
+        /**
+         * register the class autoloader
+         */
+        if (!defined('SMARTY_SPL_AUTOLOAD')) {
+            define('SMARTY_SPL_AUTOLOAD', 0);
+        }
+        if (SMARTY_SPL_AUTOLOAD &&
+            set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false
+        ) {
+            $registeredAutoLoadFunctions = spl_autoload_functions();
+            if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
+                spl_autoload_register();
+            }
+        } else {
+            self::register($prepend);
+        }
+    }
+
+    /**
+     * Registers Smarty_Autoloader as an SPL autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not.
+     */
+    public static function register($prepend = false)
+    {
+        self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : dirname(__FILE__) . DIRECTORY_SEPARATOR;
+        self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
+            self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
+        if (version_compare(phpversion(), '5.3.0', '>=')) {
+            spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
+        } else {
+            spl_autoload_register(array(__CLASS__, 'autoload'));
+        }
+    }
+
+    /**
+     * Handles auto loading of classes.
+     *
+     * @param string $class A class name.
+     */
+    public static function autoload($class)
+    {
+        $_class = strtolower($class);
+        $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
+        if (strpos($_class, 'smarty_internal_') === 0) {
+            if (strpos($_class, 'smarty_internal_compile_') === 0) {
+                if (is_file($file)) {
+                    require $file;
+                }
+                return;
+            }
+            @include $file;
+            return;
+        }
+        if (preg_match('/^(smarty_(((template_(source|config|cache|compiled|resource_base))|((cached|compiled)?resource)|(variable|security)))|(smarty(bc)?)$)/',
+                       $_class, $match)) {
+            if (!empty($match[3])) {
+                @include $file;
+                return;
+            } elseif (!empty($match[9]) && isset(self::$rootClasses[$_class])) {
+                $file = self::$rootClasses[$_class];
+                require $file;
+                return;
+            }
+        }
+        if (0 !== strpos($_class, 'smarty')) {
+            return;
+        }
+        if (is_file($file)) {
+            require $file;
+            return;
+        }
+        return;
+    }
+}
diff --git a/library/Smarty/libs/Smarty.class.php b/library/Smarty/libs/Smarty.class.php
index 832b0d309..17457131c 100644
--- a/library/Smarty/libs/Smarty.class.php
+++ b/library/Smarty/libs/Smarty.class.php
@@ -2,15 +2,17 @@
 /**
  * Project:     Smarty: the PHP compiling template engine
  * File:        Smarty.class.php
- * SVN:         $Id: Smarty.class.php 4897 2014-10-14 22:29:58Z Uwe.Tews@googlemail.com $
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -19,12 +21,13 @@
  * smarty-discussion-subscribe@googlegroups.com
  *
  * @link      http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
+ * @copyright 2015 New Digital Group, Inc.
+ * @copyright 2015 Uwe Tews
  * @author    Monte Ohrt <monte at ohrt dot com>
  * @author    Uwe Tews
  * @author    Rodney Rehm
  * @package   Smarty
- * @version   3.1.21
+ * @version   3.1.28
  */
 
 /**
@@ -53,7 +56,7 @@ if (!defined('SMARTY_PLUGINS_DIR')) {
     define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
 }
 if (!defined('SMARTY_MBSTRING')) {
-    define('SMARTY_MBSTRING', function_exists('mb_split'));
+    define('SMARTY_MBSTRING', function_exists('mb_get_info'));
 }
 if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
     // UTF-8 can only be done properly when mbstring is available!
@@ -70,36 +73,41 @@ if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
 }
 
 /**
- * register the class autoloader
+ * Try loading the Smarty_Internal_Data class
+ * If we fail we must load Smarty's autoloader.
+ * Otherwise we may have a global autoloader like Composer
  */
-if (!defined('SMARTY_SPL_AUTOLOAD')) {
-    define('SMARTY_SPL_AUTOLOAD', 0);
-}
-
-if (SMARTY_SPL_AUTOLOAD && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false) {
-    $registeredAutoLoadFunctions = spl_autoload_functions();
-    if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
-        spl_autoload_register();
+if (!class_exists('Smarty_Autoloader', false)) {
+    if (!class_exists('Smarty_Internal_Data', true)) {
+        require_once dirname(__FILE__) . '/Autoloader.php';
+        Smarty_Autoloader::registerBC();
     }
-} else {
-    spl_autoload_register('smartyAutoload');
 }
 
 /**
  * Load always needed external class files
  */
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_resource_file.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_cacheresource_file.php';
+if (!class_exists('Smarty_Internal_Data', false)) {
+    require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
+}
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_extension_handler.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_variable.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_source.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_resource_base.php';
 
 /**
  * This is the main Smarty class
  *
  * @package Smarty
+ *
+ * @method int clearAllCache(int $exp_time = null, string $type = null)
+ * @method int clearCache(string $template_name, string $cache_id = null, string $compile_id = null, int $exp_time = null, string $type = null)
+ * @method int compileAllTemplates(Smarty $smarty, string $extension = '.tpl', bool $force_compile = false, int $time_limit = 0, int $max_errors = null)
+ * @method int compileAllConfig(Smarty $smarty, string $extension = '.conf', bool $force_compile = false, int $time_limit = 0, int $max_errors = null)
+ *
  */
 class Smarty extends Smarty_Internal_TemplateBase
 {
@@ -110,23 +118,36 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = 'Smarty-3.1.21-dev';
+    const SMARTY_VERSION = '3.1.28';
 
     /**
      * define variable scopes
      */
     const SCOPE_LOCAL = 0;
-    const SCOPE_PARENT = 1;
-    const SCOPE_ROOT = 2;
-    const SCOPE_GLOBAL = 3;
+
+    const SCOPE_PARENT = 2;
+
+    const SCOPE_TPL_ROOT = 4;
+
+    const SCOPE_ROOT = 8;
+
+    const SCOPE_SMARTY = 16;
+
+    const SCOPE_GLOBAL = 32;
+
+    const SCOPE_BUBBLE_UP = 64;
+
     /**
      * define caching modes
      */
     const CACHING_OFF = 0;
+
     const CACHING_LIFETIME_CURRENT = 1;
+
     const CACHING_LIFETIME_SAVED = 2;
+
     /**
-     * define constant for clearing cache files be saved expiration datees
+     * define constant for clearing cache files be saved expiration dates
      */
     const CLEAR_EXPIRED = - 1;
 
@@ -134,31 +155,66 @@ class Smarty extends Smarty_Internal_TemplateBase
      * define compile check modes
      */
     const COMPILECHECK_OFF = 0;
+
     const COMPILECHECK_ON = 1;
+
     const COMPILECHECK_CACHEMISS = 2;
+
+    /**
+     * define debug modes
+     */
+    const DEBUG_OFF = 0;
+
+    const DEBUG_ON = 1;
+
+    const DEBUG_INDIVIDUAL = 2;
+
     /**
      * modes for handling of "<?php ... ?>" tags in templates.
      */
     const PHP_PASSTHRU = 0; //-> print tags as plain text
+
     const PHP_QUOTE = 1; //-> escape tags as entities
+
     const PHP_REMOVE = 2; //-> escape tags as entities
+
     const PHP_ALLOW = 3; //-> escape tags as entities
+
     /**
      * filter types
      */
     const FILTER_POST = 'post';
+
     const FILTER_PRE = 'pre';
+
     const FILTER_OUTPUT = 'output';
+
     const FILTER_VARIABLE = 'variable';
+
     /**
      * plugin types
      */
     const PLUGIN_FUNCTION = 'function';
+
     const PLUGIN_BLOCK = 'block';
+
     const PLUGIN_COMPILER = 'compiler';
+
     const PLUGIN_MODIFIER = 'modifier';
+
     const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
 
+    /**
+     * Resource caching modes
+     */
+    const RESOURCE_CACHE_OFF = 0;
+
+    const RESOURCE_CACHE_AUTOMATIC = 1; // cache template objects by rules
+
+    const RESOURCE_CACHE_TEMPLATE = 2; // cache all template objects
+
+    const RESOURCE_CACHE_ON = 4;    // cache source and compiled resources
+
     /**#@-*/
 
     /**
@@ -167,26 +223,31 @@ class Smarty extends Smarty_Internal_TemplateBase
     public static $global_tpl_vars = array();
 
     /**
-     * error handler returned by set_error_hanlder() in Smarty::muteExpectedErrors()
+     * error handler returned by set_error_handler() in Smarty::muteExpectedErrors()
      */
     public static $_previous_error_handler = null;
+
     /**
      * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
      */
     public static $_muted_directories = array();
+
     /**
      * Flag denoting if Multibyte String functions are available
      */
     public static $_MBSTRING = SMARTY_MBSTRING;
+
     /**
      * The character set to adhere to (e.g. "UTF-8")
      */
     public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
+
     /**
      * The date format to be used internally
      * (accepts date() and strftime())
      */
     public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
+
     /**
      * Flag denoting if PCRE should run in UTF-8 mode
      */
@@ -202,163 +263,152 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
 
     /**
-     * auto literal on delimiters with whitspace
+     * auto literal on delimiters with whitespace
      *
      * @var boolean
      */
     public $auto_literal = true;
+
     /**
      * display error on not assigned variables
      *
      * @var boolean
      */
     public $error_unassigned = false;
+
     /**
-     * look up relative filepaths in include_path
+     * look up relative file path in include_path
      *
      * @var boolean
      */
     public $use_include_path = false;
+
     /**
      * template directory
      *
      * @var array
      */
-    private $template_dir = array();
+    private $template_dir = array('./templates/');
+
     /**
      * joined template directory string used in cache keys
      *
      * @var string
      */
-    public $joined_template_dir = null;
+    public $_joined_template_dir = null;
+
     /**
      * joined config directory string used in cache keys
      *
      * @var string
      */
-    public $joined_config_dir = null;
+    public $_joined_config_dir = null;
+
     /**
      * default template handler
      *
      * @var callable
      */
     public $default_template_handler_func = null;
+
     /**
      * default config handler
      *
      * @var callable
      */
     public $default_config_handler_func = null;
+
     /**
      * default plugin handler
      *
      * @var callable
      */
     public $default_plugin_handler_func = null;
+
     /**
      * compile directory
      *
      * @var string
      */
-    private $compile_dir = null;
+    private $compile_dir = './templates_c/';
+
     /**
      * plugins directory
      *
      * @var array
      */
-    private $plugins_dir = array();
+    private $plugins_dir = null;
+
     /**
      * cache directory
      *
      * @var string
      */
-    private $cache_dir = null;
+    private $cache_dir = './cache/';
+
     /**
      * config directory
      *
      * @var array
      */
-    private $config_dir = array();
+    private $config_dir = array('./configs/');
+
     /**
      * force template compiling?
      *
      * @var boolean
      */
     public $force_compile = false;
+
     /**
      * check template for modifications?
      *
      * @var boolean
      */
     public $compile_check = true;
+
     /**
      * use sub dirs for compiled/cached files?
      *
      * @var boolean
      */
     public $use_sub_dirs = false;
+
     /**
      * allow ambiguous resources (that are made unique by the resource handler)
      *
      * @var boolean
      */
     public $allow_ambiguous_resources = false;
-    /**
-     * caching enabled
-     *
-     * @var boolean
-     */
-    public $caching = false;
+
     /**
      * merge compiled includes
      *
      * @var boolean
      */
     public $merge_compiled_includes = false;
-    /**
-     * template inheritance merge compiled includes
-     *
-     * @var boolean
-     */
-    public $inheritance_merge_compiled_includes = true;
-    /**
-     * cache lifetime in seconds
-     *
-     * @var integer
-     */
-    public $cache_lifetime = 3600;
+
     /**
      * force cache file creation
      *
      * @var boolean
      */
     public $force_cache = false;
-    /**
-     * Set this if you want different sets of cache files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $cache_id = null;
-    /**
-     * Set this if you want different sets of compiled files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $compile_id = null;
+
     /**
      * template left-delimiter
      *
      * @var string
      */
     public $left_delimiter = "{";
+
     /**
      * template right-delimiter
      *
      * @var string
      */
     public $right_delimiter = "}";
+
     /**#@+
      * security
      */
@@ -370,33 +420,28 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @see Smarty_Security
      */
     public $security_class = 'Smarty_Security';
+
     /**
      * implementation of security class
      *
      * @var Smarty_Security
      */
     public $security_policy = null;
+
     /**
      * controls handling of PHP-blocks
      *
      * @var integer
      */
     public $php_handling = self::PHP_PASSTHRU;
+
     /**
      * controls if the php template file resource is allowed
      *
      * @var bool
      */
     public $allow_php_templates = false;
-    /**
-     * Should compiled-templates be prevented from being called directly?
-     * {@internal
-     * Currently used by Smarty_Internal_Template only.
-     * }}
-     *
-     * @var boolean
-     */
-    public $direct_access_security = true;
+
     /**#@-*/
     /**
      * debug mode
@@ -405,6 +450,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $debugging = false;
+
     /**
      * This determines if debugging is enable-able from the browser.
      * <ul>
@@ -415,32 +461,29 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var string
      */
     public $debugging_ctrl = 'NONE';
+
     /**
      * Name of debugging URL-param.
      * Only used when $debugging_ctrl is set to 'URL'.
      * The name of the URL-parameter that activates debugging.
      *
-     * @var type
+     * @var string
      */
     public $smarty_debug_id = 'SMARTY_DEBUG';
+
     /**
      * Path of debug template.
      *
      * @var string
      */
     public $debug_tpl = null;
+
     /**
      * When set, smarty uses this value as error_reporting-level.
      *
      * @var int
      */
     public $error_reporting = null;
-    /**
-     * Internal flag for getTags()
-     *
-     * @var boolean
-     */
-    public $get_used_tags = false;
 
     /**#@+
      * config var settings
@@ -452,12 +495,14 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $config_overwrite = true;
+
     /**
      * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
      *
      * @var boolean
      */
     public $config_booleanize = true;
+
     /**
      * Controls whether hidden config sections/vars are read from the file.
      *
@@ -477,12 +522,14 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var boolean
      */
     public $compile_locking = true;
+
     /**
-     * Controls whether cache resources should emply locking mechanism
+     * Controls whether cache resources should use locking mechanism
      *
      * @var boolean
      */
     public $cache_locking = false;
+
     /**
      * seconds to wait for acquiring a lock before ignoring the write lock
      *
@@ -493,18 +540,13 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**#@-*/
 
     /**
-     * global template functions
-     *
-     * @var array
-     */
-    public $template_functions = array();
-    /**
      * resource type used if none given
      * Must be an valid key of $registered_resources.
      *
      * @var string
      */
     public $default_resource_type = 'file';
+
     /**
      * caching type
      * Must be an element of $cache_resource_types.
@@ -512,255 +554,162 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var string
      */
     public $caching_type = 'file';
-    /**
-     * internal config properties
-     *
-     * @var array
-     */
-    public $properties = array();
+
     /**
      * config type
      *
      * @var string
      */
     public $default_config_type = 'file';
+
     /**
-     * cached template objects
+     * enable resource caching
      *
-     * @var array
+     * @var bool
      */
-    public $template_objects = array();
+    public $resource_cache_mode = 1;
+
     /**
      * check If-Modified-Since headers
      *
      * @var boolean
      */
     public $cache_modified_check = false;
+
     /**
      * registered plugins
      *
      * @var array
      */
     public $registered_plugins = array();
-    /**
-     * plugin search order
-     *
-     * @var array
-     */
-    public $plugin_search_order = array('function', 'block', 'compiler', 'class');
+
     /**
      * registered objects
      *
      * @var array
      */
     public $registered_objects = array();
+
     /**
      * registered classes
      *
      * @var array
      */
     public $registered_classes = array();
+
     /**
      * registered filters
      *
      * @var array
      */
     public $registered_filters = array();
+
     /**
      * registered resources
      *
      * @var array
      */
     public $registered_resources = array();
-    /**
-     * resource handler cache
-     *
-     * @var array
-     */
-    public $_resource_handlers = array();
+
     /**
      * registered cache resources
      *
      * @var array
      */
     public $registered_cache_resources = array();
-    /**
-     * cache resource handler cache
-     *
-     * @var array
-     */
-    public $_cacheresource_handlers = array();
+
     /**
      * autoload filter
      *
      * @var array
      */
     public $autoload_filters = array();
+
     /**
      * default modifier
      *
      * @var array
      */
     public $default_modifiers = array();
+
     /**
      * autoescape variable output
      *
      * @var boolean
      */
     public $escape_html = false;
-    /**
-     * global internal smarty vars
-     *
-     * @var array
-     */
-    public static $_smarty_vars = array();
+
     /**
      * start time for execution time calculation
      *
      * @var int
      */
     public $start_time = 0;
-    /**
-     * default file permissions
-     *
-     * @var int
-     */
-    public $_file_perms = 0644;
-    /**
-     * default dir permissions
-     *
-     * @var int
-     */
-    public $_dir_perms = 0771;
-    /**
-     * block tag hierarchy
-     *
-     * @var array
-     */
-    public $_tag_stack = array();
-    /**
-     * self pointer to Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty;
+
     /**
      * required by the compiler for BC
      *
      * @var string
      */
     public $_current_file = null;
+
     /**
      * internal flag to enable parser debugging
      *
      * @var bool
      */
     public $_parserdebug = false;
+
     /**
-     * Saved parameter of merged templates during compilation
+     * This object type (Smarty = 1, template = 2, data = 4)
      *
-     * @var array
+     * @var int
+     */
+    public $_objType = 1;
+
+    /**
+     * Debug object
+     *
+     * @var Smarty_Internal_Debug
      */
-    public $merged_templates_func = array();
+    public $_debug = null;
 
     /**
-     * Cache of is_file results of loadPlugin()
-     * 
+     * removed properties
+     *
      * @var array
      */
-    public static $_is_file_cache= array();
+    private static $obsoleteProperties = array('resource_caching', 'template_resource_caching',
+                                               'direct_access_security', '_dir_perms', '_file_perms',
+                                               'plugin_search_order', 'inheritance_merge_compiled_includes');
+
+    private static $accessMap = array('template_dir' => 'getTemplateDir', 'config_dir' => 'getConfigDir',
+                                      'plugins_dir'  => 'getPluginsDir', 'compile_dir' => 'getCompileDir',
+                                      'cache_dir'    => 'getCacheDir',);
 
     /**#@-*/
 
     /**
      * Initialize new Smarty object
-
      */
     public function __construct()
     {
-        // selfpointer needed by some other class methods
-        $this->smarty = $this;
+        parent::__construct();
         if (is_callable('mb_internal_encoding')) {
             mb_internal_encoding(Smarty::$_CHARSET);
         }
         $this->start_time = microtime(true);
-        // set default dirs
-        $this->setTemplateDir('.' . DS . 'templates' . DS)
-            ->setCompileDir('.' . DS . 'templates_c' . DS)
-            ->setPluginsDir(SMARTY_PLUGINS_DIR)
-            ->setCacheDir('.' . DS . 'cache' . DS)
-            ->setConfigDir('.' . DS . 'configs' . DS);
-
-        $this->debug_tpl = 'file:' . dirname(__FILE__) . '/debug.tpl';
+
         if (isset($_SERVER['SCRIPT_NAME'])) {
-            $this->assignGlobal('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
+            Smarty::$global_tpl_vars['SCRIPT_NAME'] = new Smarty_Variable($_SERVER['SCRIPT_NAME']);
         }
-    }
 
-    /**
-     * Class destructor
-     */
-    public function __destruct()
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * <<magic>> set selfpointer on cloned object
-     */
-    public function __clone()
-    {
-        $this->smarty = $this;
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     * Calls the appropriate getter function.
-     * Issues an E_USER_NOTICE if no valid getter is found.
-     *
-     * @param  string $name property name
-     *
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        $allowed = array(
-            'template_dir' => 'getTemplateDir',
-            'config_dir'   => 'getConfigDir',
-            'plugins_dir'  => 'getPluginsDir',
-            'compile_dir'  => 'getCompileDir',
-            'cache_dir'    => 'getCacheDir',
-        );
-
-        if (isset($allowed[$name])) {
-            return $this->{$allowed[$name]}();
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
-        }
-    }
+        // Check if we're running on windows
+        Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
 
-    /**
-     * <<magic>> Generic setter.
-     * Calls the appropriate setter function.
-     * Issues an E_USER_NOTICE if no valid setter is found.
-     *
-     * @param string $name  property name
-     * @param mixed  $value parameter passed to setter
-     */
-    public function __set($name, $value)
-    {
-        $allowed = array(
-            'template_dir' => 'setTemplateDir',
-            'config_dir'   => 'setConfigDir',
-            'plugins_dir'  => 'setPluginsDir',
-            'compile_dir'  => 'setCompileDir',
-            'cache_dir'    => 'setCacheDir',
-        );
-
-        if (isset($allowed[$name])) {
-            $this->{$allowed[$name]}($value);
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        // let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
+        if (Smarty::$_CHARSET !== 'UTF-8') {
+            Smarty::$_UTF8_MODIFIER = '';
         }
     }
 
@@ -773,14 +722,9 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function templateExists($resource_name)
     {
-        // create template object
-        $save = $this->template_objects;
-        $tpl = new $this->template_class($resource_name, $this);
-        // check if it does exists
-        $result = $tpl->source->exists;
-        $this->template_objects = $save;
-
-        return $result;
+        // create source object
+        $source = Smarty_Template_Source::load(null, $this, $resource_name);
+        return $source->exists;
     }
 
     /**
@@ -809,43 +753,6 @@ class Smarty extends Smarty_Internal_TemplateBase
     }
 
     /**
-     * Empty cache folder
-     *
-     * @param  integer $exp_time expiration time
-     * @param  string  $type     resource type
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearAllCache($exp_time = null, $type = null)
-    {
-        // load cache resource and call clearAll
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-
-        return $_cache_resource->clearAll($this, $exp_time);
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param  string  $template_name template name
-     * @param  string  $cache_id      cache id
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time
-     * @param  string  $type          resource type
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
-    {
-        // load cache resource and call clear
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-
-        return $_cache_resource->clear($this, $template_name, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
      * Loads security class and enables security
      *
      * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
@@ -855,24 +762,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function enableSecurity($security_class = null)
     {
-        if ($security_class instanceof Smarty_Security) {
-            $this->security_policy = $security_class;
-
-            return $this;
-        } elseif (is_object($security_class)) {
-            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
-        }
-        if ($security_class == null) {
-            $security_class = $this->security_class;
-        }
-        if (!class_exists($security_class)) {
-            throw new SmartyException("Security class '$security_class' is not defined");
-        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
-            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
-        } else {
-            $this->security_policy = new $security_class($this);
-        }
-
+        Smarty_Security::enableSecurity($this, $security_class);
         return $this;
     }
 
@@ -892,18 +782,18 @@ class Smarty extends Smarty_Internal_TemplateBase
      * Set template directory
      *
      * @param  string|array $template_dir directory(s) of template sources
+     * @param bool          $isConfig     true for config_dir
      *
-     * @return Smarty       current Smarty instance for chaining
+     * @return \Smarty current Smarty instance for chaining
      */
-    public function setTemplateDir($template_dir)
+    public function setTemplateDir($template_dir, $isConfig = false)
     {
-        $this->template_dir = array();
-        foreach ((array) $template_dir as $k => $v) {
-            $this->template_dir[$k] = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
-        }
-
-        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
-
+        $type = $isConfig ? 'config_dir' : 'template_dir';
+        $joined = '_joined_' . $type;
+        $this->{$type} = (array) $template_dir;
+        $this->{$joined} = join(' # ', $this->{$type});
+        $this->_cache[$type . '_new'] = true;
+        $this->_cache[$type] = false;
         return $this;
     }
 
@@ -912,55 +802,53 @@ class Smarty extends Smarty_Internal_TemplateBase
      *
      * @param  string|array $template_dir directory(s) of template sources
      * @param  string       $key          of the array element to assign the template dir to
+     * @param bool          $isConfig     true for config_dir
      *
      * @return Smarty          current Smarty instance for chaining
-     * @throws SmartyException when the given template directory is not valid
      */
-    public function addTemplateDir($template_dir, $key = null)
+    public function addTemplateDir($template_dir, $key = null, $isConfig = false)
     {
-        // make sure we're dealing with an array
-        $this->template_dir = (array) $this->template_dir;
-
-        if (is_array($template_dir)) {
-            foreach ($template_dir as $k => $v) {
-                $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->template_dir[] = $v;
-                } else {
-                    // string indexes are overridden
-                    $this->template_dir[$k] = $v;
-                }
-            }
-        } else {
-            $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($template_dir, '/\\')) . DS;
-            if ($key !== null) {
-                // override directory at specified index
-                $this->template_dir[$key] = $v;
-            } else {
-                // append new directory
-                $this->template_dir[] = $v;
-            }
+        $type = $isConfig ? 'config_dir' : 'template_dir';
+        $joined = '_joined_' . $type;
+        if (!isset($this->_cache[$type])) {
+            $this->{$type} = (array) $this->{$type};
+            $this->{$joined} = join(' # ', $this->{$type});
+            $this->_cache[$type . '_new'] = true;
+            $this->_cache[$type] = false;
         }
-        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
-
+        $this->{$joined} .= ' # ' . join(' # ', (array) $template_dir);
+        $this->_addDir($type, $template_dir, $key);
         return $this;
     }
 
     /**
      * Get template directories
      *
-     * @param mixed $index index of directory to get, null to get all
+     * @param mixed $index    index of directory to get, null to get all
+     * @param bool  $isConfig true for config_dir
      *
-     * @return array|string list of template directories, or directory of $index
+     * @return array list of template directories, or directory of $index
      */
-    public function getTemplateDir($index = null)
+    public function getTemplateDir($index = null, $isConfig = false)
     {
+        $type = $isConfig ? 'config_dir' : 'template_dir';
+        if (!isset($this->_cache[$type])) {
+            $joined = '_joined_' . $type;
+            $this->{$type} = (array) $this->{$type};
+            $this->{$joined} = join(' # ', $this->{$type});
+            $this->_cache[$type] = false;
+        }
+        if ($this->_cache[$type] == false) {
+            foreach ($this->{$type} as $k => $v) {
+                $this->{$type}[$k] = $this->_realpath($v . DS, true);
+            }
+            $this->_cache[$type . '_new'] = true;
+            $this->_cache[$type] = true;
+        }
         if ($index !== null) {
-            return isset($this->template_dir[$index]) ? $this->template_dir[$index] : null;
+            return isset($this->{$type}[$index]) ? $this->{$type}[$index] : null;
         }
-
-        return (array) $this->template_dir;
+        return $this->{$type};
     }
 
     /**
@@ -972,54 +860,20 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function setConfigDir($config_dir)
     {
-        $this->config_dir = array();
-        foreach ((array) $config_dir as $k => $v) {
-            $this->config_dir[$k] = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
-        }
-
-        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
-
-        return $this;
+        return $this->setTemplateDir($config_dir, true);
     }
 
     /**
      * Add config directory(s)
      *
-     * @param string|array        $config_dir directory(s) of config sources
-     * @param mixed $key        key of the array element to assign the config dir to
+     * @param string|array $config_dir directory(s) of config sources
+     * @param mixed        $key        key of the array element to assign the config dir to
      *
      * @return Smarty current Smarty instance for chaining
      */
     public function addConfigDir($config_dir, $key = null)
     {
-        // make sure we're dealing with an array
-        $this->config_dir = (array) $this->config_dir;
-
-        if (is_array($config_dir)) {
-            foreach ($config_dir as $k => $v) {
-                $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->config_dir[] = $v;
-                } else {
-                    // string indexes are overridden
-                    $this->config_dir[$k] = $v;
-                }
-            }
-        } else {
-            $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($config_dir, '/\\')) . DS;
-            if ($key !== null) {
-                // override directory at specified index
-                $this->config_dir[$key] = rtrim($v, '/\\') . DS;
-            } else {
-                // append new directory
-                $this->config_dir[] = rtrim($v, '/\\') . DS;
-            }
-        }
-
-        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
-
-        return $this;
+        return $this->addTemplateDir($config_dir, $key, true);
     }
 
     /**
@@ -1027,15 +881,11 @@ class Smarty extends Smarty_Internal_TemplateBase
      *
      * @param mixed $index index of directory to get, null to get all
      *
-     * @return array|string configuration directory
+     * @return array configuration directory
      */
     public function getConfigDir($index = null)
     {
-        if ($index !== null) {
-            return isset($this->config_dir[$index]) ? $this->config_dir[$index] : null;
-        }
-
-        return (array) $this->config_dir;
+        return $this->getTemplateDir($index, true);
     }
 
     /**
@@ -1047,11 +897,10 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function setPluginsDir($plugins_dir)
     {
-        $this->plugins_dir = array();
-        foreach ((array) $plugins_dir as $k => $v) {
-            $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
+        $this->plugins_dir = (array) $plugins_dir;
+        if (isset($this->_cache['plugins_dir'])) {
+            unset($this->_cache['plugins_dir']);
         }
-
         return $this;
     }
 
@@ -1064,26 +913,13 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function addPluginsDir($plugins_dir)
     {
-        // make sure we're dealing with an array
-        $this->plugins_dir = (array) $this->plugins_dir;
-
-        if (is_array($plugins_dir)) {
-            foreach ($plugins_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->plugins_dir[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } else {
-            // append new directory
-            $this->plugins_dir[] = rtrim($plugins_dir, '/\\') . DS;
+        if (!isset($this->plugins_dir)) {
+            $this->plugins_dir = array(SMARTY_PLUGINS_DIR);
+        }
+        $this->plugins_dir = array_merge((array) $this->plugins_dir, (array) $plugins_dir);
+        if (isset($this->_cache['plugins_dir'])) {
+            unset($this->_cache['plugins_dir']);
         }
-
-        $this->plugins_dir = array_unique($this->plugins_dir);
-
         return $this;
     }
 
@@ -1094,7 +930,21 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function getPluginsDir()
     {
-        return (array) $this->plugins_dir;
+        if (!isset($this->_cache['plugins_dir'])) {
+            if (!isset($this->plugins_dir)) {
+                $this->plugins_dir = array(SMARTY_PLUGINS_DIR);
+            } else {
+                $plugins_dir = (array) $this->plugins_dir;
+                $this->plugins_dir = array();
+                foreach ($plugins_dir as $v) {
+                    $this->plugins_dir[] = $this->_realpath($v . DS, true);
+                }
+                $this->plugins_dir = array_unique($this->plugins_dir);
+            }
+            $this->_cache['plugin_files'] = array();
+            $this->_cache['plugins_dir'] = true;
+        }
+        return $this->plugins_dir;
     }
 
     /**
@@ -1106,11 +956,11 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function setCompileDir($compile_dir)
     {
-        $this->compile_dir = rtrim($compile_dir, '/\\') . DS;
+        $this->compile_dir = $this->_realpath($compile_dir . DS, true);
         if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
             Smarty::$_muted_directories[$this->compile_dir] = null;
         }
-
+        $this->_cache['compile_dir'] = true;
         return $this;
     }
 
@@ -1121,6 +971,13 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function getCompileDir()
     {
+        if (!isset($this->_cache['compile_dir'])) {
+            $this->compile_dir = $this->_realpath($this->compile_dir . DS, true);
+            if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
+                Smarty::$_muted_directories[$this->compile_dir] = null;
+            }
+            $this->_cache['compile_dir'] = true;
+        }
         return $this->compile_dir;
     }
 
@@ -1133,11 +990,11 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function setCacheDir($cache_dir)
     {
-        $this->cache_dir = rtrim($cache_dir, '/\\') . DS;
+        $this->cache_dir = $this->_realpath($cache_dir . DS, true);
         if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
             Smarty::$_muted_directories[$this->cache_dir] = null;
         }
-
+        $this->_cache['cache_dir'] = true;
         return $this;
     }
 
@@ -1148,347 +1005,374 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     public function getCacheDir()
     {
+        if (!isset($this->_cache['cache_dir'])) {
+            $this->cache_dir = $this->_realpath($this->cache_dir . DS, true);
+            if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
+                Smarty::$_muted_directories[$this->cache_dir] = null;
+            }
+            $this->_cache['cache_dir'] = true;
+        }
         return $this->cache_dir;
     }
 
     /**
-     * Set default modifiers
+     * add directories to given property name
      *
-     * @param  array|string $modifiers modifier or list of modifiers to set
-     *
-     * @return Smarty       current Smarty instance for chaining
+     * @param string       $dirName directory property name
+     * @param string|array $dir     directory string or array of strings
+     * @param mixed        $key     optional key
      */
-    public function setDefaultModifiers($modifiers)
+    private function _addDir($dirName, $dir, $key = null)
     {
-        $this->default_modifiers = (array) $modifiers;
-
-        return $this;
+        $rp = $this->_cache[$dirName];
+        if (is_array($dir)) {
+            foreach ($dir as $k => $v) {
+                $path = $rp ? $this->_realpath($v . DS, true) : $v;
+                if (is_int($k)) {
+                    // indexes are not merged but appended
+                    $this->{$dirName}[] = $path;
+                } else {
+                    // string indexes are overridden
+                    $this->{$dirName}[$k] = $path;
+                }
+            }
+        } else {
+            $path = $rp ? $this->_realpath($dir . DS, true) : $dir;
+            if ($key !== null) {
+                // override directory at specified index
+                $this->{$dirName}[$key] = $path;
+            } else {
+                // append new directory
+                $this->{$dirName}[] = $path;
+            }
+        }
     }
 
     /**
-     * Add default modifiers
+     * creates a template object
      *
-     * @param  array|string $modifiers modifier or list of modifiers to add
+     * @param  string  $template   the resource handle of the template file
+     * @param  mixed   $cache_id   cache id to be used with this template
+     * @param  mixed   $compile_id compile id to be used with this template
+     * @param  object  $parent     next higher level of Smarty variables
+     * @param  boolean $do_clone   flag is Smarty object shall be cloned
      *
-     * @return Smarty       current Smarty instance for chaining
+     * @return object  template object
      */
-    public function addDefaultModifiers($modifiers)
+    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
     {
-        if (is_array($modifiers)) {
-            $this->default_modifiers = array_merge($this->default_modifiers, $modifiers);
+        if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) {
+            $parent = $cache_id;
+            $cache_id = null;
+        }
+        if ($parent !== null && is_array($parent)) {
+            $data = $parent;
+            $parent = null;
         } else {
-            $this->default_modifiers[] = $modifiers;
+            $data = null;
         }
-
-        return $this;
+        if ($this->caching &&
+            isset($this->_cache['isCached'][$_templateId = $this->_getTemplateId($template, $cache_id, $compile_id)])
+        ) {
+            $tpl = $do_clone ? clone $this->_cache['isCached'][$_templateId] : $this->_cache['isCached'][$_templateId];
+            $tpl->parent = $parent;
+            $tpl->tpl_vars = array();
+            $tpl->config_vars = array();
+        } else {
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id, null, null);
+        }
+        if ($do_clone) {
+            $tpl->smarty = clone $tpl->smarty;
+        } elseif ($parent === null) {
+            $tpl->parent = $this;
+        }
+        // fill data if present
+        if (!empty($data) && is_array($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
+            }
+        }
+        if ($this->debugging || $this->debugging_ctrl == 'URL') {
+            $tpl->smarty->_debug = new Smarty_Internal_Debug();
+            // check URL debugging control
+            if (!$this->debugging && $this->debugging_ctrl == 'URL') {
+                $tpl->smarty->_debug->debugUrl($tpl->smarty);
+            }
+        }
+        return $tpl;
     }
 
     /**
-     * Get default modifiers
+     * Takes unknown classes and loads plugin files for them
+     * class name format: Smarty_PluginType_PluginName
+     * plugin filename format: plugintype.pluginname.php
+     *
+     * @param  string $plugin_name class plugin name to load
+     * @param  bool   $check       check if already loaded
      *
-     * @return array list of default modifiers
+     * @throws SmartyException
+     * @return string |boolean filepath of loaded file or false
      */
-    public function getDefaultModifiers()
+    public function loadPlugin($plugin_name, $check = true)
     {
-        return $this->default_modifiers;
+        return $this->ext->loadPlugin->loadPlugin($this, $plugin_name, $check);
     }
 
     /**
-     * Set autoload filters
+     * Get unique template id
      *
-     * @param  array  $filters filters to load automatically
-     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
+     * @param string     $template_name
+     * @param null|mixed $cache_id
+     * @param null|mixed $compile_id
+     * @param null       $caching
      *
-     * @return Smarty current Smarty instance for chaining
+     * @return string
      */
-    public function setAutoloadFilters($filters, $type = null)
+    public function _getTemplateId($template_name, $cache_id = null, $compile_id = null, $caching = null)
     {
-        if ($type !== null) {
-            $this->autoload_filters[$type] = (array) $filters;
+        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
+        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
+        $caching = (int) ($caching === null ? $this->caching : $caching);
+
+        if ($this->allow_ambiguous_resources) {
+            $_templateId =
+                Smarty_Resource::getUniqueTemplateName($this, $template_name) . "#{$cache_id}#{$compile_id}#{$caching}";
         } else {
-            $this->autoload_filters = (array) $filters;
+            $_templateId = $this->_joined_template_dir . "#{$template_name}#{$cache_id}#{$compile_id}#{$caching}";
         }
-
-        return $this;
+        if (isset($_templateId[150])) {
+            $_templateId = sha1($_templateId);
+        }
+        return $_templateId;
     }
 
     /**
-     * Add autoload filters
+     * Normalize path
+     *  - remove /./ and /../
+     *  - make it absolute if required
      *
-     * @param  array  $filters filters to load automatically
-     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
+     * @param string $path     file path
+     * @param bool   $realpath leave $path relative
      *
-     * @return Smarty current Smarty instance for chaining
+     * @return string
      */
-    public function addAutoloadFilters($filters, $type = null)
+    public function _realpath($path, $realpath = null)
     {
-        if ($type !== null) {
-            if (!empty($this->autoload_filters[$type])) {
-                $this->autoload_filters[$type] = array_merge($this->autoload_filters[$type], (array) $filters);
-            } else {
-                $this->autoload_filters[$type] = (array) $filters;
-            }
-        } else {
-            foreach ((array) $filters as $key => $value) {
-                if (!empty($this->autoload_filters[$key])) {
-                    $this->autoload_filters[$key] = array_merge($this->autoload_filters[$key], (array) $value);
-                } else {
-                    $this->autoload_filters[$key] = (array) $value;
-                }
-            }
+        static $pattern = null;
+        static $nds = null;
+        if ($pattern == null) {
+            $nds = DS == '/' ? '\\' : '/';
+            $ds = '\\' . DS;
+            $pattern =
+                "#([{$ds}]+[^{$ds}]+[{$ds}]+[.]([{$ds}]+[.])*[.][{$ds}]+([.][{$ds}]+)*)|([{$ds}]+([.][{$ds}]+)+)|[{$ds}]{2,}#";
+        }
+        // normalize DS
+        if (strpos($path, $nds) !== false) {
+            $path = str_replace($nds, DS, $path);
         }
 
-        return $this;
+        if ($realpath === true && $path[0] !== '/' && $path[1] !== ':') {
+            $path = getcwd() . DS . $path;
+        }
+        while ((strpos($path, '.' . DS) !== false) || (strpos($path, DS . DS) !== false)) {
+            $path = preg_replace($pattern, DS, $path);
+        }
+        if ($realpath === false && ($path[0] == '/' || $path[1] == ':')) {
+            $path = str_ireplace(getcwd(), '.', $path);
+        }
+        return $path;
     }
 
     /**
-     * Get autoload filters
-     *
-     * @param  string $type type of filter to get autoloads for. Defaults to all autoload filters
-     *
-     * @return array  array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified
+     * @param boolean $compile_check
      */
-    public function getAutoloadFilters($type = null)
+    public function setCompileCheck($compile_check)
     {
-        if ($type !== null) {
-            return isset($this->autoload_filters[$type]) ? $this->autoload_filters[$type] : array();
-        }
+        $this->compile_check = $compile_check;
+    }
 
-        return $this->autoload_filters;
+    /**
+     * @param boolean $use_sub_dirs
+     */
+    public function setUseSubDirs($use_sub_dirs)
+    {
+        $this->use_sub_dirs = $use_sub_dirs;
     }
 
     /**
-     * return name of debugging template
-     *
-     * @return string
+     * @param int $error_reporting
      */
-    public function getDebugTemplate()
+    public function setErrorReporting($error_reporting)
     {
-        return $this->debug_tpl;
+        $this->error_reporting = $error_reporting;
     }
 
     /**
-     * set the debug template
-     *
-     * @param  string $tpl_name
-     *
-     * @return Smarty          current Smarty instance for chaining
-     * @throws SmartyException if file is not readable
+     * @param boolean $escape_html
      */
-    public function setDebugTemplate($tpl_name)
+    public function setEscapeHtml($escape_html)
     {
-        if (!is_readable($tpl_name)) {
-            throw new SmartyException("Unknown file '{$tpl_name}'");
-        }
-        $this->debug_tpl = $tpl_name;
+        $this->escape_html = $escape_html;
+    }
 
-        return $this;
+    /**
+     * @param boolean $auto_literal
+     */
+    public function setAutoLiteral($auto_literal)
+    {
+        $this->auto_literal = $auto_literal;
     }
 
     /**
-     * creates a template object
-     *
-     * @param  string  $template   the resource handle of the template file
-     * @param  mixed   $cache_id   cache id to be used with this template
-     * @param  mixed   $compile_id compile id to be used with this template
-     * @param  object  $parent     next higher level of Smarty variables
-     * @param  boolean $do_clone   flag is Smarty object shall be cloned
-     *
-     * @return object  template object
+     * @param boolean $force_compile
      */
-    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
+    public function setForceCompile($force_compile)
     {
-        if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) {
-            $parent = $cache_id;
-            $cache_id = null;
-        }
-        if ($parent !== null && is_array($parent)) {
-            $data = $parent;
-            $parent = null;
-        } else {
-            $data = null;
-        }
-        // default to cache_id and compile_id of Smarty object
-        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
-        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
-        // already in template cache?
-        if ($this->allow_ambiguous_resources) {
-            $_templateId = Smarty_Resource::getUniqueTemplateName($this, $template) . $cache_id . $compile_id;
-        } else {
-            $_templateId = $this->joined_template_dir . '#' . $template . $cache_id . $compile_id;
-        }
-        if (isset($_templateId[150])) {
-            $_templateId = sha1($_templateId);
-        }
-        if ($do_clone) {
-            if (isset($this->template_objects[$_templateId])) {
-                // return cached template object
-                $tpl = clone $this->template_objects[$_templateId];
-                $tpl->smarty = clone $tpl->smarty;
-                $tpl->parent = $parent;
-                $tpl->tpl_vars = array();
-                $tpl->config_vars = array();
-            } else {
-                $tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id);
-            }
-        } else {
-            if (isset($this->template_objects[$_templateId])) {
-                // return cached template object
-                $tpl = $this->template_objects[$_templateId];
-                $tpl->parent = $parent;
-                $tpl->tpl_vars = array();
-                $tpl->config_vars = array();
-            } else {
-                $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
-            }
-        }
-        // fill data if present
-        if (!empty($data) && is_array($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        }
+        $this->force_compile = $force_compile;
+    }
 
-        return $tpl;
+    /**
+     * @param boolean $merge_compiled_includes
+     */
+    public function setMergeCompiledIncludes($merge_compiled_includes)
+    {
+        $this->merge_compiled_includes = $merge_compiled_includes;
     }
 
     /**
-     * Takes unknown classes and loads plugin files for them
-     * class name format: Smarty_PluginType_PluginName
-     * plugin filename format: plugintype.pluginname.php
-     *
-     * @param  string $plugin_name class plugin name to load
-     * @param  bool   $check       check if already loaded
-     *
-     * @throws SmartyException
-     * @return string |boolean filepath of loaded file or false
+     * @param string $left_delimiter
      */
-    public function loadPlugin($plugin_name, $check = true)
+    public function setLeftDelimiter($left_delimiter)
     {
-        // if function or class exists, exit silently (already loaded)
-        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
-            return true;
-        }
-        // Plugin name is expected to be: Smarty_[Type]_[Name]
-        $_name_parts = explode('_', $plugin_name, 3);
-        // class name must have three parts to be valid plugin
-        // count($_name_parts) < 3 === !isset($_name_parts[2])
-        if (!isset($_name_parts[2]) || strtolower($_name_parts[0]) !== 'smarty') {
-            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
-        }
-        // if type is "internal", get plugin from sysplugins
-        if (strtolower($_name_parts[1]) == 'internal') {
-            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
-            if (isset(self::$_is_file_cache[$file]) ? self::$_is_file_cache[$file] : self::$_is_file_cache[$file] = is_file($file)) {
-                require_once($file);
-                return $file;
-            } else {
-                return false;
-            }
-        }
-        // plugin filename is expected to be: [type].[name].php
-        $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php";
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // loop through plugin dirs and find the plugin
-        foreach ($this->getPluginsDir() as $_plugin_dir) {
-            $names = array(
-                $_plugin_dir . $_plugin_filename,
-                $_plugin_dir . strtolower($_plugin_filename),
-            );
-            foreach ($names as $file) {
-                if (isset(self::$_is_file_cache[$file]) ? self::$_is_file_cache[$file] : self::$_is_file_cache[$file] = is_file($file)) {
-                    require_once($file);
-                    return $file;
-                }
-                if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $file = stream_resolve_include_path($file);
-                    } else {
-                        $file = Smarty_Internal_Get_Include_Path::getIncludePath($file);
-                    }
-
-                    if ($file !== false) {
-                        require_once($file);
-
-                        return $file;
-                    }
-                }
-            }
-        }
-        // no plugin loaded
-        return false;
+        $this->left_delimiter = $left_delimiter;
     }
 
     /**
-     * Compile all template files
-     *
-     * @param  string $extension     file extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit
-     * @param  int    $max_errors
-     *
-     * @return integer number of template files recompiled
+     * @param string $right_delimiter
      */
-    public function compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
+    public function setRightDelimiter($right_delimiter)
     {
-        return Smarty_Internal_Utility::compileAllTemplates($extension, $force_compile, $time_limit, $max_errors, $this);
+        $this->right_delimiter = $right_delimiter;
     }
 
     /**
-     * Compile all config files
-     *
-     * @param  string $extension     file extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit
-     * @param  int    $max_errors
-     *
-     * @return integer number of template files recompiled
+     * @param boolean $debugging
      */
-    public function compileAllConfig($extension = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
+    public function setDebugging($debugging)
     {
-        return Smarty_Internal_Utility::compileAllConfig($extension, $force_compile, $time_limit, $max_errors, $this);
+        $this->debugging = $debugging;
     }
 
     /**
-     * Delete compiled template file
-     *
-     * @param  string  $resource_name template name
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time
+     * @param boolean $config_overwrite
+     */
+    public function setConfigOverwrite($config_overwrite)
+    {
+        $this->config_overwrite = $config_overwrite;
+    }
+
+    /**
+     * @param boolean $config_booleanize
+     */
+    public function setConfigBooleanize($config_booleanize)
+    {
+        $this->config_booleanize = $config_booleanize;
+    }
+
+    /**
+     * @param boolean $config_read_hidden
+     */
+    public function setConfigReadHidden($config_read_hidden)
+    {
+        $this->config_read_hidden = $config_read_hidden;
+    }
+
+    /**
+     * @param boolean $compile_locking
+     */
+    public function setCompileLocking($compile_locking)
+    {
+        $this->compile_locking = $compile_locking;
+    }
+
+    /**
+     * @param string $default_resource_type
+     */
+    public function setDefaultResourceType($default_resource_type)
+    {
+        $this->default_resource_type = $default_resource_type;
+    }
+
+    /**
+     * @param string $caching_type
+     */
+    public function setCachingType($caching_type)
+    {
+        $this->caching_type = $caching_type;
+    }
+
+    /**
+     * Test install
      *
-     * @return integer number of template files deleted
+     * @param null $errors
      */
-    public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
+    public function testInstall(&$errors = null)
+    {
+        Smarty_Internal_TestInstall::testInstall($this, $errors);
+    }
+
+    /**
+     * Class destructor
+     */
+    public function __destruct()
     {
-        return Smarty_Internal_Utility::clearCompiledTemplate($resource_name, $compile_id, $exp_time, $this);
+        $i = 0;// intentionally left blank
     }
 
     /**
-     * Return array of tag/attributes of all tags used by an template
+     * <<magic>> Generic getter.
+     * Calls the appropriate getter function.
+     * Issues an E_USER_NOTICE if no valid getter is found.
      *
-     * @param Smarty_Internal_Template $template
+     * @param  string $name property name
      *
-     * @return array  of tag/attributes
+     * @return mixed
      */
-    public function getTags(Smarty_Internal_Template $template)
+    public function __get($name)
     {
-        return Smarty_Internal_Utility::getTags($template);
+
+        if (isset(self::$accessMap[$name])) {
+            return $this->{self::$accessMap[$name]}();
+        } elseif (in_array($name, self::$obsoleteProperties)) {
+            return null;
+        } else {
+            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        }
     }
 
     /**
-     * Run installation test
-     *
-     * @param  array $errors Array to write errors into, rather than outputting them
+     * <<magic>> Generic setter.
+     * Calls the appropriate setter function.
+     * Issues an E_USER_NOTICE if no valid setter is found.
      *
-     * @return boolean true if setup is fine, false if something is wrong
+     * @param string $name  property name
+     * @param mixed  $value parameter passed to setter
      */
-    public function testInstall(&$errors = null)
+    public function __set($name, $value)
     {
-        return Smarty_Internal_Utility::testInstall($this, $errors);
+        if (isset(self::$accessMap[$name])) {
+            $this->{self::$accessMap[$name]}($value);
+        } elseif (in_array($name, self::$obsoleteProperties)) {
+            return;
+        } else {
+            if (is_object($value) && method_exists($value, $name)) {
+                $this->$name = $value;
+            } else {
+                trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+            }
+        }
     }
 
     /**
@@ -1512,10 +1396,8 @@ class Smarty extends Smarty_Internal_TemplateBase
         if (!isset(Smarty::$_muted_directories[SMARTY_DIR])) {
             $smarty_dir = realpath(SMARTY_DIR);
             if ($smarty_dir !== false) {
-                Smarty::$_muted_directories[SMARTY_DIR] = array(
-                    'file'   => $smarty_dir,
-                    'length' => strlen($smarty_dir),
-                );
+                Smarty::$_muted_directories[SMARTY_DIR] =
+                    array('file' => $smarty_dir, 'length' => strlen($smarty_dir),);
             }
         }
 
@@ -1529,10 +1411,7 @@ class Smarty extends Smarty_Internal_TemplateBase
                     unset(Smarty::$_muted_directories[$key]);
                     continue;
                 }
-                $dir = array(
-                    'file'   => $file,
-                    'length' => strlen($file),
-                );
+                $dir = array('file' => $file, 'length' => strlen($file),);
             }
             if (!strncmp($errfile, $dir['file'], $dir['length'])) {
                 $_is_muted_directory = true;
@@ -1544,7 +1423,8 @@ class Smarty extends Smarty_Internal_TemplateBase
         // or the error was within smarty but masked to be ignored
         if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
             if (Smarty::$_previous_error_handler) {
-                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline, $errcontext);
+                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline,
+                                      $errcontext);
             } else {
                 return false;
             }
@@ -1593,88 +1473,3 @@ class Smarty extends Smarty_Internal_TemplateBase
         restore_error_handler();
     }
 }
-
-// Check if we're running on windows
-Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
-
-// let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
-if (Smarty::$_CHARSET !== 'UTF-8') {
-    Smarty::$_UTF8_MODIFIER = '';
-}
-
-/**
- * Smarty exception class
- *
- * @package Smarty
- */
-class SmartyException extends Exception
-{
-    public static $escape = false;
-
-    public function __toString()
-    {
-        return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- ';
-    }
-}
-
-/**
- * Smarty compiler exception class
- *
- * @package Smarty
- */
-class SmartyCompilerException extends SmartyException
-{
-    public function __toString()
-    {
-        return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
-    }
-
-    /**
-     * The line number of the template error
-     *
-     * @type int|null
-     */
-    public $line = null;
-    /**
-     * The template source snippet relating to the error
-     *
-     * @type string|null
-     */
-    public $source = null;
-    /**
-     * The raw text of the error message
-     *
-     * @type string|null
-     */
-    public $desc = null;
-    /**
-     * The resource identifier or template name
-     *
-     * @type string|null
-     */
-    public $template = null;
-}
-
-/**
- * Autoloader
- */
-function smartyAutoload($class)
-{
-    $_class = strtolower($class);
-    static $_classes = array(
-        'smarty_config_source'               => true,
-        'smarty_config_compiled'             => true,
-        'smarty_security'                    => true,
-        'smarty_cacheresource'               => true,
-        'smarty_cacheresource_custom'        => true,
-        'smarty_cacheresource_keyvaluestore' => true,
-        'smarty_resource'                    => true,
-        'smarty_resource_custom'             => true,
-        'smarty_resource_uncompiled'         => true,
-        'smarty_resource_recompiled'         => true,
-    );
-
-    if (!strncmp($_class, 'smarty_internal_', 16) || isset($_classes[$_class])) {
-        include SMARTY_SYSPLUGINS_DIR . $_class . '.php';
-    }
-}
diff --git a/library/Smarty/libs/SmartyBC.class.php b/library/Smarty/libs/SmartyBC.class.php
index cec946746..1dd529c9c 100644
--- a/library/Smarty/libs/SmartyBC.class.php
+++ b/library/Smarty/libs/SmartyBC.class.php
@@ -45,6 +45,13 @@ class SmartyBC extends Smarty
     public $_version = self::SMARTY_VERSION;
 
     /**
+     * This is an array of directories where trusted php scripts reside.
+     *
+     * @var array
+     */
+    public $trusted_dir = array();
+
+    /**
      * Initialize new SmartyBC object
      *
      * @param array $options options to set during initialization, e.g. array( 'forceCompile' => false )
@@ -52,8 +59,6 @@ class SmartyBC extends Smarty
     public function __construct(array $options = array())
     {
         parent::__construct($options);
-        // register {php} tag
-        $this->registerPlugin('block', 'php', 'smarty_php_tag');
     }
 
     /**
@@ -115,10 +120,10 @@ class SmartyBC extends Smarty
     /**
      * Registers object to be used in templates
      *
-     * @param string  $object      name of template object
-     * @param object  $object_impl the referenced PHP object to register
-     * @param array   $allowed     list of allowed methods (empty = all)
-     * @param boolean $smarty_args smarty argument format, else traditional
+     * @param string  $object        name of template object
+     * @param object  $object_impl   the referenced PHP object to register
+     * @param array   $allowed       list of allowed methods (empty = all)
+     * @param boolean $smarty_args   smarty argument format, else traditional
      * @param array   $block_methods list of methods that are block format
      *
      * @throws SmartyException
@@ -448,20 +453,3 @@ class SmartyBC extends Smarty
         trigger_error("Smarty error: $error_msg", $error_type);
     }
 }
-
-/**
- * Smarty {php}{/php} block function
- *
- * @param array   $params   parameter list
- * @param string  $content  contents of the block
- * @param object  $template template object
- * @param boolean &$repeat  repeat flag
- *
- * @return string content re-formatted
- */
-function smarty_php_tag($params, $content, $template, &$repeat)
-{
-    eval($content);
-
-    return '';
-}
diff --git a/library/Smarty/libs/debug.tpl b/library/Smarty/libs/debug.tpl
index 61b8876a4..5526cbca8 100644
--- a/library/Smarty/libs/debug.tpl
+++ b/library/Smarty/libs/debug.tpl
@@ -5,7 +5,7 @@
         <title>Smarty Debug Console</title>
         <style type="text/css">
             {literal}
-            body, h1, h2, td, th, p {
+            body, h1, h2, h3, td, th, p {
                 font-family: sans-serif;
                 font-weight: normal;
                 font-size: 0.9em;
@@ -31,6 +31,13 @@
                 padding: 2px;
                 border-top: 1px solid black;
             }
+            h3 {
+                text-align: left;
+                font-weight: bold;
+                color: black;
+                font-size: 0.7em;
+                padding: 2px;
+            }
 
             body {
                 background: black;
@@ -54,7 +61,6 @@
                 font-family: monospace;
                 vertical-align: top;
                 text-align: left;
-                width: 50%;
             }
 
             td {
@@ -74,8 +80,20 @@
                 font-style: italic;
             }
 
+            #bold div {
+                color: black;
+                font-weight: bold;
+            }
+            #blue h3 {
+                color: blue;
+            }
+            #normal div {
+                color: black;
+                font-weight: normal;
+            }
             #table_assigned_vars th {
                 color: blue;
+                font-weight: bold;
             }
 
             #table_config_vars th {
@@ -87,18 +105,17 @@
     </head>
     <body>
 
-    <h1>Smarty Debug Console
-        -  {if isset($template_name)}{$template_name|debug_print_var nofilter}{else}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
+    <h1>Smarty {Smarty::SMARTY_VERSION} Debug Console
+        -  {if isset($template_name)}{$template_name|debug_print_var nofilter} {/if}{if !empty($template_data)}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
 
     {if !empty($template_data)}
         <h2>included templates &amp; config files (load time in seconds)</h2>
         <div>
             {foreach $template_data as $template}
                 <font color=brown>{$template.name}</font>
-                <span class="exectime">
-   (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"}
-                    )
-  </span>
+                <br>&nbsp;&nbsp;<span class="exectime">
+                (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
+                 </span>
                 <br>
             {/foreach}
         </div>
@@ -109,19 +126,24 @@
     <table id="table_assigned_vars">
         {foreach $assigned_vars as $vars}
             <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-                <th>${$vars@key|escape:'html'}</th>
-                <td>{$vars|debug_print_var nofilter}</td>
-            </tr>
-        {/foreach}
+                <td><h3><font color=blue>${$vars@key}</font></h3>
+                    {if isset($vars['nocache'])}<b>Nocache</b></br>{/if}
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td><h3>Value</h3>{$vars['value']|debug_print_var:10:80 nofilter}</td>
+                <td>{if isset($vars['attributes'])}<h3>Attributes</h3>{$vars['attributes']|debug_print_var nofilter} {/if}</td>
+         {/foreach}
     </table>
 
-    <h2>assigned config file variables (outer template scope)</h2>
+    <h2>assigned config file variables</h2>
 
     <table id="table_config_vars">
         {foreach $config_vars as $vars}
             <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-                <th>{$vars@key|escape:'html'}</th>
-                <td>{$vars|debug_print_var nofilter}</td>
+                <td><h3><font color=blue>#{$vars@key}#</font></h3>
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
             </tr>
         {/foreach}
 
@@ -130,8 +152,9 @@
     </html>
 {/capture}
 <script type="text/javascript">
-    {$id = $template_name|default:''|md5}
-    _smarty_console = window.open("", "console{$id}", "width=680,height=600,resizable,scrollbars=yes");
+    {$id = '__Smarty__'}
+    {if $display_mode}{$id = "$offset$template_name"|md5}{/if}
+    _smarty_console = window.open("", "console{$id}", "width=1024,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
     _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
     _smarty_console.document.close();
 </script>
diff --git a/library/Smarty/libs/plugins/modifier.date_format.php b/library/Smarty/libs/plugins/modifier.date_format.php
index 5ad7540b1..28d6ff021 100644
--- a/library/Smarty/libs/plugins/modifier.date_format.php
+++ b/library/Smarty/libs/plugins/modifier.date_format.php
@@ -33,7 +33,7 @@ function smarty_modifier_date_format($string, $format = null, $default_date = ''
         $format = Smarty::$_DATE_FORMAT;
     }
     /**
-     * Include the {@link shared.make_timestamp.php} plugin
+     * require_once the {@link shared.make_timestamp.php} plugin
      */
     require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
     if ($string != '' && $string != '0000-00-00' && $string != '0000-00-00 00:00:00') {
diff --git a/library/Smarty/libs/plugins/modifier.debug_print_var.php b/library/Smarty/libs/plugins/modifier.debug_print_var.php
index 66363d253..4ff8213ce 100644
--- a/library/Smarty/libs/plugins/modifier.debug_print_var.php
+++ b/library/Smarty/libs/plugins/modifier.debug_print_var.php
@@ -14,26 +14,30 @@
  *
  * @author Monte Ohrt <monte at ohrt dot com>
  *
- * @param array|object $var    variable to be formatted
- * @param integer      $depth  maximum recursion depth if $var is an array
- * @param integer      $length maximum string length if $var is a string
+ * @param array|object $var     variable to be formatted
+ * @param int          $max     maximum recursion depth if $var is an array or object
+ * @param int          $length  maximum string length if $var is a string
+ * @param int          $depth   actual recursion depth
+ * @param array        $objects processed objects in actual depth to prevent recursive object processing
  *
  * @return string
  */
-function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)
+function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
 {
-    $_replace = array("\n" => '<i>\n</i>',
-                      "\r" => '<i>\r</i>',
-                      "\t" => '<i>\t</i>'
+    $_replace = array("\n" => '\n',
+                      "\r" => '\r',
+                      "\t" => '\t'
     );
-
     switch (gettype($var)) {
         case 'array' :
             $results = '<b>Array (' . count($var) . ')</b>';
+            if ($depth == $max) {
+                break;
+            }
             foreach ($var as $curr_key => $curr_val) {
                 $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
                     . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
-                    . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
+                    . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
                 $depth --;
             }
             break;
@@ -41,10 +45,18 @@ function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)
         case 'object' :
             $object_vars = get_object_vars($var);
             $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
+            if (in_array($var, $objects)) {
+                $results .= ' called recursive';
+                break;
+            }
+            if ($depth == $max) {
+                break;
+            }
+            $objects[] = $var;
             foreach ($object_vars as $curr_key => $curr_val) {
                 $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
                     . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
-                    . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
+                    . smarty_modifier_debug_print_var($curr_val, $max, $length, ++ $depth, $objects);
                 $depth --;
             }
             break;
diff --git a/library/Smarty/libs/plugins/modifier.regex_replace.php b/library/Smarty/libs/plugins/modifier.regex_replace.php
index abb1ff548..ffea16755 100644
--- a/library/Smarty/libs/plugins/modifier.regex_replace.php
+++ b/library/Smarty/libs/plugins/modifier.regex_replace.php
@@ -19,10 +19,11 @@
  * @param string       $string  input string
  * @param string|array $search  regular expression(s) to search for
  * @param string|array $replace string(s) that should be replaced
+ * @param int          $limit   the maximum number of replacements
  *
  * @return string
  */
-function smarty_modifier_regex_replace($string, $search, $replace)
+function smarty_modifier_regex_replace($string, $search, $replace, $limit = -1)
 {
     if (is_array($search)) {
         foreach ($search as $idx => $s) {
@@ -32,7 +33,7 @@ function smarty_modifier_regex_replace($string, $search, $replace)
         $search = _smarty_regex_replace_check($search);
     }
 
-    return preg_replace($search, $replace, $string);
+    return preg_replace($search, $replace, $string, $limit);
 }
 
 /**
diff --git a/library/Smarty/libs/plugins/modifiercompiler.escape.php b/library/Smarty/libs/plugins/modifiercompiler.escape.php
index 7e848aaec..0b29220ef 100644
--- a/library/Smarty/libs/plugins/modifiercompiler.escape.php
+++ b/library/Smarty/libs/plugins/modifiercompiler.escape.php
@@ -115,11 +115,11 @@ function smarty_modifiercompiler_escape($params, $compiler)
 
     // could not optimize |escape call, so fallback to regular plugin
     if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
-        $compiler->template->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
-        $compiler->template->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
+        $compiler->parent_compiler->template->compiled->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+        $compiler->parent_compiler->template->compiled->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
     } else {
-        $compiler->template->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
-        $compiler->template->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
+        $compiler->parent_compiler->template->compiled->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+        $compiler->parent_compiler->template->compiled->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
     }
 
     return 'smarty_modifier_escape(' . join(', ', $params) . ')';
diff --git a/library/Smarty/libs/plugins/modifiercompiler.strip_tags.php b/library/Smarty/libs/plugins/modifiercompiler.strip_tags.php
index 3e6e13048..da5d364cb 100644
--- a/library/Smarty/libs/plugins/modifiercompiler.strip_tags.php
+++ b/library/Smarty/libs/plugins/modifiercompiler.strip_tags.php
@@ -12,7 +12,7 @@
  * Name:     strip_tags<br>
  * Purpose:  strip html tags from text
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
+ * @link   http://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
  * @author Uwe Tews
  *
  * @param array $params parameters
diff --git a/library/Smarty/libs/plugins/modifiercompiler.wordwrap.php b/library/Smarty/libs/plugins/modifiercompiler.wordwrap.php
index 2ad928ea1..6bb63247d 100644
--- a/library/Smarty/libs/plugins/modifiercompiler.wordwrap.php
+++ b/library/Smarty/libs/plugins/modifiercompiler.wordwrap.php
@@ -34,11 +34,11 @@ function smarty_modifiercompiler_wordwrap($params, $compiler)
     $function = 'wordwrap';
     if (Smarty::$_MBSTRING) {
         if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
-            $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
+            $compiler->parent_compiler->template->compiled->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
             $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
         } else {
-            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
-            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
+            $compiler->parent_compiler->template->compiled->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
+            $compiler->parent_compiler->template->compiled->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
         }
         $function = 'smarty_mb_wordwrap';
     }
diff --git a/library/Smarty/libs/plugins/outputfilter.trimwhitespace.php b/library/Smarty/libs/plugins/outputfilter.trimwhitespace.php
index 62ab4e776..ad35d11a2 100644
--- a/library/Smarty/libs/plugins/outputfilter.trimwhitespace.php
+++ b/library/Smarty/libs/plugins/outputfilter.trimwhitespace.php
@@ -45,7 +45,7 @@ function smarty_outputfilter_trimwhitespace($source)
 
     // capture html elements not to be messed with
     $_offset = 0;
-    if (preg_match_all('#<(script|pre|textarea)[^>]*>.*?</\\1>#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+    if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
         foreach ($matches as $match) {
             $store[] = $match[0][0];
             $_length = strlen($match[0][0]);
@@ -62,7 +62,7 @@ function smarty_outputfilter_trimwhitespace($source)
         // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
         '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s'                            => '\1 \2',
         // remove spaces between attributes (but not in attribute values!)
-        '#(([a-z0-9]\s*=\s*(["\'])[^\3]*?\3)|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \4',
+        '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
         // note: for some very weird reason trim() seems to remove spaces inside attributes.
         // maybe a \0 byte or something is interfering?
         '#^\s+<#Ss'                                                       => '<',
diff --git a/library/Smarty/libs/plugins/shared.make_timestamp.php b/library/Smarty/libs/plugins/shared.make_timestamp.php
index 7c94e5f59..f87d40c7e 100644
--- a/library/Smarty/libs/plugins/shared.make_timestamp.php
+++ b/library/Smarty/libs/plugins/shared.make_timestamp.php
@@ -21,8 +21,8 @@ function smarty_make_timestamp($string)
     if (empty($string)) {
         // use "now":
         return time();
-    } elseif ($string instanceof DateTime) {
-        return $string->getTimestamp();
+    } elseif ($string instanceof DateTime || (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)) {
+        return (int) $string->format('U'); // PHP 5.2 BC
     } elseif (strlen($string) == 14 && ctype_digit($string)) {
         // it is mysql timestamp format of YYYYMMDDHHMMSS?
         return mktime(substr($string, 8, 2), substr($string, 10, 2), substr($string, 12, 2),
diff --git a/library/Smarty/libs/sysplugins/smarty_cacheresource.php b/library/Smarty/libs/sysplugins/smarty_cacheresource.php
index 667bee44f..8cd2805a5 100644
--- a/library/Smarty/libs/sysplugins/smarty_cacheresource.php
+++ b/library/Smarty/libs/sysplugins/smarty_cacheresource.php
@@ -16,20 +16,11 @@
 abstract class Smarty_CacheResource
 {
     /**
-     * cache for Smarty_CacheResource instances
-     *
-     * @var array
-     */
-    public static $resources = array();
-
-    /**
      * resource types provided by the core
      *
      * @var array
      */
-    protected static $sysplugins = array(
-        'file' => true,
-    );
+    protected static $sysplugins = array('file' => 'smarty_internal_cacheresource_file.php',);
 
     /**
      * populate Cached Object with meta data from Resource
@@ -55,10 +46,11 @@ abstract class Smarty_CacheResource
      *
      * @param Smarty_Internal_Template $_template template object
      * @param Smarty_Template_Cached   $cached    cached object
+     * @param bool                     $update    flag if called because cache update
      *
-     * @return boolean true or false if the cached content does not exist
+     * @return bool true or false if the cached content does not exist
      */
-    abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null);
+    abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false);
 
     /**
      * Write the rendered template output to cache
@@ -81,8 +73,8 @@ abstract class Smarty_CacheResource
     {
         if ($_template->cached->handler->process($_template)) {
             ob_start();
-            $_template->properties['unifunc']($_template);
-
+            $unifunc = $_template->cached->unifunc;
+            $unifunc($_template);
             return ob_get_clean();
         }
 
@@ -193,32 +185,24 @@ abstract class Smarty_CacheResource
         }
 
         // try smarty's cache
-        if (isset($smarty->_cacheresource_handlers[$type])) {
-            return $smarty->_cacheresource_handlers[$type];
+        if (isset($smarty->_cache['cacheresource_handlers'][$type])) {
+            return $smarty->_cache['cacheresource_handlers'][$type];
         }
 
         // try registered resource
         if (isset($smarty->registered_cache_resources[$type])) {
             // do not cache these instances as they may vary from instance to instance
-            return $smarty->_cacheresource_handlers[$type] = $smarty->registered_cache_resources[$type];
+            return $smarty->_cache['cacheresource_handlers'][$type] = $smarty->registered_cache_resources[$type];
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[$type])) {
-            if (!isset(self::$resources[$type])) {
-                $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
-                self::$resources[$type] = new $cache_resource_class();
-            }
-
-            return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
+            $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
+            return $smarty->_cache['cacheresource_handlers'][$type] = new $cache_resource_class();
         }
         // try plugins dir
         $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
         if ($smarty->loadPlugin($cache_resource_class)) {
-            if (!isset(self::$resources[$type])) {
-                self::$resources[$type] = new $cache_resource_class();
-            }
-
-            return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
+            return $smarty->_cache['cacheresource_handlers'][$type] = new $cache_resource_class();
         }
         // give up
         throw new SmartyException("Unable to load cache resource '{$type}'");
@@ -229,214 +213,14 @@ abstract class Smarty_CacheResource
      *
      * @param Smarty $smarty Smarty object
      */
-    public static function invalidLoadedCache(Smarty $smarty)
-    {
-        foreach ($smarty->template_objects as $tpl) {
-            if (isset($tpl->cached)) {
-                $tpl->cached->valid = false;
-                $tpl->cached->processed = false;
-            }
-        }
-    }
-}
-
-/**
- * Smarty Resource Data Object
- * Cache Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-class Smarty_Template_Cached
-{
-    /**
-     * Source Filepath
-     *
-     * @var string
-     */
-    public $filepath = false;
-
-    /**
-     * Source Content
-     *
-     * @var string
-     */
-    public $content = null;
-
-    /**
-     * Source Timestamp
-     *
-     * @var integer
-     */
-    public $timestamp = false;
-
-    /**
-     * Source Existence
-     *
-     * @var boolean
-     */
-    public $exists = false;
-
-    /**
-     * Cache Is Valid
-     *
-     * @var boolean
-     */
-    public $valid = false;
-
-    /**
-     * Cache was processed
-     *
-     * @var boolean
-     */
-    public $processed = false;
-
-    /**
-     * CacheResource Handler
-     *
-     * @var Smarty_CacheResource
-     */
-    public $handler = null;
-
-    /**
-     * Template Compile Id (Smarty_Internal_Template::$compile_id)
-     *
-     * @var string
-     */
-    public $compile_id = null;
-
-    /**
-     * Template Cache Id (Smarty_Internal_Template::$cache_id)
-     *
-     * @var string
-     */
-    public $cache_id = null;
-
-    /**
-     * Id for cache locking
-     *
-     * @var string
-     */
-    public $lock_id = null;
-
-    /**
-     * flag that cache is locked by this instance
-     *
-     * @var bool
-     */
-    public $is_locked = false;
-
-    /**
-     * Source Object
-     *
-     * @var Smarty_Template_Source
-     */
-    public $source = null;
-
-    /**
-     * create Cached Object container
-     *
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function __construct(Smarty_Internal_Template $_template)
+    public function invalidLoadedCache(Smarty $smarty)
     {
-        $this->compile_id = $_template->compile_id;
-        $this->cache_id = $_template->cache_id;
-        $this->source = $_template->source;
-        $_template->cached = $this;
-        $smarty = $_template->smarty;
-
-        //
-        // load resource handler
-        //
-        $this->handler = $handler = Smarty_CacheResource::load($smarty); // Note: prone to circular references
-
-        //
-        //    check if cache is valid
-        //
-        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->recompiled) {
-            $handler->populate($this, $_template);
-
-            return;
-        }
-        while (true) {
-            while (true) {
-                $handler->populate($this, $_template);
-                if ($this->timestamp === false || $smarty->force_compile || $smarty->force_cache) {
-                    $this->valid = false;
-                } else {
-                    $this->valid = true;
-                }
-                if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)) {
-                    // lifetime expired
-                    $this->valid = false;
-                }
-                if ($this->valid || !$_template->smarty->cache_locking) {
-                    break;
-                }
-                if (!$this->handler->locked($_template->smarty, $this)) {
-                    $this->handler->acquireLock($_template->smarty, $this);
-                    break 2;
+        if (isset($smarty->_cache['template_objects'])) {
+            foreach ($smarty->_cache['template_objects'] as $key => $tpl) {
+                if (isset($tpl->cached)) {
+                    unset ($smarty->_cache['template_objects'][$key]);
                 }
             }
-            if ($this->valid) {
-                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
-                    // load cache file for the following checks
-                    if ($smarty->debugging) {
-                        Smarty_Internal_Debug::start_cache($_template);
-                    }
-                    if ($handler->process($_template, $this) === false) {
-                        $this->valid = false;
-                    } else {
-                        $this->processed = true;
-                    }
-                    if ($smarty->debugging) {
-                        Smarty_Internal_Debug::end_cache($_template);
-                    }
-                } else {
-                    continue;
-                }
-            } else {
-                return;
-            }
-            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->properties['cache_lifetime'] >= 0 && (time() > ($_template->cached->timestamp + $_template->properties['cache_lifetime']))) {
-                $this->valid = false;
-            }
-            if (!$this->valid && $_template->smarty->cache_locking) {
-                $this->handler->acquireLock($_template->smarty, $this);
-
-                return;
-            } else {
-                return;
-            }
         }
     }
-
-    /**
-     * Write this cache object to handler
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $content   content to cache
-     *
-     * @return boolean success
-     */
-    public function write(Smarty_Internal_Template $_template, $content)
-    {
-        if (!$_template->source->recompiled) {
-            if ($this->handler->writeCachedContent($_template, $content)) {
-                $this->content = null;
-                $this->timestamp = time();
-                $this->exists = true;
-                $this->valid = true;
-                if ($_template->smarty->cache_locking) {
-                    $this->handler->releaseLock($_template->smarty, $this);
-                }
-
-                return true;
-            }
-        }
-
-        return false;
-    }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_cacheresource_custom.php b/library/Smarty/libs/sysplugins/smarty_cacheresource_custom.php
index a258b2de7..4e9606ef1 100644
--- a/library/Smarty/libs/sysplugins/smarty_cacheresource_custom.php
+++ b/library/Smarty/libs/sysplugins/smarty_cacheresource_custom.php
@@ -83,9 +83,12 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
     {
         $_cache_id = isset($cached->cache_id) ? preg_replace('![^\w\|]+!', '_', $cached->cache_id) : null;
-        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w\|]+!', '_', $cached->compile_id) : null;
-
-        $cached->filepath = sha1($cached->source->filepath . $_cache_id . $_compile_id);
+        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w]+!', '_', $cached->compile_id) : null;
+        $path = $cached->source->filepath . $_cache_id . $_compile_id;
+        $cached->filepath = sha1($path);
+        if ($_template->smarty->cache_locking) {
+            $cached->lock_id = sha1('lock.' . $path);
+        }
         $this->populateTimestamp($cached);
     }
 
@@ -116,10 +119,11 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
      *
      * @param  Smarty_Internal_Template $_template template object
      * @param  Smarty_Template_Cached   $cached    cached object
+     * @param bool                      $update    flag if called because cache update
      *
      * @return boolean                 true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null)
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false)
     {
         if (!$cached) {
             $cached = $_template->cached;
@@ -127,14 +131,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
         $content = $cached->content ? $cached->content : null;
         $timestamp = $cached->timestamp ? $cached->timestamp : null;
         if ($content === null || !$timestamp) {
-            $this->fetch(
-                $_template->cached->filepath,
-                $_template->source->name,
-                $_template->cache_id,
-                $_template->compile_id,
-                $content,
-                $timestamp
-            );
+            $this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp);
         }
         if (isset($content)) {
             /** @var Smarty_Internal_Template $_smarty_tpl
@@ -142,7 +139,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
              */
             $_smarty_tpl = $_template;
             eval("?>" . $content);
-
+            $cached->content = null;
             return true;
         }
 
@@ -159,14 +156,28 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
      */
     public function writeCachedContent(Smarty_Internal_Template $_template, $content)
     {
-        return $this->save(
-            $_template->cached->filepath,
-            $_template->source->name,
-            $_template->cache_id,
-            $_template->compile_id,
-            $_template->properties['cache_lifetime'],
-            $content
-        );
+        return $this->save($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $_template->cache_lifetime, $content);
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        $content = $_template->cached->content ? $_template->cached->content : null;
+        $timestamp = null;
+        if ($content === null) {
+            $timestamp = null;
+            $this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp);
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
     }
 
     /**
@@ -179,8 +190,6 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
      */
     public function clearAll(Smarty $smarty, $exp_time = null)
     {
-        $this->cache = array();
-
         return $this->delete(null, null, null, $exp_time);
     }
 
@@ -197,32 +206,23 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
      */
     public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {
-        $this->cache = array();
         $cache_name = null;
 
         if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = true;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-
-            if ($tpl->source->exists) {
-                $cache_name = $tpl->source->name;
+            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                $cache_name = $source->name;
             } else {
                 return 0;
             }
             // remove from template cache
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
+            if (isset($smarty->_cache['template_objects'])) {
+                foreach ($smarty->_cache['template_objects'] as $key => $_tpl) {
+                    if (isset($_tpl->cached) && $_tpl->source->uid == $source->uid) {
+                        unset($smarty->_cache['template_objects'][$key]);
+                    }
+                }
             }
-            unset($smarty->template_objects[$_templateId]);
-            // template object no longer needed
-            unset($tpl);
         }
 
         return $this->delete($cache_name, $cache_id, $compile_id, $exp_time);
@@ -238,15 +238,14 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
      */
     public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
-        $id = $cached->filepath;
+        $id = $cached->lock_id;
         $name = $cached->source->name . '.lock';
 
-        $mtime = $this->fetchTimestamp($id, $name, null, null);
+        $mtime = $this->fetchTimestamp($id, $name, $cached->cache_id, $cached->compile_id);
         if ($mtime === null) {
-            $this->fetch($id, $name, null, null, $content, $mtime);
+            $this->fetch($id, $name, $cached->cache_id, $cached->compile_id, $content, $mtime);
         }
-
-        return $mtime && time() - $mtime < $smarty->locking_timeout;
+        return $mtime && ($t = time()) - $mtime < $smarty->locking_timeout;
     }
 
     /**
@@ -260,10 +259,9 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         $cached->is_locked = true;
-
-        $id = $cached->filepath;
+        $id = $cached->lock_id;
         $name = $cached->source->name . '.lock';
-        $this->save($id, $name, null, null, $smarty->locking_timeout, '');
+        $this->save($id, $name, $cached->cache_id, $cached->compile_id, $smarty->locking_timeout, '');
     }
 
     /**
@@ -277,8 +275,7 @@ abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
     public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
     {
         $cached->is_locked = false;
-
         $name = $cached->source->name . '.lock';
-        $this->delete($name, null, null, null);
+        $this->delete($name, $cached->cache_id, $cached->compile_id, null);
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/library/Smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
index a4b365a82..ee4021a19 100644
--- a/library/Smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
+++ b/library/Smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
@@ -36,6 +36,7 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      * @var array
      */
     protected $contents = array();
+
     /**
      * cache for timestamps
      *
@@ -53,10 +54,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      */
     public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
     {
-        $cached->filepath = $_template->source->uid
-            . '#' . $this->sanitize($cached->source->resource)
-            . '#' . $this->sanitize($cached->cache_id)
-            . '#' . $this->sanitize($cached->compile_id);
+        $cached->filepath = $_template->source->uid . '#' . $this->sanitize($cached->source->resource) . '#' .
+            $this->sanitize($cached->cache_id) . '#' . $this->sanitize($cached->compile_id);
 
         $this->populateTimestamp($cached);
     }
@@ -83,10 +82,11 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      *
      * @param  Smarty_Internal_Template $_template template object
      * @param  Smarty_Template_Cached   $cached    cached object
+     * @param bool                      $update    flag if called because cache update
      *
      * @return boolean                 true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null)
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false)
     {
         if (!$cached) {
             $cached = $_template->cached;
@@ -123,7 +123,29 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
     {
         $this->addMetaTimestamp($content);
 
-        return $this->write(array($_template->cached->filepath => $content), $_template->properties['cache_lifetime']);
+        return $this->write(array($_template->cached->filepath => $content), $_template->cache_lifetime);
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        $content = $_template->cached->content ? $_template->cached->content : null;
+        $timestamp = null;
+        if ($content === null) {
+            if (!$this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp, $_template->source->uid)) {
+                return false;
+            }
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
     }
 
     /**
@@ -142,7 +164,14 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
         if (!$this->purge()) {
             $this->invalidate(null);
         }
-
+        // remove from template cache
+        if (isset($smarty->_cache['template_objects'])) {
+            foreach ($smarty->_cache['template_objects'] as $key => $tpl) {
+                if (isset($tpl->cached)) {
+                    unset($smarty->_cache['template_objects'][$key]);
+                }
+            }
+        }
         return - 1;
     }
 
@@ -163,11 +192,21 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      */
     public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {
-        $uid = $this->getTemplateUid($smarty, $resource_name, $cache_id, $compile_id);
-        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' . $this->sanitize($compile_id);
+        $uid = $this->getTemplateUid($smarty, $resource_name);
+        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' .
+            $this->sanitize($compile_id);
         $this->delete(array($cid));
         $this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
-
+        // remove from template cache
+        if (isset($resource_name) && isset($smarty->_cache['template_objects'])) {
+            if (isset($smarty->_cache['template_objects'])) {
+                foreach ($smarty->_cache['template_objects'] as $key => $tpl) {
+                    if ($tpl->source->uid == $uid && isset($tpl->cached)) {
+                        unset($smarty->_cache['template_objects'][$key]);
+                    }
+                }
+            }
+        }
         return - 1;
     }
 
@@ -176,33 +215,20 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      *
      * @param  Smarty $smarty        Smarty object
      * @param  string $resource_name template name
-     * @param  string $cache_id      cache id
-     * @param  string $compile_id    compile id
      *
      * @return string filepath of cache file
+     * @throws \SmartyException
+     *
      */
-    protected function getTemplateUid(Smarty $smarty, $resource_name, $cache_id, $compile_id)
+    protected function getTemplateUid(Smarty $smarty, $resource_name)
     {
-        $uid = '';
         if (isset($resource_name)) {
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            if ($tpl->source->exists) {
-                $uid = $tpl->source->uid;
-            }
-
-            // remove from template cache
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
+            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                return $source->uid;
             }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
         }
-
-        return $uid;
+        return '';
     }
 
     /**
@@ -214,12 +240,10 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      */
     protected function sanitize($string)
     {
-        // some poeple smoke bad weed
         $string = trim($string, '|');
         if (!$string) {
             return null;
         }
-
         return preg_replace('#[^\w\|]+#S', '_', $string);
     }
 
@@ -275,11 +299,8 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
      */
     protected function getMetaTimestamp(&$content)
     {
-        $s = unpack("N", substr($content, 0, 4));
-        $m = unpack("N", substr($content, 4, 4));
-        $content = substr($content, 8);
-
-        return $s[1] + ($m[1] / 100000000);
+        extract(unpack('N1s/N1m/a*content', $content));
+        return $s + ($m / 100000000);
     }
 
     /**
@@ -380,7 +401,6 @@ abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
             $t[] = 'IVK#COMPILE' . $_compile;
         }
         $_name .= '#';
-        // some poeple smoke bad weed
         $cid = trim($cache_id, '|');
         if (!$cid) {
             return $t;
diff --git a/library/Smarty/libs/sysplugins/smarty_config_source.php b/library/Smarty/libs/sysplugins/smarty_config_source.php
deleted file mode 100644
index fd37e61f7..000000000
--- a/library/Smarty/libs/sysplugins/smarty_config_source.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-
-/**
- * Smarty Resource Data Object
- * Meta Data Container for Config Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- * @property string $content
- * @property int    $timestamp
- * @property bool   $exists
- */
-class Smarty_Config_Source extends Smarty_Template_Source
-{
-    /**
-     * create Config Object container
-     *
-     * @param Smarty_Resource $handler         Resource Handler this source object communicates with
-     * @param Smarty          $smarty          Smarty instance this source object belongs to
-     * @param string          $resource        full config_resource
-     * @param string          $type            type of resource
-     * @param string          $name            resource name
-     * @param string          $unique_resource unqiue resource name
-     */
-    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
-    {
-        $this->handler = $handler; // Note: prone to circular references
-
-        // Note: these may be ->config_compiler_class etc in the future
-        //$this->config_compiler_class = $handler->config_compiler_class;
-        //$this->config_lexer_class = $handler->config_lexer_class;
-        //$this->config_parser_class = $handler->config_parser_class;
-
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-        $this->unique_resource = $unique_resource;
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     *
-     * @param  string $property_name valid: content, timestamp, exists
-     * @param  mixed  $value         newly assigned value (not check for correct type)
-     *
-     * @throws SmartyException when the given property name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'content':
-            case 'timestamp':
-            case 'exists':
-                $this->$property_name = $value;
-                break;
-
-            default:
-                throw new SmartyException("invalid config property '$property_name'.");
-        }
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * @param  string $property_name valid: content, timestamp, exists
-     *
-     * @return mixed|void
-     * @throws SmartyException when the given property name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'timestamp':
-            case 'exists':
-                $this->handler->populateTimestamp($this);
-
-                return $this->$property_name;
-
-            case 'content':
-                return $this->content = $this->handler->getContent($this);
-
-            default:
-                throw new SmartyException("config property '$property_name' does not exist.");
-        }
-    }
-}
diff --git a/library/Smarty/libs/sysplugins/smarty_data.php b/library/Smarty/libs/sysplugins/smarty_data.php
new file mode 100644
index 000000000..7cf18a43e
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_data.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Smarty Plugin Data
+ * This file contains the data object
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * class for the Smarty data object
+ * The Smarty data object will hold Smarty variables in the current scope
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Data extends Smarty_Internal_Data
+{
+    /**
+     * Counter
+     *
+     * @var int
+     */
+    static $count = 0;
+
+    /**
+     * Data block name
+     *
+     * @var string
+     */
+    public $dataObjectName = '';
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * create Smarty data object
+     *
+     * @param Smarty|array                    $_parent parent template
+     * @param Smarty|Smarty_Internal_Template $smarty  global smarty instance
+     * @param string                          $name    optional data block name
+     *
+     * @throws SmartyException
+     */
+    public function __construct($_parent = null, $smarty = null, $name = null)
+    {
+        parent::__construct();
+        self::$count ++;
+        $this->dataObjectName = 'Data_object ' . (isset($name) ? "'{$name}'" : self::$count);
+        $this->smarty = $smarty;
+        if (is_object($_parent)) {
+            // when object set up back pointer
+            $this->parent = $_parent;
+        } elseif (is_array($_parent)) {
+            // set up variable values
+            foreach ($_parent as $_key => $_val) {
+                $this->tpl_vars[$_key] = new Smarty_Variable($_val);
+            }
+        } elseif ($_parent != null) {
+            throw new SmartyException("Wrong type for template variables");
+        }
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_cacheresource_file.php b/library/Smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
index b8e99cc69..64d02dfe5 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
@@ -29,14 +29,12 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
     {
         $_source_file_path = str_replace(':', '.', $_template->source->filepath);
         $_cache_id = isset($_template->cache_id) ? preg_replace('![^\w\|]+!', '_', $_template->cache_id) : null;
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
+        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w]+!', '_', $_template->compile_id) : null;
         $_filepath = $_template->source->uid;
         // if use_sub_dirs, break file into directories
         if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-                . substr($_filepath, 2, 2) . DS
-                . substr($_filepath, 4, 2) . DS
-                . $_filepath;
+            $_filepath = substr($_filepath, 0, 2) . DS . substr($_filepath, 2, 2) . DS . substr($_filepath, 4, 2) . DS .
+                $_filepath;
         }
         $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
         if (isset($_cache_id)) {
@@ -60,9 +58,12 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
             }
             $cached->lock_id = $_lock_dir . sha1($_cache_id . $_compile_id . $_template->source->uid) . '.lock';
         }
-        $cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php';
-        $cached->timestamp = @filemtime($cached->filepath);
-        $cached->exists = !!$cached->timestamp;
+        $cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) .
+            '.php';
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
     }
 
     /**
@@ -74,8 +75,10 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
      */
     public function populateTimestamp(Smarty_Template_Cached $cached)
     {
-        $cached->timestamp = @filemtime($cached->filepath);
-        $cached->exists = !!$cached->timestamp;
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
     }
 
     /**
@@ -83,17 +86,22 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
      *
      * @param Smarty_Internal_Template $_template template object
      * @param Smarty_Template_Cached   $cached    cached object
+     * @param bool                     $update flag if called because cache update
      *
-     * @return booleantrue or false if the cached content does not exist
+     * @return boolean true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null)
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false)
     {
         /** @var Smarty_Internal_Template $_smarty_tpl
          * used in included file
          */
         $_smarty_tpl = $_template;
-
-        return @include $_template->cached->filepath;
+        $_template->cached->valid = false;
+        if ($update && defined('HHVM_VERSION')) {
+            return $_template->smarty->ext->_hhvm->includeHhvm($_template, $_template->cached->filepath);
+        } else {
+            return @include $_template->cached->filepath;
+        }
     }
 
     /**
@@ -106,14 +114,32 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
      */
     public function writeCachedContent(Smarty_Internal_Template $_template, $content)
     {
-        if (Smarty_Internal_Write_File::writeFile($_template->cached->filepath, $content, $_template->smarty) === true) {
-            $_template->cached->timestamp = @filemtime($_template->cached->filepath);
-            $_template->cached->exists = !!$_template->cached->timestamp;
-            if ($_template->cached->exists) {
+        if ($_template->smarty->ext->_writeFile->writeFile($_template->cached->filepath, $content, $_template->smarty) === true) {
+            if (function_exists('opcache_invalidate')) {
+                opcache_invalidate($_template->cached->filepath);
+            }
+            $cached = $_template->cached;
+            $cached->timestamp = $cached->exists = is_file($cached->filepath);
+            if ($cached->exists) {
+                $cached->timestamp = filemtime($cached->filepath);
                 return true;
             }
         }
+        return false;
+    }
 
+    /**
+     * Read cached template from cache
+     *
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        if (is_file($_template->cached->filepath)) {
+            return file_get_contents($_template->cached->filepath);
+        }
         return false;
     }
 
@@ -127,7 +153,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
      */
     public function clearAll(Smarty $smarty, $exp_time = null)
     {
-        return $this->clear($smarty, null, null, null, $exp_time);
+        return Smarty_Internal_Extension_Clear::clear($smarty, null, null, null, $exp_time);
     }
 
     /**
@@ -143,108 +169,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
      */
     public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
     {
-        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
-        $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
-        if (($_dir = realpath($smarty->getCacheDir())) === false) {
-            return 0;
-        }
-        $_dir .= '/';
-        $_dir_length = strlen($_dir);
-        if (isset($_cache_id)) {
-            $_cache_id_parts = explode('|', $_cache_id);
-            $_cache_id_parts_count = count($_cache_id_parts);
-            if ($smarty->use_sub_dirs) {
-                foreach ($_cache_id_parts as $id_part) {
-                    $_dir .= $id_part . DS;
-                }
-            }
-        }
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = true;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-
-            // remove from template cache
-            $tpl->source; // have the template registered before unset()
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-
-            if ($tpl->source->exists) {
-                $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
-            } else {
-                return 0;
-            }
-        }
-        $_count = 0;
-        $_time = time();
-        if (file_exists($_dir)) {
-            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
-            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
-            foreach ($_cache as $_file) {
-                if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-                    continue;
-                }
-                // directory ?
-                if ($_file->isDir()) {
-                    if (!$_cache->isDot()) {
-                        // delete folder if empty
-                        @rmdir($_file->getPathname());
-                    }
-                } else {
-                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string) $_file, $_dir_length)));
-                    $_parts_count = count($_parts);
-                    // check name
-                    if (isset($resource_name)) {
-                        if ($_parts[$_parts_count - 1] != $_resourcename_parts) {
-                            continue;
-                        }
-                    }
-                    // check compile id
-                    if (isset($_compile_id) && (!isset($_parts[$_parts_count - 2 - $_compile_id_offset]) || $_parts[$_parts_count - 2 - $_compile_id_offset] != $_compile_id)) {
-                        continue;
-                    }
-                    // check cache id
-                    if (isset($_cache_id)) {
-                        // count of cache id parts
-                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset : $_parts_count - 1 - $_compile_id_offset;
-                        if ($_parts_count < $_cache_id_parts_count) {
-                            continue;
-                        }
-                        for ($i = 0; $i < $_cache_id_parts_count; $i ++) {
-                            if ($_parts[$i] != $_cache_id_parts[$i]) {
-                                continue 2;
-                            }
-                        }
-                    }
-                    // expired ?
-                    if (isset($exp_time)) {
-                        if ($exp_time < 0) {
-                            preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_file), $match);
-                            if ($_time < (@filemtime($_file) + $match[1])) {
-                                continue;
-                            }
-                        } else {
-                            if ($_time - @filemtime($_file) < $exp_time) {
-                                continue;
-                            }
-                        }
-                    }
-                    $_count += @unlink((string) $_file) ? 1 : 0;
-                }
-            }
-        }
-
-        return $_count;
+        return Smarty_Internal_Extension_Clear::clear($smarty, $resource_name, $cache_id, $compile_id, $exp_time);
     }
 
     /**
@@ -262,9 +187,12 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
         } else {
             clearstatcache();
         }
-        $t = @filemtime($cached->lock_id);
-
-        return $t && (time() - $t < $smarty->locking_timeout);
+        if (is_file($cached->lock_id)) {
+            $t = @filemtime($cached->lock_id);
+            return $t && (time() - $t < $smarty->locking_timeout);
+        } else {
+            return false;
+        }
     }
 
     /**
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_append.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_append.php
index cbf65685b..bd2ffe474 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_append.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_append.php
@@ -19,13 +19,13 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
     /**
      * Compiles code for the {append} tag
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // the following must be assigned at runtime because it will be overwritten in parent class
         $this->required_attributes = array('var', 'value');
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_assign.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_assign.php
index caa34861f..5e3fce3cc 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_assign.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_assign.php
@@ -17,22 +17,30 @@
 class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
 {
     /**
+     * Valid scope names
+     *
+     * @var array
+     */
+    public $valid_scopes = array('local'  => true, 'parent' => true, 'root' => true, 'global' => true,
+                                 'smarty' => true, 'tpl_root' => true);
+
+    /**
      * Compiles code for the {assign} tag
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append
         $this->required_attributes = array('var', 'value');
         $this->shorttag_order = array('var', 'value');
-        $this->optional_attributes = array('scope');
+        $this->optional_attributes = array('scope', 'bubble_up');
         $_nocache = 'null';
-        $_scope = Smarty::SCOPE_LOCAL;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         // nocache ?
@@ -42,43 +50,47 @@ class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
             if (isset($compiler->template->tpl_vars[trim($_attr['var'], "'")])) {
                 $compiler->template->tpl_vars[trim($_attr['var'], "'")]->nocache = true;
             } else {
-                $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_variable(null, true);
+                $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_Variable(null, true);
             }
         }
         // scope setup
+        $_scope = Smarty::SCOPE_LOCAL;
         if (isset($_attr['scope'])) {
             $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_scope = Smarty::SCOPE_GLOBAL;
-            } else {
-                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
+            if (!isset($this->valid_scopes[$_attr['scope']])) {
+                $compiler->trigger_template_error("illegal value '{$_attr['scope']}' for \"scope\" attribute", null, true);
+            }
+            if ($_attr['scope'] != 'local') {
+                if ($_attr['scope'] == 'parent') {
+                    $_scope = Smarty::SCOPE_PARENT;
+                } elseif ($_attr['scope'] == 'root') {
+                    $_scope = Smarty::SCOPE_ROOT;
+                } elseif ($_attr['scope'] == 'global') {
+                    $_scope = Smarty::SCOPE_GLOBAL;
+                } elseif ($_attr['scope'] == 'smarty') {
+                    $_scope = Smarty::SCOPE_SMARTY;
+                } elseif ($_attr['scope'] == 'tpl_root') {
+                    $_scope = Smarty::SCOPE_TPL_ROOT;
+                }
+                $_scope += (isset($_attr['bubble_up']) && $_attr['bubble_up'] == 'false') ? 0 : Smarty::SCOPE_BUBBLE_UP;
             }
         }
         // compiled output
         if (isset($parameter['smarty_internal_index'])) {
-            $output = "<?php \$_smarty_tpl->createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];";
+            $output =
+                "<?php \$_smarty_tpl->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, $_attr[var], $_nocache);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];";
         } else {
             // implement Smarty2's behaviour of variables assigned by reference
             if ($compiler->template->smarty instanceof SmartyBC) {
-                $output = "<?php if (isset(\$_smarty_tpl->tpl_vars[$_attr[var]])) {\$_smarty_tpl->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-                $output .= "\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value = $_attr[value]; \$_smarty_tpl->tpl_vars[$_attr[var]]->nocache = $_nocache; \$_smarty_tpl->tpl_vars[$_attr[var]]->scope = $_scope;";
-                $output .= "\n} else \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);";
+                $output =
+                    "<?php if (isset(\$_smarty_tpl->tpl_vars[$_attr[var]])) {\$_smarty_tpl->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
+                $output .= "\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value = $_attr[value]; \$_smarty_tpl->tpl_vars[$_attr[var]]->nocache = $_nocache;";
+                $output .= "\n} else \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_Variable($_attr[value], $_nocache);";
             } else {
-                $output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);";
+                $output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_Variable($_attr[value], $_nocache);";
             }
         }
-        if ($_scope == Smarty::SCOPE_PARENT) {
-            $output .= "\nif (\$_smarty_tpl->parent != null) \$_smarty_tpl->parent->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-        } elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) {
-            $output .= "\n\$_ptr = \$_smarty_tpl->parent; while (\$_ptr != null) {\$_ptr->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]]; \$_ptr = \$_ptr->parent; }";
-        }
-        if ($_scope == Smarty::SCOPE_GLOBAL) {
-            $output .= "\nSmarty::\$global_tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-        }
+        $output .= "\n\$_smarty_tpl->ext->_updateScope->updateScope(\$_smarty_tpl, $_attr[var], $_scope);";
         $output .= '?>';
 
         return $output;
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_block.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_block.php
index 8c2fb975f..52a541ebd 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_block.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_block.php
@@ -1,24 +1,20 @@
 <?php
-
-/**
- * Smarty Internal Plugin Compile Block
- * Compiles the {block}{/block} tags
+/*
+ * This file is part of Smarty.
  *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
  * Smarty Internal Plugin Compile Block Class
  *
- * @package    Smarty
- * @subpackage Compiler
+ * @author Uwe Tews <uwe.tews@googlemail.com>
  */
-class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase
+class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inheritance
 {
-
-    const parent = '____SMARTY_BLOCK_PARENT____';
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -41,7 +37,7 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $option_flags = array('hide', 'append', 'prepend', 'nocache');
+    public $option_flags = array('hide', 'nocache');
 
     /**
      * Attribute definition: Overwrites base class.
@@ -49,396 +45,248 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $optional_attributes = array('internal_file', 'internal_uid', 'internal_line');
+    public $optional_attributes = array('assign');
+
     /**
-     * nested child block names
+     * nesting level of block tags
      *
-     * @var array
+     * @var int
      */
-    public static $nested_block_names = array();
+    public static $blockTagNestingLevel = 0;
 
     /**
-     * child block source buffer
+     * Saved compiler object
      *
-     * @var array
+     * @var Smarty_Internal_TemplateCompilerBase
      */
-    public static $block_data = array();
+    public $compiler = null;
 
     /**
      * Compiles code for the {block} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                 $args      array with attributes from parser
+     * @param  \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                 $parameter array with compilation parameter
      *
-     * @return boolean true
+     * @return bool true
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $_name = trim($_attr['name'], "\"'");
-
-        // existing child must override parent settings
-        if (isset($compiler->template->block_data[$_name]) && $compiler->template->block_data[$_name]['mode'] == 'replace') {
-            $_attr['append'] = false;
-            $_attr['prepend'] = false;
+        if (!isset($compiler->_cache['blockNesting'])) {
+            $compiler->_cache['blockNesting'] = 0;
         }
-
-        // check if we process an inheritance child template
-        if ($compiler->inheritance_child) {
-            array_unshift(self::$nested_block_names, $_name);
-            // build {block} for child block
-            self::$block_data[$_name]['source'] =
-                "{$compiler->smarty->left_delimiter}private_child_block name={$_attr['name']} file='{$compiler->template->source->filepath}' type='{$compiler->template->source->type}' resource='{$compiler->template->template_resource}'" .
-                " uid='{$compiler->template->source->uid}' line={$compiler->lex->line}";
-            if ($_attr['nocache']) {
-                self::$block_data[$_name]['source'] .= ' nocache';
-            }
-            self::$block_data[$_name]['source'] .= $compiler->smarty->right_delimiter;
-
-            $save = array($_attr, $compiler->inheritance);
-            $this->openTag($compiler, 'block', $save);
-            // set flag for {block} tag
-            $compiler->inheritance = true;
-            $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-            $compiler->has_code = false;
-            return;
+        if ($compiler->_cache['blockNesting'] == 0) {
+            // make sure that inheritance gets initialized in template code
+            $this->registerInit($compiler);
+            $this->option_flags = array('hide', 'nocache', 'append', 'prepend');
+        } else {
+            $this->option_flags = array('hide', 'nocache');
         }
-        // must merge includes
-        if ($_attr['nocache'] == true) {
-            $compiler->tag_nocache = true;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->_cache['blockNesting'] ++;
+        $compiler->_cache['blockName'][$compiler->_cache['blockNesting']] = $_attr['name'];
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']][0] = 'block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true));
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']][1] = false;
+        $this->openTag($compiler, 'block', array($_attr, $compiler->nocache, $compiler->parser->current_buffer,
+                                                 $compiler->template->compiled->has_nocache_code,
+                                                 $compiler->template->caching));
+        // must whole block be nocache ?
+        if ($compiler->tag_nocache) {
+            $i = 0;
         }
-        $save = array($_attr, $compiler->inheritance, $compiler->parser->current_buffer, $compiler->nocache);
-        $this->openTag($compiler, 'block', $save);
-        $compiler->inheritance = true;
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
-        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-        $compiler->has_code = false;
-
-        return true;
+        // $compiler->suppressNocacheProcessing = true;
+        if ($_attr['nocache'] === true) {
+            //$compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->taglineno);
+        }
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $compiler->template->compiled->has_nocache_code = false;
+        $compiler->suppressNocacheProcessing = true;
     }
 
     /**
      * Compile saved child block source
      *
-     * @param object $compiler compiler object
-     * @param string $_name    optional name of child block
+     * @param \Smarty_Internal_TemplateCompilerBase compiler object
+     * @param string                                $_name   optional name of child block
      *
      * @return string   compiled code of child block
      */
-    static function compileChildBlock($compiler, $_name = null)
+    static function compileChildBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
     {
-        if ($compiler->inheritance_child) {
-            $name1 = Smarty_Internal_Compile_Block::$nested_block_names[0];
-            if (isset($compiler->template->block_data[$name1])) {
-                //  replace inner block name with generic
-                Smarty_Internal_Compile_Block::$block_data[$name1]['source'] .= $compiler->template->block_data[$name1]['source'];
-                Smarty_Internal_Compile_Block::$block_data[$name1]['child'] = true;
-            }
-            $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-            $compiler->has_code = false;
-            return;
-        }
-        // if called by {$smarty.block.child} we must search the name of enclosing {block}
-        if ($_name == null) {
-            $stack_count = count($compiler->_tag_stack);
-            while (--$stack_count >= 0) {
-                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "\"'");
-                    break;
-                }
-            }
-        }
-        if ($_name == null) {
-            $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ', $compiler->lex->taglineno);
-        }
-        // undefined child?
-        if (!isset($compiler->template->block_data[$_name]['source'])) {
-            $compiler->popTrace();
-            return '';
-        }
-        // flag that child is already compile by {$smarty.block.child} inclusion
-        $compiler->template->block_data[$_name]['compiled'] = true;
-        $_tpl = new Smarty_Internal_template('string:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id,
-                                             $compiler->template->compile_id, $compiler->template->caching, $compiler->template->cache_lifetime);
-        if ($compiler->smarty->debugging) {
-            Smarty_Internal_Debug::ignore($_tpl);
+        if (!isset($compiler->_cache['blockNesting'])) {
+            $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ',
+                                              $compiler->parser->lex->taglineno);
         }
-        $_tpl->tpl_vars = $compiler->template->tpl_vars;
-        $_tpl->variable_filters = $compiler->template->variable_filters;
-        $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-        $_tpl->allow_relative_path = true;
-        $_tpl->compiler->inheritance = true;
-        $_tpl->compiler->suppressHeader = true;
-        $_tpl->compiler->suppressFilter = true;
-        $_tpl->compiler->suppressTemplatePropertyHeader = true;
-        $_tpl->compiler->suppressMergedTemplates = true;
-        $nocache = $compiler->nocache || $compiler->tag_nocache;
-        if (strpos($compiler->template->block_data[$_name]['source'], self::parent) !== false) {
-            $_output = str_replace(self::parent, $compiler->parser->current_buffer->to_smarty_php(), $_tpl->compiler->compileTemplate($_tpl, $nocache));
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
-            $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache) . $compiler->parser->current_buffer->to_smarty_php();
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'append') {
-            $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl, $nocache);
-        } elseif (!empty($compiler->template->block_data[$_name])) {
-            $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache);
-        }
-        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
-        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']);
-        $compiler->merged_templates = array_merge($compiler->merged_templates, $_tpl->compiler->merged_templates);
-        $compiler->template->variable_filters = $_tpl->variable_filters;
-        if ($_tpl->has_nocache_code) {
-            $compiler->template->has_nocache_code = true;
-        }
-        foreach ($_tpl->required_plugins as $key => $tmp1) {
-            if ($compiler->nocache && $compiler->template->caching) {
-                $code = 'nocache';
-            } else {
-                $code = $key;
-            }
-            foreach ($tmp1 as $name => $tmp) {
-                foreach ($tmp as $type => $data) {
-                    $compiler->template->required_plugins[$code][$name][$type] = $data;
-                }
-            }
-        }
-        unset($_tpl);
         $compiler->has_code = true;
-        return $_output;
+        $compiler->suppressNocacheProcessing = true;
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']][1] = true;
+        $output = "<?php \n\$_smarty_tpl->ext->_inheritance->processBlock(\$_smarty_tpl, 2, {$compiler->_cache['blockName'][$compiler->_cache['blockNesting']]}, null, \$_blockParentStack);\n?>\n";
+        return $output;
     }
 
     /**
      * Compile $smarty.block.parent
      *
-     * @param object $compiler compiler object
-     * @param string $_name    optional name of child block
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param string                                $_name    optional name of child block
      *
      * @return string   compiled code of child block
      */
-    static function compileParentBlock($compiler, $_name = null)
+    static function compileParentBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
     {
-        // if called by {$smarty.block.parent} we must search the name of enclosing {block}
-        if ($_name == null) {
-            $stack_count = count($compiler->_tag_stack);
-            while (--$stack_count >= 0) {
-                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "\"'");
-                    break;
-                }
-            }
+        if (!isset($compiler->_cache['blockNesting'])) {
+            $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ',
+                                              $compiler->parser->lex->taglineno);
         }
-        if ($_name == null) {
-            $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ', $compiler->lex->taglineno);
-        }
-        if (empty(Smarty_Internal_Compile_Block::$nested_block_names)) {
-            $compiler->trigger_template_error(' illegal {$smarty.block.parent} in parent template ', $compiler->lex->taglineno);
-        }
-        Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= Smarty_Internal_Compile_Block::parent;
-        $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-        $compiler->has_code = false;
-        return;
-    }
-
-    /**
-     * Process block source
-     *
-     * @param        $compiler
-     * @param string $source source text
-     *
-     */
-    static function blockSource($compiler, $source)
-    {
-        Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= $source;
+        $compiler->suppressNocacheProcessing = true;
+        $compiler->has_code = true;
+        $output = "<?php \n\$_smarty_tpl->ext->_inheritance->processBlock(\$_smarty_tpl, 3, {$compiler->_cache['blockName'][$compiler->_cache['blockNesting']]}, null, \$_blockParentStack);\n?>\n";
+        return $output;
     }
 }
 
 /**
  * Smarty Internal Plugin Compile BlockClose Class
  *
- * @package    Smarty
- * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase
+class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_Inheritance
 {
     /**
      * Compiles code for the {/block} tag
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
      *
-     * @return string compiled code
+     * @return bool true
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $compiler->has_code = true;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $saved_data = $this->closeTag($compiler, array('block'));
-        $_name = trim($saved_data[0]['name'], "\"'");
-        // reset flag for {block} tag
-        $compiler->inheritance = $saved_data[1];
-        // check if we process an inheritance child template
-        if ($compiler->inheritance_child) {
-            $name1 = Smarty_Internal_Compile_Block::$nested_block_names[0];
-            Smarty_Internal_Compile_Block::$block_data[$name1]['source'] .= "{$compiler->smarty->left_delimiter}/private_child_block{$compiler->smarty->right_delimiter}";
-            array_shift(Smarty_Internal_Compile_Block::$nested_block_names);
-            if (!empty(Smarty_Internal_Compile_Block::$nested_block_names)) {
-                $name2 = Smarty_Internal_Compile_Block::$nested_block_names[0];
-                if (isset($compiler->template->block_data[$name1]) || !$saved_data[0]['hide']) {
-                    if (isset(Smarty_Internal_Compile_Block::$block_data[$name1]['child']) || !isset($compiler->template->block_data[$name1])) {
-                        Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                    } else {
-                        if ($compiler->template->block_data[$name1]['mode'] == 'append') {
-                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'] . $compiler->template->block_data[$name1]['source'];
-                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'prepend') {
-                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= $compiler->template->block_data[$name1]['source'] . Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                        } else {
-                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= $compiler->template->block_data[$name1]['source'];
-                        }
-                    }
-                }
-                unset(Smarty_Internal_Compile_Block::$block_data[$name1]);
-                $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-            } else {
-                if (isset($compiler->template->block_data[$name1]) || !$saved_data[0]['hide']) {
-                    if (isset($compiler->template->block_data[$name1]) && !isset(Smarty_Internal_Compile_Block::$block_data[$name1]['child'])) {
-                        if (strpos($compiler->template->block_data[$name1]['source'], Smarty_Internal_Compile_Block::parent) !== false) {
-                            $compiler->template->block_data[$name1]['source'] =
-                                str_replace(Smarty_Internal_Compile_Block::parent, Smarty_Internal_Compile_Block::$block_data[$name1]['source'], $compiler->template->block_data[$name1]['source']);
-                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'prepend') {
-                            $compiler->template->block_data[$name1]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'append') {
-                            $compiler->template->block_data[$name1]['source'] = Smarty_Internal_Compile_Block::$block_data[$name1]['source'] . $compiler->template->block_data[$name1]['source'];
-                        }
-                    } else {
-                        $compiler->template->block_data[$name1]['source'] = Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                    }
-                    $compiler->template->block_data[$name1]['mode'] = 'replace';
-                    if ($saved_data[0]['append']) {
-                        $compiler->template->block_data[$name1]['mode'] = 'append';
-                    }
-                    if ($saved_data[0]['prepend']) {
-                        $compiler->template->block_data[$name1]['mode'] = 'prepend';
-                    }
-                }
-                unset(Smarty_Internal_Compile_Block::$block_data[$name1]);
-                $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
+        list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
+        // init block parameter
+        $_block = $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']];
+        unset($compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]);
+        $_block[2] = $_block[3] = 0;
+        $_name =  trim($_attr['name'], "'\"");
+        $_assign = isset($_attr['assign']) ? $_attr['assign'] : null;
+        unset($_attr['assign'], $_attr['name']);
+        foreach ($_attr as $name => $stat) {
+            if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat != 'false')) {
+                $_block[$name] = is_string($stat) ? trim($stat, "'\"") : $stat;
             }
-            $compiler->has_code = false;
-            return;
         }
-        if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
-            $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
-        } else {
-            if ($saved_data[0]['hide'] && !isset($compiler->template->block_data[$_name]['source'])) {
-                $_output = '';
-            } else {
-                $_output = $compiler->parser->current_buffer->to_smarty_php();
+        $_funcName = $_block[0];
+        // get compiled block code
+        $_functionCode = $compiler->parser->current_buffer;
+        // setup buffer for template function code
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+
+        if ($compiler->template->compiled->has_nocache_code) {
+            //            $compiler->parent_compiler->template->tpl_function[$_name]['call_name_caching'] = $_funcNameCaching;
+            $_block[6] = $_funcNameCaching = $_funcName . '_nocache';
+            $output = "<?php\n";
+            $output .= "/* {block '{$_name}'} {$compiler->template->source->type}:{$compiler->template->source->name} */\n";
+            $output .= "function {$_funcNameCaching} (\$_smarty_tpl, \$_blockParentStack) {\n";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n";
+            $output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n";
+            if (isset($_assign)) {
+                $output .= "ob_start();\n";
+            }
+            $output .= "?>\n";
+            $compiler->parser->current_buffer->append_subtree($compiler->parser,
+                                                              new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                                $output));
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+            $output = "<?php\n";
+            if (isset($_assign)) {
+                $output .= "\$_smarty_tpl->tpl_vars[{$_assign}] = new Smarty_Variable(ob_get_clean());\n";
             }
+            $output .= "/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n";
+            $output .= "}\n";
+            $output .= "/* {/block '{$_name}'} */\n\n";
+            $output .= "?>\n";
+            $compiler->parser->current_buffer->append_subtree($compiler->parser,
+                                                              new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                                $output));
+            $compiler->blockOrFunctionCode .= $f = $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+            $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+            $this->compiler = $compiler;
+            $_functionCode = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                               preg_replace_callback("/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+                                                                                     array($this, 'removeNocache'),
+                                                                                     $_functionCode->to_smarty_php($compiler->parser)));
+            $this->compiler = null;
         }
-        unset($compiler->template->block_data[$_name]['compiled']);
-        // reset flags
-        $compiler->parser->current_buffer = $saved_data[2];
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
+        $output = "<?php\n";
+        $output .= "/* {block '{$_name}'}  {$compiler->template->source->type}:{$compiler->template->source->name} */\n";
+        $output .= "function {$_funcName}(\$_smarty_tpl, \$_blockParentStack) {\n";
+        if (isset($_assign)) {
+            $output .= "ob_start();\n";
         }
-        $compiler->nocache = $saved_data[3];
-        // $_output content has already nocache code processed
-        $compiler->suppressNocacheProcessing = true;
-
-        return $_output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Child Block Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Child_Block extends Smarty_Internal_CompileBase
-{
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name', 'file', 'uid', 'line', 'type', 'resource');
-
-    /**
-     * Compiles code for the {private_child_block} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return boolean true
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        // update template with original template resource of {block}
-        if (trim($_attr['type'], "'") == 'file') {
-            $compiler->template->template_resource = 'file:' . realpath(trim($_attr['file'], "'"));
-        } else {
-            $compiler->template->template_resource = trim($_attr['resource'], "'");
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree($compiler->parser,
+                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                            $output));
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+        $output = "<?php\n";
+        if (isset($_assign)) {
+            $output .= "\$_smarty_tpl->tpl_vars[{$_assign}] = new Smarty_Variable(ob_get_clean());\n";
         }
-        // source object
-        unset ($compiler->template->source);
-        $exists = $compiler->template->source->exists;
-
-        // must merge includes
-        if ($_attr['nocache'] == true) {
-            $compiler->tag_nocache = true;
+        $output .= "}\n";
+        $output .= "/* {/block '{$_name}'} */\n\n";
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree($compiler->parser,
+                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                            $output));
+        $compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+        // nocache plugins must be copied
+        if (!empty($compiler->template->compiled->required_plugins['nocache'])) {
+            foreach ($compiler->template->compiled->required_plugins['nocache'] as $plugin => $tmp) {
+                foreach ($tmp as $type => $data) {
+                    $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$plugin][$type] =
+                        $data;
+                }
+            }
         }
-        $save = array($_attr, $compiler->nocache);
-
-        // set trace back to child block
-        $compiler->pushTrace(trim($_attr['file'], "\"'"), trim($_attr['uid'], "\"'"), $_attr['line'] - $compiler->lex->line);
 
-        $this->openTag($compiler, 'private_child_block', $save);
 
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $compiler->has_code = false;
+        // restore old status
+        $compiler->template->compiled->has_nocache_code = $_has_nocache_code;
+        $compiler->tag_nocache = $compiler->nocache;
+        $compiler->nocache = $_nocache;
+        $compiler->parser->current_buffer = $_buffer;
+        $output = "<?php \n";
+        if ($compiler->_cache['blockNesting'] == 1) {
+            $output .= "\$_smarty_tpl->ext->_inheritance->processBlock(\$_smarty_tpl, 0, {$compiler->_cache['blockName'][$compiler->_cache['blockNesting']]}, " .
+                var_export($_block, true) . ");\n";
+        } else {
+            $output .= "\$_smarty_tpl->ext->_inheritance->processBlock(\$_smarty_tpl, 0, {$compiler->_cache['blockName'][$compiler->_cache['blockNesting']]}, " .
+                var_export($_block, true) . ", \$_blockParentStack);\n";
 
-        return true;
+        }
+        $output .= "?>\n";
+        $compiler->_cache['blockNesting'] --;
+        if ($compiler->_cache['blockNesting'] == 0) {
+            unset($compiler->_cache['blockNesting']);
+        }
+        $compiler->has_code = true;
+        $compiler->suppressNocacheProcessing = true;
+        return $output;
     }
-}
-
-/**
- * Smarty Internal Plugin Compile Child Block Close Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Child_Blockclose extends Smarty_Internal_CompileBase
-{
 
     /**
-     * Compiles code for the {/private_child_block} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param $match
      *
-     * @return boolean true
+     * @return mixed
      */
-    public function compile($args, $compiler)
+    function removeNocache($match)
     {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $saved_data = $this->closeTag($compiler, array('private_child_block'));
-
-        // end of child block
-        $compiler->popTrace();
-
-        $compiler->nocache = $saved_data[1];
-        $compiler->has_code = false;
-
-        return true;
+        $code =
+            preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+                         '', $match[0]);
+        $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
+        return $code;
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_break.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_break.php
index b51e9e8f3..cbc73d36a 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_break.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_break.php
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('levels');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -34,25 +35,26 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {break} tag
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
 
         if (isset($_attr['levels'])) {
             if (!is_numeric($_attr['levels'])) {
-                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
+                $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
             }
             $_levels = $_attr['levels'];
         } else {
@@ -67,7 +69,7 @@ class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
             $stack_count --;
         }
         if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("cannot break {$_levels} level(s)", null, true);
         }
 
         return "<?php break {$_levels};?>";
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_call.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_call.php
index bfbd1f547..b7204bec0 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_call.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_call.php
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -30,6 +31,7 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -55,13 +57,11 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
             // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr['assign'];
         }
+        //$_name = trim($_attr['name'], "'\"");
         $_name = $_attr['name'];
-        if ($compiler->compiles_template_function) {
-            $compiler->called_functions[] = trim($_name, "'\"");
-        }
         unset($_attr['name'], $_attr['assign'], $_attr['nocache']);
         // set flag (compiled code of {function} must be included in cache file
-        if ($compiler->nocache || $compiler->tag_nocache) {
+        if (!$compiler->template->caching || $compiler->nocache || $compiler->tag_nocache) {
             $_nocache = 'true';
         } else {
             $_nocache = 'false';
@@ -74,54 +74,16 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
                 $_paramsArray[] = "'$_key'=>$_value";
             }
         }
-        if (isset($compiler->template->properties['function'][$_name]['parameter'])) {
-            foreach ($compiler->template->properties['function'][$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-            }
-        } elseif (isset($compiler->smarty->template_functions[$_name]['parameter'])) {
-            foreach ($compiler->smarty->template_functions[$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-            }
-        }
-        //variable name?
-        if (!(strpos($_name, '$') === false)) {
-            $call_cache = $_name;
-            $call_function = '$tmp = "smarty_template_function_".' . $_name . '; $tmp';
-        } else {
-            $_name = trim($_name, "'\"");
-            $call_cache = "'{$_name}'";
-            $call_function = 'smarty_template_function_' . $_name;
-        }
-
         $_params = 'array(' . implode(",", $_paramsArray) . ')';
-        $_hash = str_replace('-', '_', $compiler->template->properties['nocache_hash']);
+        //$compiler->suppressNocacheProcessing = true;
         // was there an assign attribute
         if (isset($_assign)) {
-            if ($compiler->template->caching) {
-                $_output = "<?php ob_start(); Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            } else {
-                $_output = "<?php ob_start(); {$call_function}(\$_smarty_tpl,{$_params}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            }
+            $_output =
+                "<?php ob_start();\n\$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
         } else {
-            if ($compiler->template->caching) {
-                $_output = "<?php Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache});?>\n";
-            } else {
-                $_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n";
-            }
+            $_output =
+                "<?php \$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
         }
-
         return $_output;
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_capture.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_capture.php
index 34728e47a..95c75a4b1 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_capture.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_capture.php
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -34,12 +35,12 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {capture} tag
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -51,10 +52,31 @@ class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
         $compiler->_capture_stack[0][] = array($buffer, $assign, $append, $compiler->nocache);
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $_output = "<?php \$_smarty_tpl->_capture_stack[0][] = array($buffer, $assign, $append); ob_start(); ?>";
+        $_output = "<?php \$_smarty_tpl->_cache['capture_stack'][] = array($buffer, $assign, $append); ob_start(); ?>";
 
         return $_output;
     }
+
+    /**
+     * Compiles code for the {$smarty.capture.xxx}
+     *
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public static function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // make all lower case
+        $parameter = array_map('strtolower', $parameter);
+        $tag = trim($parameter[0], '"\'');
+        if (!isset($parameter[1]) || false === $name = $compiler->getId($parameter[1])) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
+        }
+        return "isset(\$_smarty_tpl->_cache['__smarty_capture']['{$name}']) ? \$_smarty_tpl->_cache['__smarty_capture']['{$name}'] : null";
+    }
 }
 
 /**
@@ -68,12 +90,12 @@ class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {/capture} tag
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -84,11 +106,11 @@ class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
 
         list($buffer, $assign, $append, $compiler->nocache) = array_pop($compiler->_capture_stack[0]);
 
-        $_output = "<?php list(\$_capture_buffer, \$_capture_assign, \$_capture_append) = array_pop(\$_smarty_tpl->_capture_stack[0]);\n";
+        $_output = "<?php list(\$_capture_buffer, \$_capture_assign, \$_capture_append) = array_pop(\$_smarty_tpl->_cache['capture_stack']);\n";
         $_output .= "if (!empty(\$_capture_buffer)) {\n";
         $_output .= " if (isset(\$_capture_assign)) \$_smarty_tpl->assign(\$_capture_assign, ob_get_contents());\n";
         $_output .= " if (isset( \$_capture_append)) \$_smarty_tpl->append( \$_capture_append, ob_get_contents());\n";
-        $_output .= " Smarty::\$_smarty_vars['capture'][\$_capture_buffer]=ob_get_clean();\n";
+        $_output .= "\$_smarty_tpl->_cache['__smarty_capture'][\$_capture_buffer]=ob_get_clean();\n";
         $_output .= "} else \$_smarty_tpl->capture_error();?>";
 
         return $_output;
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php
index 8813664d4..d2e50a08f 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_config_load.php
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('file');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -30,30 +31,39 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('file', 'section');
+
     /**
      * Attribute definition: Overwrites base class.
      *
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $optional_attributes = array('section', 'scope');
+    public $optional_attributes = array('section', 'scope', 'bubble_up');
+
+    /**
+     * Valid scope names
+     * 
+     * @var array
+     */
+    public $valid_scopes = array('local'  => true, 'parent' => true, 'root' => true, 'global' => true,
+                                 'smarty' => true, 'tpl_root' => true);
 
     /**
      * Compiles code for the {config_load} tag
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        static $_is_legal_scope = array('local' => true, 'parent' => true, 'root' => true, 'global' => true);
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
 
         // save possible attributes
@@ -63,19 +73,31 @@ class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
         } else {
             $section = 'null';
         }
-        $scope = 'local';
-        // scope setup
+        $_scope = Smarty::SCOPE_LOCAL;
         if (isset($_attr['scope'])) {
             $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if (isset($_is_legal_scope[$_attr['scope']])) {
-                $scope = $_attr['scope'];
-            } else {
-                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
+            if (!isset($this->valid_scopes[$_attr['scope']])) {
+                $compiler->trigger_template_error("illegal value '{$_attr['scope']}' for \"scope\" attribute", null, true);
+            }
+            if ($_attr['scope'] != 'local') {
+                if ($_attr['scope'] == 'parent') {
+                    $_scope = Smarty::SCOPE_PARENT;
+                } elseif ($_attr['scope'] == 'root') {
+                    $_scope = Smarty::SCOPE_ROOT;
+                } elseif ($_attr['scope'] == 'global') {
+                    $_scope = Smarty::SCOPE_GLOBAL;
+                } elseif ($_attr['scope'] == 'smarty') {
+                    $_scope = Smarty::SCOPE_SMARTY;
+                } elseif ($_attr['scope'] == 'tpl_root') {
+                    $_scope = Smarty::SCOPE_TPL_ROOT;
+                }
+                $_scope += (isset($_attr['bubble_up']) && $_attr['bubble_up'] == 'false') ? 0 : Smarty::SCOPE_BUBBLE_UP;
             }
         }
+
         // create config object
-        $_output = "<?php  \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);";
-        $_output .= "\$_config->loadConfigVars($section, '$scope'); ?>";
+        $_output =
+            "<?php\n\$_smarty_tpl->smarty->ext->configLoad->_loadConfigFile(\$_smarty_tpl, {$conf_file}, {$section}, {$_scope});\n?>\n";
 
         return $_output;
     }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_continue.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_continue.php
index af3765128..2ee04c94e 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_continue.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_continue.php
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('levels');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -34,25 +35,26 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {continue} tag
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
 
         if (isset($_attr['levels'])) {
             if (!is_numeric($_attr['levels'])) {
-                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
+                $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
             }
             $_levels = $_attr['levels'];
         } else {
@@ -67,7 +69,7 @@ class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase
             $stack_count --;
         }
         if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("cannot continue {$_levels} level(s)", null, true);
         }
 
         return "<?php continue {$_levels};?>";
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_debug.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_debug.php
index b184a746b..d73c81a10 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_debug.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_debug.php
@@ -34,8 +34,8 @@ class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase
         $compiler->tag_nocache = true;
 
         // display debug template
-        $_output = "<?php \$_smarty_tpl->smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>";
-
+        $_output = "<?php \$_smarty_debug = new Smarty_Internal_Debug;\n \$_smarty_debug->display_debug(\$_smarty_tpl);\n";
+        $_output .= "unset(\$_smarty_debug);\n?>";
         return $_output;
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_extends.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_extends.php
index 2b541f2e3..7ce3dcf6f 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_extends.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_extends.php
@@ -15,7 +15,7 @@
  * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase
+class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inheritance
 {
     /**
      * Attribute definition: Overwrites base class.
@@ -24,6 +24,15 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('file');
+
+    /**
+     * Array of names of optional attribute required by tag
+     * use array('_any') if there is no restriction of attributes names
+     *
+     * @var array
+     */
+    public $optional_attributes = array('extends_resource');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -33,53 +42,93 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase
     public $shorttag_order = array('file');
 
     /**
-     * Compiles code for the {extends} tag
+     * Compiles code for the {extends} tag extends: resource
      *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->line - 1);
         }
         if (strpos($_attr['file'], '$_tmp') !== false) {
-            $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno);
-        }
-
-        $name = $_attr['file'];
-        /** @var Smarty_Internal_Template $_smarty_tpl
-         * used in evaluated code
-         */
-        $_smarty_tpl = $compiler->template;
-        eval("\$tpl_name = $name;");
-        // create template object
-        $_template = new $compiler->smarty->template_class($tpl_name, $compiler->smarty, $compiler->template);
-        // check for recursion
-        $uid = $_template->source->uid;
-        if (isset($compiler->extends_uid[$uid])) {
-            $compiler->trigger_template_error("illegal recursive call of \"$include_file\"", $compiler->lex->line - 1);
+            $compiler->trigger_template_error('illegal value for file attribute', $compiler->parser->lex->line - 1);
         }
-        $compiler->extends_uid[$uid] = true;
-        if (empty($_template->source->components)) {
-            array_unshift($compiler->sources, $_template->source);
-        } else {
-            foreach ($_template->source->components as $source) {
-                array_unshift($compiler->sources, $source);
-                $uid = $source->uid;
-                if (isset($compiler->extends_uid[$uid])) {
-                    $compiler->trigger_template_error("illegal recursive call of \"{$source->filepath}\"", $compiler->lex->line - 1);
+        // add code to initialize inheritance
+        $this->registerInit($compiler, true);
+        $file = trim($_attr['file'], '\'"');
+        if (strlen($file) > 8 && substr($file, 0, 8) == 'extends:') {
+            // generate code for each template
+            $files = array_reverse(explode('|', substr($file, 8)));
+            $i = 0;
+            foreach ($files as $file) {
+                if ($file[0] == '"') {
+                    $file = trim($file, '".');
+                } else {
+                    $file = "'{$file}'";
+                }
+                $i ++;
+                if ($i == count($files) && isset($_attr['extends_resource'])) {
+                    $this->compileEndChild($compiler);
                 }
-                $compiler->extends_uid[$uid] = true;
+                $this->compileInclude($compiler, $file);
             }
+            if (!isset($_attr['extends_resource'])) {
+                $this->compileEndChild($compiler);
+            }
+        } else {
+            $this->compileEndChild($compiler);
+            $this->compileInclude($compiler, $_attr['file']);
         }
-        unset ($_template);
-        $compiler->inheritance_child = true;
-        $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
+        $compiler->has_code = false;
         return '';
     }
+
+    /**
+     * Add code for inheritance endChild() method to end of template
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                  "<?php \$_smarty_tpl->ext->_inheritance->endChild(\$_smarty_tpl);\n?>\n");
+    }
+
+    /**
+     * Add code for including subtemplate to end of template
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param  string                               $file subtemplate name
+     */
+    private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $file)
+    {
+        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+                                                                                  $compiler->compileTag('include',
+                                                                                                        array($file,
+                                                                                                              array('scope' => 'parent'))));
+    }
+
+    /**
+     * Create source code for {extends} from source components array
+     *
+     * @param []\Smarty_Internal_Template_Source $components
+     *
+     * @return string
+     */
+    public static function extendsSourceArrayCode($components)
+    {
+        $resources = array();
+        foreach ($components as $source) {
+            $resources[] = $source->resource;
+        }
+        return '{extends file=\'extends:' . join('|', $resources) . '\' extends_resource=true}';
+    }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_for.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_for.php
index a624b922c..7b86d4859 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_for.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_for.php
@@ -34,6 +34,7 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
      */
     public function compile($args, $compiler, $parameter)
     {
+        $compiler->loopNesting++;
         if ($parameter == 0) {
             $this->required_attributes = array('start', 'to');
             $this->optional_attributes = array('max', 'step');
@@ -44,30 +45,51 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        $output = "<?php ";
+        $output = "<?php\n";
         if ($parameter == 1) {
             foreach ($_attr['start'] as $_statement) {
-                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
-                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value];\n";
+                if (is_array($_statement['var'])) {
+                    $var = $_statement['var']['var'];
+                    $index = $_statement['var']['smarty_internal_index'];
+                } else {
+                    $var = $_statement['var'];
+                    $index = '';
+                }
+                $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable;\n";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->value{$index} = {$_statement['value']};\n";
             }
-            $output .= "  if ($_attr[ifexp]) { for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]) {\n";
+            if (is_array($_attr['var'])) {
+                $var = $_attr['var']['var'];
+                $index = $_attr['var']['smarty_internal_index'];
+            } else {
+                $var = $_attr['var'];
+                $index = '';
+            }
+            $output .= "if ($_attr[ifexp]) {\nfor (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$var]->value{$index}$_attr[step]) {\n";
         } else {
             $_statement = $_attr['start'];
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
+            if (is_array($_statement['var'])) {
+                $var = $_statement['var']['var'];
+                $index = $_statement['var']['smarty_internal_index'];
+            } else {
+                $var = $_statement['var'];
+                $index = '';
+            }
+            $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable;";
             if (isset($_attr['step'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = $_attr[step];";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
             } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = 1;";
             }
             if (isset($_attr['max'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step)),$_attr[max]);\n";
             } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step));\n";
             }
-            $output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0) {\n";
-            $output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++) {\n";
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->first = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == 1;";
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->last = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == \$_smarty_tpl->tpl_vars[$_statement[var]]->total;";
+            $output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
+            $output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
+            $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration == 1;";
+            $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration == \$_smarty_tpl->tpl_vars[$var]->total;";
         }
         $output .= "?>";
 
@@ -127,6 +149,7 @@ class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
      */
     public function compile($args, $compiler, $parameter)
     {
+        $compiler->loopNesting--;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         // must endblock be nocache?
@@ -136,10 +159,11 @@ class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
 
         list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
 
-        if ($openTag == 'forelse') {
-            return "<?php }  ?>";
-        } else {
-            return "<?php }} ?>";
-        }
+        $output = "<?php }\n";
+        if ($openTag != 'forelse') {
+            $output .= "}\n";
+         }
+        $output .= "?>\n";
+        return $output;
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_foreach.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_foreach.php
index fc77f5749..876ed026a 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_foreach.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_foreach.php
@@ -14,7 +14,7 @@
  * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase
+class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_ForeachSection
 {
     /**
      * Attribute definition: Overwrites base class.
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('from', 'item');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -30,6 +31,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('name', 'key');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -39,128 +41,228 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase
     public $shorttag_order = array('from', 'item', 'key', 'name');
 
     /**
+     * counter
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = 'foreach';
+
+    /**
+     * Valid properties of $smarty.foreach.name.xxx variable
+     *
+     * @var array
+     */
+    public static $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total');
+
+    /**
+     * Valid properties of $item@xxx variable
+     *
+     * @var array
+     */
+    public $itemProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'key');
+
+    /**
+     * Flag if tag had name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = false;
+
+    /**
      * Compiles code for the {foreach} tag
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
+        $compiler->loopNesting ++;
+        // init
+        $this->isNamed = false;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-
         $from = $_attr['from'];
-        $item = $_attr['item'];
-        if (!strncmp("\$_smarty_tpl->tpl_vars[$item]", $from, strlen($item) + 24)) {
-            $compiler->trigger_template_error("item variable {$item} may not be the same variable as at 'from'", $compiler->lex->taglineno);
+        $item = $compiler->getId($_attr['item']);
+        if ($item === false) {
+            $item = $compiler->getVariableName($_attr['item']);
         }
-
+        $attributes = array('item' => $item);
         if (isset($_attr['key'])) {
-            $key = $_attr['key'];
-        } else {
-            $key = null;
+            $key = $compiler->getId($_attr['key']);
+            if ($key === false) {
+                $key = $compiler->getVariableName($_attr['key']);
+            }
+            $attributes['key'] = $key;
+        }
+        if (isset($_attr['name'])) {
+            $this->isNamed = true;
+            $attributes['name'] = $compiler->getId($_attr['name']);
+        }
+        foreach ($attributes as $a => $v) {
+            if ($v === false) {
+                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+            }
+        }
+        $fromName = $compiler->getVariableName($_attr['from']);
+        if ($fromName) {
+            foreach (array('item', 'key') as $a) {
+                if (isset($attributes[$a]) && $attributes[$a] == $fromName) {
+                    $compiler->trigger_template_error("'{$a}' and 'from' may not have same variable name '{$fromName}'",
+                                                      null, true);
+                }
+            }
+        }
+
+        $itemVar = "\$_smarty_tpl->tpl_vars['{$item}']";
+        $local = '$__foreach_' . (isset($attributes['name']) ? $attributes['name'] : $attributes['item']) . '_' .
+            $this->counter ++ . '_';
+        $needIteration = false;
+        // search for used tag attributes
+        $itemAttr = array();
+        $namedAttr = array();
+        $this->scanForProperties($attributes, $compiler);
+        if (!empty($this->matchResults['item'])) {
+            $itemAttr = $this->matchResults['item'];
+        }
+        if (!empty($this->matchResults['named'])) {
+            $namedAttr = $this->matchResults['named'];
+        }
+        if (isset($itemAttr['last'])) {
+            $needIteration = true;
+        }
+        if (isset($namedAttr['last'])) {
+            $needIteration = true;
+        }
+
+        $keyTerm = '';
+        if (isset($itemAttr['key'])) {
+            $keyTerm = "{$itemVar}->key => ";
+        } elseif (isset($attributes['key'])) {
+            $keyTerm = "\$_smarty_tpl->tpl_vars['{$key}']->value => ";
         }
 
-        $this->openTag($compiler, 'foreach', array('foreach', $compiler->nocache, $item, $key));
+        $saveVars = array();
+        $restoreVars = array();
+        if ($this->isNamed) {
+            $foreachVar = "\$_smarty_tpl->tpl_vars['__smarty_foreach_{$attributes['name']}']";
+            if (!empty($namedAttr)) {
+                $saveVars['saved'] = "isset({$foreachVar}) ? {$foreachVar} : false;";
+                $restoreVars[] = "if ({$local}saved) {\n{$foreachVar} = {$local}saved;\n}\n";
+            }
+        }
+        foreach (array('item', 'key') as $a) {
+            if (isset($attributes[$a])) {
+                $saveVars['saved_' . $a] =
+                    "isset(\$_smarty_tpl->tpl_vars['{$attributes[$a]}']) ? \$_smarty_tpl->tpl_vars['{$attributes[$a]}'] : false;";
+                $restoreVars[] =
+                    "if ({$local}saved_{$a}) {\n\$_smarty_tpl->tpl_vars['{$attributes[$a]}'] = {$local}saved_{$a};\n}\n";
+            }
+        }
+        $this->openTag($compiler, 'foreach',
+                       array('foreach', $compiler->nocache, $local, $restoreVars, $itemVar, true));
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
 
-        if (isset($_attr['name'])) {
-            $name = $_attr['name'];
-            $has_name = true;
-            $SmartyVarName = '$smarty.foreach.' . trim($name, '\'"') . '.';
-        } else {
-            $name = null;
-            $has_name = false;
-        }
-        $ItemVarName = '$' . trim($item, '\'"') . '@';
-        // evaluates which Smarty variables and properties have to be computed
-        if ($has_name) {
-            $usesSmartyFirst = strpos($compiler->lex->data, $SmartyVarName . 'first') !== false;
-            $usesSmartyLast = strpos($compiler->lex->data, $SmartyVarName . 'last') !== false;
-            $usesSmartyIndex = strpos($compiler->lex->data, $SmartyVarName . 'index') !== false;
-            $usesSmartyIteration = strpos($compiler->lex->data, $SmartyVarName . 'iteration') !== false;
-            $usesSmartyShow = strpos($compiler->lex->data, $SmartyVarName . 'show') !== false;
-            $usesSmartyTotal = strpos($compiler->lex->data, $SmartyVarName . 'total') !== false;
-        } else {
-            $usesSmartyFirst = false;
-            $usesSmartyLast = false;
-            $usesSmartyTotal = false;
-            $usesSmartyShow = false;
-        }
-
-        $usesPropFirst = $usesSmartyFirst || strpos($compiler->lex->data, $ItemVarName . 'first') !== false;
-        $usesPropLast = $usesSmartyLast || strpos($compiler->lex->data, $ItemVarName . 'last') !== false;
-        $usesPropIndex = $usesPropFirst || strpos($compiler->lex->data, $ItemVarName . 'index') !== false;
-        $usesPropIteration = $usesPropLast || strpos($compiler->lex->data, $ItemVarName . 'iteration') !== false;
-        $usesPropShow = strpos($compiler->lex->data, $ItemVarName . 'show') !== false;
-        $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($compiler->lex->data, $ItemVarName . 'total') !== false;
         // generate output code
-        $output = "<?php ";
-        $output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable; \$_smarty_tpl->tpl_vars[$item]->_loop = false;\n";
-        if ($key != null) {
-            $output .= " \$_smarty_tpl->tpl_vars[$key] = new Smarty_Variable;\n";
-        }
-        $output .= " \$_from = $from; if (!is_array(\$_from) && !is_object(\$_from)) { settype(\$_from, 'array');}\n";
-        if ($usesPropTotal) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->total= \$_smarty_tpl->_count(\$_from);\n";
+        $output = "<?php\n";
+        $output .= "\$_from = $from;\n";
+        $output .= "if (!is_array(\$_from) && !is_object(\$_from)) {\n";
+        $output .= "settype(\$_from, 'array');\n";
+        $output .= "}\n";
+        foreach ($saveVars as $k => $code) {
+            $output .= "{$local}{$k} = {$code}\n";
         }
-        if ($usesPropIteration) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration=0;\n";
+        $output .= "{$itemVar} = new Smarty_Variable();\n";
+        $output .= "{$local}total = \$_smarty_tpl->smarty->ext->_foreach->count(\$_from);\n";
+        if (isset($itemAttr['show'])) {
+            $output .= "{$itemVar}->show = ({$local}total > 0);\n";
         }
-        if ($usesPropIndex) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->index=-1;\n";
+        if (isset($itemAttr['total'])) {
+            $output .= "{$itemVar}->total= {$local}total;\n";
         }
-        if ($usesPropShow) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->show = (\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
-        }
-        if ($has_name) {
-            if ($usesSmartyTotal) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['total'] = \$_smarty_tpl->tpl_vars[$item]->total;\n";
+        if ($this->isNamed) {
+            $prop = array();
+            if (isset($namedAttr['total'])) {
+                $prop['total'] = "'total' => {$local}total";
+            }
+            if (isset($namedAttr['iteration'])) {
+                $prop['iteration'] = "'iteration' => 0";
             }
-            if ($usesSmartyIteration) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']=0;\n";
+            if (isset($namedAttr['index'])) {
+                $prop['index'] = "'index' => -1";
             }
-            if ($usesSmartyIndex) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']=-1;\n";
+            if (isset($namedAttr['show'])) {
+                $prop['show'] = "'show' => ({$local}total > 0)";
             }
-            if ($usesSmartyShow) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
+            if (!empty($namedAttr)) {
+                $_vars = 'array(' . join(', ', $prop) . ')';
+                $output .= "{$foreachVar} = new Smarty_Variable({$_vars});\n";
             }
         }
-        $output .= "foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value) {\n\$_smarty_tpl->tpl_vars[$item]->_loop = true;\n";
-        if ($key != null) {
-            $output .= " \$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n";
+        $output .= "if ({$local}total) {\n";
+        if (isset($attributes['key'])) {
+            $output .= "\$_smarty_tpl->tpl_vars['{$key}'] = new Smarty_Variable();\n";
         }
-        if ($usesPropIteration) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration++;\n";
+        if (isset($namedAttr['first']) || isset($itemAttr['first'])) {
+            $output .= "{$local}first = true;\n";
         }
-        if ($usesPropIndex) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->index++;\n";
+        if (isset($itemAttr['iteration'])) {
+            $output .= "{$itemVar}->iteration=0;\n";
         }
-        if ($usesPropFirst) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->first = \$_smarty_tpl->tpl_vars[$item]->index === 0;\n";
+        if (isset($itemAttr['index'])) {
+            $output .= "{$itemVar}->index=-1;\n";
         }
-        if ($usesPropLast) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->last = \$_smarty_tpl->tpl_vars[$item]->iteration === \$_smarty_tpl->tpl_vars[$item]->total;\n";
+        if ($needIteration) {
+            $output .= "{$local}iteration=0;\n";
         }
-        if ($has_name) {
-            if ($usesSmartyFirst) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['first'] = \$_smarty_tpl->tpl_vars[$item]->first;\n";
+        $output .= "foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
+        if (isset($attributes['key']) && isset($itemAttr['key'])) {
+            $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
+        }
+        if (isset($itemAttr['iteration'])) {
+            $output .= "{$itemVar}->iteration++;\n";
+        }
+        if (isset($itemAttr['index'])) {
+            $output .= "{$itemVar}->index++;\n";
+        }
+        if ($needIteration) {
+            $output .= "{$local}iteration++;\n";
+        }
+        if (isset($itemAttr['first'])) {
+            $output .= "{$itemVar}->first = {$local}first;\n";
+        }
+        if (isset($itemAttr['last'])) {
+            $output .= "{$itemVar}->last = {$local}iteration == {$local}total;\n";
+        }
+        if ($this->isNamed) {
+            if (isset($namedAttr['iteration'])) {
+                $output .= "{$foreachVar}->value['iteration']++;\n";
             }
-            if ($usesSmartyIteration) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']++;\n";
+            if (isset($namedAttr['index'])) {
+                $output .= "{$foreachVar}->value['index']++;\n";
             }
-            if ($usesSmartyIndex) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']++;\n";
+            if (isset($namedAttr['first'])) {
+                $output .= "{$foreachVar}->value['first'] = {$local}first;\n";
             }
-            if ($usesSmartyLast) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['last'] = \$_smarty_tpl->tpl_vars[$item]->last;\n";
+            if (isset($namedAttr['last'])) {
+                $output .= "{$foreachVar}->value['last'] = {$local}iteration == {$local}total;\n";
             }
         }
+        if (isset($namedAttr['first']) || isset($itemAttr['first'])) {
+            $output .= "{$local}first = false;\n";
+        }
+        $output .= "{$local}saved_local_item = {$itemVar};\n";
         $output .= "?>";
 
         return $output;
@@ -178,21 +280,24 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {foreachelse} tag
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        list($openTag, $nocache, $item, $key) = $this->closeTag($compiler, array('foreach'));
-        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $item, $key));
-
-        return "<?php }\nif (!\$_smarty_tpl->tpl_vars[$item]->_loop) {\n?>";
+        list($openTag, $nocache, $local, $restoreVars, $itemVar, $foo) = $this->closeTag($compiler, array('foreach'));
+        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $local, $restoreVars, $itemVar, false));
+        $output = "<?php\n";
+        $output .= "{$itemVar} = {$local}saved_local_item;\n";
+        $output .= "}\n";
+        $output .= "} else {\n?>";
+        return $output;
     }
 }
 
@@ -207,23 +312,34 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {/foreach} tag
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->loopNesting --;
         // must endblock be nocache?
         if ($compiler->nocache) {
             $compiler->tag_nocache = true;
         }
 
-        list($openTag, $compiler->nocache, $item, $key) = $this->closeTag($compiler, array('foreach', 'foreachelse'));
+        list($openTag, $compiler->nocache, $local, $restoreVars, $itemVar, $restore) =
+            $this->closeTag($compiler, array('foreach', 'foreachelse'));
+        $output = "<?php\n";
+
+        if ($restore) {
+            $output .= "{$itemVar} = {$local}saved_local_item;\n";
+            $output .= "}\n";
+        }
+        $output .= "}\n";
+        foreach ($restoreVars as $restore) {
+            $output .= $restore;
+        }
+        $output .= "?>";
 
-        return "<?php } ?>";
+        return $output;
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_function.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_function.php
index 298eb16f2..28f335949 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_function.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_function.php
@@ -16,6 +16,7 @@
  */
 class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
 {
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -23,6 +24,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -30,6 +32,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -41,54 +44,31 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {function} tag
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
      *
-     * @return boolean true
+     * @return bool true
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
+        $compiler->loopNesting++;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
         unset($_attr['nocache']);
-        $save = array($_attr, $compiler->parser->current_buffer,
-                      $compiler->template->has_nocache_code, $compiler->template->required_plugins);
-        $this->openTag($compiler, 'function', $save);
         $_name = trim($_attr['name'], "'\"");
-        unset($_attr['name']);
-        // set flag that we are compiling a template function
-        $compiler->compiles_template_function = true;
-        $compiler->template->properties['function'][$_name]['parameter'] = array();
-        /** @var Smarty_Internal_Template $_smarty_tpl
-         * used in evaluated code
-         */
-        $_smarty_tpl = $compiler->template;
-        foreach ($_attr as $_key => $_data) {
-            eval ('$tmp=' . $_data . ';');
-            $compiler->template->properties['function'][$_name]['parameter'][$_key] = $tmp;
-        }
-        $compiler->smarty->template_functions[$_name]['parameter'] = $compiler->template->properties['function'][$_name]['parameter'];
-        if ($compiler->template->caching) {
-            $output = '';
-        } else {
-            $output = "<?php if (!function_exists('smarty_template_function_{$_name}')) {
-    function smarty_template_function_{$_name}(\$_smarty_tpl,\$params) {
-    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
-    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
-        }
+        $compiler->parent_compiler->tpl_function[$_name] = $compiler->parent_compiler->template->tpl_function[$_name] = array();
+        $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
+                      $compiler->template->caching);
+        $this->openTag($compiler, 'function', $save);
         // Init temporary context
-        $compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array());
-        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-        $compiler->parser->current_buffer->append_subtree(new _smarty_tag($compiler->parser, $output));
-        $compiler->template->has_nocache_code = false;
-        $compiler->has_code = false;
-        $compiler->template->properties['function'][$_name]['compiled'] = '';
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $compiler->template->compiled->has_nocache_code = false;
         return true;
     }
 }
@@ -101,62 +81,130 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
  */
 class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
 {
+
+    /**
+     * Compiler object
+     *
+     * @var object
+     */
+    private $compiler = null;
+
     /**
      * Compiles code for the {/function} tag
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                       $args      array with attributes from parser
+     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
      *
-     * @return boolean true
+     * @return bool true
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->loopNesting--;
+        $this->compiler = $compiler;
         $saved_data = $this->closeTag($compiler, array('function'));
-        $_name = trim($saved_data[0]['name'], "'\"");
-        // build plugin include code
-        $plugins_string = '';
-        if (!empty($compiler->template->required_plugins['compiled'])) {
-            $plugins_string = '<?php ';
-            foreach ($compiler->template->required_plugins['compiled'] as $tmp) {
-                foreach ($tmp as $data) {
-                    $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n";
-                }
+        $_attr = $saved_data[0];
+        $_name = trim($_attr['name'], "'\"");
+        $compiler->parent_compiler->tpl_function[$_name]['called_functions'] = $compiler->parent_compiler->template->tpl_function[$_name]['called_functions'] = $compiler->called_functions;
+        $compiler->parent_compiler->tpl_function[$_name]['compiled_filepath'] = $compiler->parent_compiler->template->tpl_function[$_name]['compiled_filepath'] = $compiler->parent_compiler->template->compiled->filepath;
+        $compiler->parent_compiler->tpl_function[$_name]['uid'] = $compiler->parent_compiler->template->tpl_function[$_name]['uid'] = $compiler->template->source->uid;
+        $compiler->called_functions = array();
+        $_parameter = $_attr;
+        unset($_parameter['name']);
+        // default parameter
+        $_paramsArray = array();
+        foreach ($_parameter as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
             }
-            $plugins_string .= '?>';
         }
-        if (!empty($compiler->template->required_plugins['nocache'])) {
-            $plugins_string .= "<?php echo '/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php ";
-            foreach ($compiler->template->required_plugins['nocache'] as $tmp) {
-                foreach ($tmp as $data) {
-                    $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
+        if (!empty($_paramsArray)) {
+            $_params = 'array(' . implode(",", $_paramsArray) . ')';
+            $_paramsCode = "\$params = array_merge($_params, \$params);\n";
+        } else {
+            $_paramsCode = '';
+        }
+        $_functionCode = $compiler->parser->current_buffer;
+        // setup buffer for template function code
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+
+        $_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
+        $_funcNameCaching = $_funcName . '_nocache';
+        if ($compiler->template->compiled->has_nocache_code) {
+            $compiler->parent_compiler->tpl_function[$_name]['call_name_caching'] = $compiler->parent_compiler->template->tpl_function[$_name]['call_name_caching'] = $_funcNameCaching;
+            $output = "<?php\n";
+            $output .= "/* {$_funcNameCaching} */\n";
+            $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
+            $output .= "function {$_funcNameCaching} (\$_smarty_tpl,\$params) {\n";
+            $output .= "ob_start();\n";
+            $output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n";
+            $output .= $_paramsCode;
+            $output .= "\$_smarty_tpl->_cache['saved_tpl_vars'][] = \$_smarty_tpl->tpl_vars;\n";
+            $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value);\n}";
+            $output .= "\$params = var_export(\$params, true);\n";
+            $output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+            $output .= "\\\$saved_tpl_vars = \\\$_smarty_tpl->tpl_vars;\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value);\n}\n?>";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n\";?>";
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+            $output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+            $output .= "foreach (Smarty::\\\$global_tpl_vars as \\\$key => \\\$value){\n";
+            $output .= "if (!isset(\\\$_smarty_tpl->tpl_vars[\\\$key]) || \\\$_smarty_tpl->tpl_vars[\\\$key] === \\\$value) \\\$saved_tpl_vars[\\\$key] = \\\$value;\n}\n";
+            $output .= "\\\$_smarty_tpl->tpl_vars = \\\$saved_tpl_vars;?>\n";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
+            $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n";
+            $output .= "\$_smarty_tpl->tpl_vars = array_pop(\$_smarty_tpl->_cache['saved_tpl_vars']);\n}\n}\n";
+            $output .= "/*/ {$_funcName}_nocache */\n\n";
+            $output .= "?>\n";
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
+            $_functionCode = new Smarty_Internal_ParseTree_Tag($compiler->parser, preg_replace_callback("/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/", array($this,
+                                                                                                                                                                                                                                                                                                          'removeNocache'), $_functionCode->to_smarty_php($compiler->parser)));
+        }
+        $compiler->parent_compiler->tpl_function[$_name]['call_name'] = $compiler->parent_compiler->template->tpl_function[$_name]['call_name'] = $_funcName;
+        $output = "<?php\n";
+        $output .= "/* {$_funcName} */\n";
+        $output .= "if (!function_exists('{$_funcName}')) {\n";
+        $output .= "function {$_funcName}(\$_smarty_tpl,\$params) {\n";
+        $output .= "\$saved_tpl_vars = \$_smarty_tpl->tpl_vars;\n";
+        $output .= $_paramsCode;
+        $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value);\n}?>";
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+        $output = "<?php foreach (Smarty::\$global_tpl_vars as \$key => \$value){\n";
+        $output .= "if (!isset(\$_smarty_tpl->tpl_vars[\$key]) || \$_smarty_tpl->tpl_vars[\$key] === \$value) \$saved_tpl_vars[\$key] = \$value;\n}\n";
+        $output .= "\$_smarty_tpl->tpl_vars = \$saved_tpl_vars;\n}\n}\n";
+        $output .= "/*/ {$_funcName} */\n\n";
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $output));
+        $compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+        // nocache plugins must be copied
+        if (!empty($compiler->template->compiled->required_plugins['nocache'])) {
+            foreach ($compiler->template->compiled->required_plugins['nocache'] as $plugin => $tmp) {
+                foreach ($tmp as $type => $data) {
+                    $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$plugin][$type] = $data;
                 }
             }
-            $plugins_string .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';?>\n";
-        }
-         // if caching save template function for possible nocache call
-        if ($compiler->template->caching) {
-            $compiler->template->properties['function'][$_name]['compiled'] .= $plugins_string
-                . $compiler->parser->current_buffer->to_smarty_php();
-            $compiler->template->properties['function'][$_name]['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-            $compiler->template->properties['function'][$_name]['has_nocache_code'] = $compiler->template->has_nocache_code;
-            $compiler->template->properties['function'][$_name]['called_functions'] = $compiler->called_functions;
-            $compiler->called_functions = array();
-            $compiler->smarty->template_functions[$_name] = $compiler->template->properties['function'][$_name];
-            $compiler->has_code = false;
-            $output = true;
-        } else {
-            $output = $plugins_string . $compiler->parser->current_buffer->to_smarty_php() . "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;
-foreach (Smarty::\$global_tpl_vars as \$key => \$value) if(!isset(\$_smarty_tpl->tpl_vars[\$key])) \$_smarty_tpl->tpl_vars[\$key] = \$value;}}?>\n";
         }
-        // reset flag that we are compiling a template function
-        $compiler->compiles_template_function = false;
-        // restore old compiler status
+        // restore old buffer
+
         $compiler->parser->current_buffer = $saved_data[1];
-        $compiler->template->has_nocache_code = $compiler->template->has_nocache_code | $saved_data[2];
-        $compiler->template->required_plugins = $saved_data[3];
+        // restore old status
+        $compiler->template->compiled->has_nocache_code = $saved_data[2];
+        $compiler->template->caching = $saved_data[3];
+        return true;
+    }
 
-        return $output;
+    /**
+     * @param $match
+     *
+     * @return mixed
+     */
+    function removeNocache($match)
+    {
+        $code = preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/", '', $match[0]);
+        $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
+        return $code;
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_if.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_if.php
index d709fcfd8..541e21816 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_if.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_if.php
@@ -19,13 +19,14 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {if} tag
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -34,7 +35,7 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
 
         if (!array_key_exists("if condition", $parameter)) {
-            $compiler->trigger_template_error("missing if condition", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("missing if condition", null, true);
         }
 
         if (is_array($parameter['if condition'])) {
@@ -42,19 +43,32 @@ class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
                 $_nocache = ',true';
                 // create nocache var to make it know for further compiling
                 if (is_array($parameter['if condition']['var'])) {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
+                    $var = trim($parameter['if condition']['var']['var'], "'");
                 } else {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+                    $var = trim($parameter['if condition']['var'], "'");
+                }
+                if (isset($compiler->template->tpl_vars[$var])) {
+                    $compiler->template->tpl_vars[$var]->nocache = true;
+                } else {
+                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
                 }
             } else {
                 $_nocache = '';
             }
             if (is_array($parameter['if condition']['var'])) {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
+                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] .
+                    "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] .
+                    "]->value)) \$_smarty_tpl->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, " . $parameter['if condition']['var']['var'] .
+                    "$_nocache);\n";
+                $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" .
+                    $parameter['if condition']['var']['smarty_internal_index'] . " = " .
+                    $parameter['if condition']['value'] . ") {?>";
             } else {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
+                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] .
+                    "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] .
+                    "] = new Smarty_Variable(null{$_nocache});";
+                $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " .
+                    $parameter['if condition']['value'] . ") {?>";
             }
 
             return $_output;
@@ -75,13 +89,13 @@ class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {else} tag
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
         $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
@@ -101,13 +115,14 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {elseif} tag
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -115,7 +130,7 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
         list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
 
         if (!array_key_exists("if condition", $parameter)) {
-            $compiler->trigger_template_error("missing elseif condition", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("missing elseif condition", null, true);
         }
 
         if (is_array($parameter['if condition'])) {
@@ -124,9 +139,14 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
                 $_nocache = ',true';
                 // create nocache var to make it know for further compiling
                 if (is_array($parameter['if condition']['var'])) {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
+                    $var = trim($parameter['if condition']['var']['var'], "'");
+                } else {
+                    $var = trim($parameter['if condition']['var'], "'");
+                }
+                if (isset($compiler->template->tpl_vars[$var])) {
+                    $compiler->template->tpl_vars[$var]->nocache = true;
                 } else {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
                 }
             } else {
                 $_nocache = '';
@@ -139,11 +159,20 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
             if ($condition_by_assign) {
                 $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
                 if (is_array($parameter['if condition']['var'])) {
-                    $_output = "<?php } else { if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
+                    $_output = "<?php } else { if (!isset(\$_smarty_tpl->tpl_vars[" .
+                        $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" .
+                        $parameter['if condition']['var']['var'] .
+                        "]->value)) \$_smarty_tpl->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, " .
+                        $parameter['if condition']['var']['var'] . "$_nocache);\n";
+                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" .
+                        $parameter['if condition']['var']['smarty_internal_index'] . " = " .
+                        $parameter['if condition']['value'] . ") {?>";
                 } else {
-                    $_output = "<?php  } else { if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
+                    $_output = "<?php  } else { if (!isset(\$_smarty_tpl->tpl_vars[" .
+                        $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" .
+                        $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
+                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " .
+                        $parameter['if condition']['value'] . ") {?>";
                 }
 
                 return $_output;
@@ -155,22 +184,35 @@ class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
         } else {
             $tmp = '';
             foreach ($compiler->prefix_code as $code) {
-                $tmp .= $code;
+                $tmp = $compiler->appendCode($tmp, $code);
             }
             $compiler->prefix_code = array();
+            $tmp = $compiler->appendCode("<?php } else {?>", $tmp);
             $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
             if ($condition_by_assign) {
                 if (is_array($parameter['if condition']['var'])) {
-                    $_output = "<?php } else {?>{$tmp}<?php  if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
+                    $_output = $compiler->appendCode($tmp, "<?php  if (!isset(\$_smarty_tpl->tpl_vars[" .
+                                                         $parameter['if condition']['var']['var'] .
+                                                         "]) || !is_array(\$_smarty_tpl->tpl_vars[" .
+                                                         $parameter['if condition']['var']['var'] .
+                                                         "]->value)) \$_smarty_tpl->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, " .
+                                                         $parameter['if condition']['var']['var'] . "$_nocache);\n");
+                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" .
+                        $parameter['if condition']['var']['smarty_internal_index'] . " = " .
+                        $parameter['if condition']['value'] . ") {?>";
                 } else {
-                    $_output = "<?php } else {?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
+                    $_output = $compiler->appendCode($tmp, "<?php if (!isset(\$_smarty_tpl->tpl_vars[" .
+                                                         $parameter['if condition']['var'] .
+                                                         "])) \$_smarty_tpl->tpl_vars[" .
+                                                         $parameter['if condition']['var'] .
+                                                         "] = new Smarty_Variable(null{$_nocache});");
+                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " .
+                        $parameter['if condition']['value'] . ") {?>";
                 }
 
                 return $_output;
             } else {
-                return "<?php } else {?>{$tmp}<?php if ({$parameter['if condition']}) {?>";
+                return $compiler->appendCode($tmp, "<?php if ({$parameter['if condition']}) {?>");
             }
         }
     }
@@ -187,13 +229,13 @@ class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {/if} tag
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // must endblock be nocache?
         if ($compiler->nocache) {
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_include.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_include.php
index 4b7b09ce7..09fa11d6c 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_include.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_include.php
@@ -20,6 +20,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
      * caching mode to create nocache code but no cache file
      */
     const CACHING_NOCACHE_CODE = 9999;
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -27,6 +28,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('file');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -34,13 +36,15 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('file');
+
     /**
      * Attribute definition: Overwrites base class.
      *
      * @var array
      * @see Smarty_Internal_CompileBase
      */
-    public $option_flags = array('nocache', 'inline', 'caching');
+    public $option_flags = array('nocache', 'inline', 'caching', 'bubble_up');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -50,64 +54,160 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
     public $optional_attributes = array('_any');
 
     /**
+     * Valid scope names
+     *
+     * @var array
+     */
+    public $valid_scopes = array('local'  => true, 'parent' => true, 'root' => true, 'global' => true,
+                                 'smarty' => true, 'tpl_root' => true);
+
+    /**
      * Compiles code for the {include} tag
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                  $args      array with attributes from parser
+     * @param  Smarty_Internal_SmartyTemplateCompiler $compiler  compiler object
+     * @param  array                                  $parameter array with compilation parameter
      *
+     * @throws SmartyCompilerException
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        // save possible attributes
-        $include_file = $_attr['file'];
+
+        $hashResourceName = $fullResourceName = $source_resource = $_attr['file'];
+        $variable_template = false;
+        $cache_tpl = false;
+        // parse resource_name
+        if (preg_match('/^([\'"])(([A-Za-z0-9_\-]{2,})[:])?(([^$()]+)|(.+))\1$/', $source_resource, $match)) {
+            $type = !empty($match[3]) ? $match[3] : $compiler->template->smarty->default_resource_type;
+            $name = !empty($match[5]) ? $match[5] : $match[6];
+            $handler = Smarty_Resource::load($compiler->smarty, $type);
+            if ($handler->recompiled || $handler->uncompiled) {
+                $variable_template = true;
+            }
+            if (!$variable_template) {
+                if ($type != 'string') {
+                    $fullResourceName = "{$type}:{$name}";
+                    $compiled = $compiler->parent_compiler->template->compiled;
+                    if (isset($compiled->includes[$fullResourceName])) {
+                        $compiled->includes[$fullResourceName] ++;
+                        $cache_tpl = true;
+                    } else {
+                        $compiled->includes[$fullResourceName] = 1;
+                    }
+                    $fullResourceName = '"' . $fullResourceName . '"';
+                }
+            }
+            if (empty($match[5])) {
+                $variable_template = true;
+            }
+        } else {
+            $variable_template = true;
+        }
 
         if (isset($_attr['assign'])) {
             // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr['assign'];
         }
 
-        $_parent_scope = Smarty::SCOPE_LOCAL;
+        // scope setup
+        $_scope = Smarty::SCOPE_LOCAL;
         if (isset($_attr['scope'])) {
             $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_parent_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_parent_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_parent_scope = Smarty::SCOPE_GLOBAL;
+            if (!isset($this->valid_scopes[$_attr['scope']])) {
+                $compiler->trigger_template_error("illegal value '{$_attr['scope']}' for \"scope\" attribute", null, true);
+            }
+            if ($_attr['scope'] != 'local') {
+                if ($_attr['scope'] == 'parent') {
+                    $_scope = Smarty::SCOPE_PARENT;
+                } elseif ($_attr['scope'] == 'root') {
+                    $_scope = Smarty::SCOPE_ROOT;
+                } elseif ($_attr['scope'] == 'global') {
+                    $_scope = Smarty::SCOPE_GLOBAL;
+                } elseif ($_attr['scope'] == 'smarty') {
+                    $_scope = Smarty::SCOPE_SMARTY;
+                } elseif ($_attr['scope'] == 'tpl_root') {
+                    $_scope = Smarty::SCOPE_TPL_ROOT;
+                }
+                if ($_attr['bubble_up'] === true) {
+                    $_scope = $_scope + Smarty::SCOPE_BUBBLE_UP;
+                }
             }
         }
 
+        // set flag to cache subtemplate object when called within loop or template name is variable.
+        if ($cache_tpl || $variable_template || $compiler->loopNesting > 0) {
+            $_cache_tpl = 'true';
+        } else {
+            $_cache_tpl = 'false';
+        }
+        // assume caching is off
         $_caching = Smarty::CACHING_OFF;
 
-        // flag if included template code should be merged into caller
-        $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) || $_attr['inline'] === true) && !$compiler->template->source->recompiled;
+        if ($_attr['nocache'] === true) {
+            $compiler->tag_nocache = true;
+        }
+
+        $call_nocache = $compiler->tag_nocache || $compiler->nocache;
 
-        // set default when in nocache mode
-        //       if ($compiler->template->caching && ($compiler->nocache || $compiler->tag_nocache || $compiler->forceNocache == 2)) {
-        if ($compiler->template->caching && ((!$compiler->inheritance && !$compiler->nocache && !$compiler->tag_nocache) || ($compiler->inheritance && ($compiler->nocache || $compiler->tag_nocache)))) {
+        // caching was on and {include} is not in nocache mode
+        if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
             $_caching = self::CACHING_NOCACHE_CODE;
         }
+
+        // flag if included template code should be merged into caller
+        $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) &&
+            !$compiler->template->source->handler->recompiled;
+
+        if ($merge_compiled_includes && $_attr['inline'] !== true) {
+            // variable template name ?
+            if ($variable_template) {
+                $merge_compiled_includes = false;
+                if ($compiler->template->caching) {
+                    // must use individual cache file
+                    //$_attr['caching'] = 1;
+                }
+            }
+            // variable compile_id?
+            if (isset($_attr['compile_id'])) {
+                if (!((substr_count($_attr['compile_id'], '"') == 2 || substr_count($_attr['compile_id'], "'") == 2 ||
+                        is_numeric($_attr['compile_id']))) || substr_count($_attr['compile_id'], '(') != 0 ||
+                    substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0
+                ) {
+                    $merge_compiled_includes = false;
+                    if ($compiler->template->caching) {
+                        // must use individual cache file
+                        //$_attr['caching'] = 1;
+                    }
+                }
+            }
+        }
+
         /*
-        * if the {include} tag provides individual parameter for caching
-        * it will not be included into the common cache file and treated like
-        * a nocache section
+        * if the {include} tag provides individual parameter for caching or compile_id
+        * the subtemplate must not be included into the common cache file and is treated like
+        * a call in nocache mode.
+        *
         */
+        if ($_attr['nocache'] !== true && $_attr['caching']) {
+            $_caching = $_new_caching = (int) $_attr['caching'];
+            $call_nocache = true;
+        } else {
+            $_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        }
         if (isset($_attr['cache_lifetime'])) {
             $_cache_lifetime = $_attr['cache_lifetime'];
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+            $call_nocache = true;
+            $_caching = $_new_caching;
         } else {
-            $_cache_lifetime = 'null';
+            $_cache_lifetime = '$_smarty_tpl->cache_lifetime';
         }
         if (isset($_attr['cache_id'])) {
             $_cache_id = $_attr['cache_id'];
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+            $call_nocache = true;
+            $_caching = $_new_caching;
         } else {
             $_cache_id = '$_smarty_tpl->cache_id';
         }
@@ -116,150 +216,151 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
         } else {
             $_compile_id = '$_smarty_tpl->compile_id';
         }
-        if ($_attr['caching'] === true) {
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        }
-        if ($_attr['nocache'] === true) {
-            $compiler->tag_nocache = true;
-            if ($merge_compiled_includes) {
-                $_caching = self::CACHING_NOCACHE_CODE;
-            } else {
-                $_caching = Smarty::CACHING_OFF;
-            }
+
+        // if subtemplate will be called in nocache mode do not merge
+        if ($compiler->template->caching && $call_nocache) {
+            $merge_compiled_includes = false;
         }
 
         $has_compiled_template = false;
-        if ($merge_compiled_includes && $_attr['inline'] !== true) {
-            // variable template name ?
-            if ($compiler->has_variable_string || !((substr_count($include_file, '"') == 2 || substr_count($include_file, "'") == 2))
-                || substr_count($include_file, '(') != 0 || substr_count($include_file, '$_smarty_tpl->') != 0
-            ) {
-                $merge_compiled_includes = false;
-                if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) {
-                    $compiler->trigger_template_error(' variable template file names not allow within {block} tags');
-                }
-            }
-            // variable compile_id?
-            if (isset($_attr['compile_id'])) {
-                if (!((substr_count($_attr['compile_id'], '"') == 2 || substr_count($_attr['compile_id'], "'") == 2))
-                    || substr_count($_attr['compile_id'], '(') != 0 || substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0
-                ) {
-                    $merge_compiled_includes = false;
-                    if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) {
-                        $compiler->trigger_template_error(' variable compile_id not allow within {block} tags');
-                    }
-                }
-            }
-        }
-        if ($merge_compiled_includes) {
-            if ($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache) && $_caching != self::CACHING_NOCACHE_CODE) {
-                $merge_compiled_includes = false;
-                if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) {
-                    $compiler->trigger_template_error(' invalid caching mode of subtemplate within {block} tags');
-                }
-            }
-        }
         if ($merge_compiled_includes) {
-            // we must observe different compile_id
-            $uid = sha1($_compile_id);
-            $tpl_name = null;
-            $nocache = false;
-            /** @var Smarty_Internal_Template $_smarty_tpl
-             * used in evaluated code
-             */
-            $_smarty_tpl = $compiler->template;
-            eval("\$tpl_name = $include_file;");
-            if (!isset($compiler->smarty->merged_templates_func[$tpl_name][$uid])) {
-                $tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
-                // save unique function name
-                $compiler->smarty->merged_templates_func[$tpl_name][$uid]['func'] = $tpl->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-                // use current nocache hash for inlined code
-                $compiler->smarty->merged_templates_func[$tpl_name][$uid]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-                if ($compiler->template->caching && $_caching == self::CACHING_NOCACHE_CODE) {
-                    // all code must be nocache
-                    $nocache = true;
-                }
-                if ($compiler->inheritance) {
-                    $tpl->compiler->inheritance = true;
-                }
-                // make sure whole chain gets compiled
-                $tpl->mustCompile = true;
-                if (!($tpl->source->uncompiled) && $tpl->source->exists) {
-
-                    // get compiled code
-                    $compiled_code = $tpl->compiler->compileTemplate($tpl, $nocache);
-                    // release compiler object to free memory
-                    unset($tpl->compiler);
-                    // merge compiled code for {function} tags
-                    $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']);
-                    // merge filedependency
-                    $tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp, $tpl->source->type);
-                    $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']);
-                    // remove header code
-                    $compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code);
-                    if ($tpl->has_nocache_code) {
-                        // replace nocache_hash
-                        $compiled_code = str_replace("{$tpl->properties['nocache_hash']}", $compiler->template->properties['nocache_hash'], $compiled_code);
-                        $compiler->template->has_nocache_code = true;
-                    }
-                    $compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code;
-                    $has_compiled_template = true;
-                    unset ($tpl);
-                }
+            $c_id = isset($_attr['compile_id']) ? $_attr['compile_id'] : $compiler->template->compile_id;
+            // we must observe different compile_id and caching
+            $t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
+            if (!isset($compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash])) {
+                $has_compiled_template =
+                    $this->compileInlineTemplate($compiler, $fullResourceName, $_caching, $hashResourceName, $t_hash,
+                                                 $c_id);
             } else {
                 $has_compiled_template = true;
             }
         }
         // delete {include} standard attributes
-        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
+        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline'], $_attr['bubble_up']);
         // remaining attributes must be assigned as smarty variable
+        $_vars_nc = '';
         if (!empty($_attr)) {
-            if ($_parent_scope == Smarty::SCOPE_LOCAL) {
+            if ($_scope == Smarty::SCOPE_LOCAL) {
+                $_pairs = array();
                 // create variables
-                $nccode = '';
                 foreach ($_attr as $key => $value) {
                     $_pairs[] = "'$key'=>$value";
-                    $nccode .= "\$_smarty_tpl->tpl_vars['$key'] =  new Smarty_variable($value);\n";
+                    $_vars_nc .= "\$_smarty_tpl->tpl_vars['$key'] =  new Smarty_Variable($value);\n";
                 }
                 $_vars = 'array(' . join(',', $_pairs) . ')';
             } else {
-                $compiler->trigger_template_error('variable passing not allowed in parent/global scope', $compiler->lex->taglineno);
+                $compiler->trigger_template_error('variable passing not allowed in parent/global scope', null, true);
             }
         } else {
             $_vars = 'array()';
         }
-        if ($has_compiled_template) {
-            // never call inline templates in nocache mode
-            $compiler->suppressNocacheProcessing = true;
-            $_hash = $compiler->smarty->merged_templates_func[$tpl_name][$uid]['nocache_hash'];
-            $_output = "<?php /*  Call merged included template \"" . $tpl_name . "\" */\n";
-            $_output .= "\$_tpl_stack[] = \$_smarty_tpl;\n";
-            if (!empty($nccode) && $_caching == 9999 && $_smarty_tpl->caching) {
-                $compiler->suppressNocacheProcessing = false;
-                $_output .=  substr($compiler->processNocacheCode('<?php ' .$nccode . "?>\n", true), 6, -3);
-                $compiler->suppressNocacheProcessing = true;
+        $update_compile_id = $compiler->template->caching && !$compiler->tag_nocache && !$compiler->nocache &&
+            $_compile_id != '$_smarty_tpl->compile_id';
+        if ($has_compiled_template && !$call_nocache) {
+            $_output = "<?php\n";
+            if ($update_compile_id) {
+                $_output .= $compiler->makeNocacheCode("\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n");
+            }
+            if (!empty($_vars_nc) && $_caching == 9999 && $compiler->template->caching) {
+                //$compiler->suppressNocacheProcessing = false;
+                $_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, - 3);
+                //$compiler->suppressNocacheProcessing = true;
             }
-            $_output .= " \$_smarty_tpl = \$_smarty_tpl->setupInlineSubTemplate($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope, '$_hash');\n";
             if (isset($_assign)) {
-                $_output .= 'ob_start(); ';
+                $_output .= "ob_start();\n";
             }
-            $_output .= $compiler->smarty->merged_templates_func[$tpl_name][$uid]['func'] . "(\$_smarty_tpl);\n";
-            $_output .= "\$_smarty_tpl = array_pop(\$_tpl_stack); ";
+            $_output .= "\$_smarty_tpl->smarty->ext->_subtemplate->render(\$_smarty_tpl, {$fullResourceName}, {$_cache_id}, {$_compile_id}, {$_caching}, {$_cache_lifetime}, {$_vars}, {$_scope}, {$_cache_tpl}, '{$compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['uid']}', '{$compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['func']}');\n";
             if (isset($_assign)) {
-                $_output .= " \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(ob_get_clean());";
+                $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+            }
+            if ($update_compile_id) {
+                $_output .= $compiler->makeNocacheCode("\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n");
             }
-            $_output .= "\n/*  End of included template \"" . $tpl_name . "\" */?>";
+            $_output .= "?>\n";
 
             return $_output;
         }
 
+        if ($call_nocache) {
+            $compiler->tag_nocache = true;
+        }
+        $_output = "<?php ";
+        if ($update_compile_id) {
+            $_output .= "\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n";
+        }
         // was there an assign attribute
         if (isset($_assign)) {
-            $_output = "<?php \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(\$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope));?>\n";;
-        } else {
-            $_output = "<?php echo \$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);?>\n";
+            $_output .= "ob_start();\n";
         }
-
+        $_output .= "\$_smarty_tpl->smarty->ext->_subtemplate->render(\$_smarty_tpl, {$fullResourceName}, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_scope, {$_cache_tpl});\n";
+        if (isset($_assign)) {
+            $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+        }
+        if ($update_compile_id) {
+            $_output .= "\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n";
+        }
+        $_output .= "?>\n";
         return $_output;
     }
+
+    /**
+     * Compile inline sub template
+     *
+     * @param \Smarty_Internal_SmartyTemplateCompiler $compiler
+     * @param                                         $fullResourceName
+     * @param                                         $_caching
+     * @param                                         $hashResourceName
+     * @param                                         $t_hash
+     * @param                                         $c_id
+     *
+     * @return bool
+     */
+    public function compileInlineTemplate(Smarty_Internal_SmartyTemplateCompiler $compiler, $fullResourceName,
+                                          $_caching, $hashResourceName, $t_hash, $c_id)
+    {
+        $compiler->smarty->allow_ambiguous_resources = true;
+        /* @var Smarty_Internal_Template $tpl */
+        $tpl =
+            new $compiler->smarty->template_class (trim($fullResourceName, '"\''), $compiler->smarty, $compiler->template,
+                                                   $compiler->template->cache_id, $c_id, $_caching);
+        if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) {
+            $compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['uid'] = $tpl->source->uid;
+            if (isset($compiler->template->_inheritance)) {
+                $tpl->_inheritance = clone $compiler->template->_inheritance;
+            }
+            $tpl->compiled = new Smarty_Template_Compiled();
+            $tpl->compiled->nocache_hash = $compiler->parent_compiler->template->compiled->nocache_hash;
+            $tpl->loadCompiler();
+            // save unique function name
+            $compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['func'] =
+            $tpl->compiled->unifunc = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+            // make sure whole chain gets compiled
+            $tpl->mustCompile = true;
+            $compiler->parent_compiler->mergedSubTemplatesData[$hashResourceName][$t_hash]['nocache_hash'] =
+                $tpl->compiled->nocache_hash;
+            // get compiled code
+            $compiled_code = "<?php\n\n";
+            $compiled_code .= "/* Start inline template \"{$tpl->source->type}:{$tpl->source->name}\" =============================*/\n";
+            $compiled_code .= "function {$tpl->compiled->unifunc} (\$_smarty_tpl) {\n";
+            $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
+            $compiled_code .= "<?php\n";
+            $compiled_code .= "}\n?>\n";
+            $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
+            $compiled_code .= "<?php\n\n";
+            $compiled_code .= "/* End inline template \"{$tpl->source->type}:{$tpl->source->name}\" =============================*/\n";
+            $compiled_code .= "?>";
+            unset($tpl->compiler);
+            if ($tpl->compiled->has_nocache_code) {
+                // replace nocache_hash
+                $compiled_code =
+                    str_replace("{$tpl->compiled->nocache_hash}", $compiler->template->compiled->nocache_hash,
+                                $compiled_code);
+                $compiler->template->compiled->has_nocache_code = true;
+            }
+            $compiler->parent_compiler->mergedSubTemplatesCode[$tpl->compiled->unifunc] = $compiled_code;
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_include_php.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_include_php.php
index 76f506c52..e7e62997c 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_include_php.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_include_php.php
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('file');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -30,6 +31,7 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('file');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -41,13 +43,14 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {include_php} tag
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
-     * @throws SmartyException
-     * @return string compiled code
+     * @return string
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         if (!($compiler->smarty instanceof SmartyBC)) {
             throw new SmartyException("{include_php} is deprecated, use SmartyBC class to enable");
@@ -60,9 +63,10 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
          */
         $_smarty_tpl = $compiler->template;
         $_filepath = false;
-        eval('$_file = ' . $_attr['file'] . ';');
+        $_file = null;
+        eval('$_file = @' . $_attr['file'] . ';');
         if (!isset($compiler->smarty->security_policy) && file_exists($_file)) {
-            $_filepath = $_file;
+            $_filepath = $compiler->smarty->_realpath($_file, true);
         } else {
             if (isset($compiler->smarty->security_policy)) {
                 $_dir = $compiler->smarty->security_policy->trusted_dir;
@@ -71,16 +75,16 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
             }
             if (!empty($_dir)) {
                 foreach ((array) $_dir as $_script_dir) {
-                    $_script_dir = rtrim($_script_dir, '/\\') . DS;
-                    if (file_exists($_script_dir . $_file)) {
-                        $_filepath = $_script_dir . $_file;
+                    $_path = $compiler->smarty->_realpath($_script_dir . DS . $_file, true);
+                    if (file_exists($_path)) {
+                        $_filepath = $_path;
                         break;
                     }
                 }
             }
         }
         if ($_filepath == false) {
-            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", null, true);
         }
 
         if (isset($compiler->smarty->security_policy)) {
@@ -99,7 +103,7 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
         }
 
         if (isset($_assign)) {
-            return "<?php ob_start(); include{$_once} ('{$_filepath}'); \$_smarty_tpl->assign({$_assign},ob_get_contents()); ob_end_clean();?>";
+            return "<?php ob_start();\ninclude{$_once} ('{$_filepath}');\n\$_smarty_tpl->assign({$_assign},ob_get_clean());\n?>";
         } else {
             return "<?php include{$_once} ('{$_filepath}');?>\n";
         }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_insert.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_insert.php
index 4c6585543..2ebde1661 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_insert.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_insert.php
@@ -24,6 +24,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -31,6 +32,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -42,17 +44,21 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {insert} tag
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        // never compile as nocache code
-        $compiler->suppressNocacheProcessing = true;
+        $nocacheParam = $compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache);
+        if (!$nocacheParam) {
+            // do not compile as nocache code
+            $compiler->suppressNocacheProcessing = true;
+        }
         $compiler->tag_nocache = true;
         $_smarty_tpl = $compiler->template;
         $_name = null;
@@ -60,19 +66,24 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
 
         $_output = '<?php ';
         // save possible attributes
-        eval('$_name = ' . $_attr['name'] . ';');
+        eval('$_name = @' . $_attr['name'] . ';');
         if (isset($_attr['assign'])) {
             // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr['assign'];
             // create variable to make sure that the compiler knows about its nocache status
-            $compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true);
+            $var = trim($_attr['assign'], "'");
+            if (isset($compiler->template->tpl_vars[$var])) {
+                $compiler->template->tpl_vars[$var]->nocache = true;
+            } else {
+                $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
+            }
         }
         if (isset($_attr['script'])) {
             // script which must be included
             $_function = "smarty_insert_{$_name}";
             $_smarty_tpl = $compiler->template;
             $_filepath = false;
-            eval('$_script = ' . $_attr['script'] . ';');
+            eval('$_script = @' . $_attr['script'] . ';');
             if (!isset($compiler->smarty->security_policy) && file_exists($_script)) {
                 $_filepath = $_script;
             } else {
@@ -92,13 +103,13 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
                 }
             }
             if ($_filepath == false) {
-                $compiler->trigger_template_error("{insert} missing script file '{$_script}'", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("{insert} missing script file '{$_script}'", null, true);
             }
             // code for script file loading
             $_output .= "require_once '{$_filepath}' ;";
             require_once $_filepath;
             if (!is_callable($_function)) {
-                $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", $compiler->lex->taglineno);
+                $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", null, true);
             }
         } else {
             $_filepath = 'null';
@@ -107,7 +118,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
             if (!is_callable($_function)) {
                 // try plugin
                 if (!$_function = $compiler->getPlugin($_name, 'insert')) {
-                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", $compiler->lex->taglineno);
+                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", null, true);
                 }
             }
         }
@@ -121,14 +132,14 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
         $_params = 'array(' . implode(", ", $_paramsArray) . ')';
         // call insert
         if (isset($_assign)) {
-            if ($_smarty_tpl->caching) {
+            if ($_smarty_tpl->caching && !$nocacheParam) {
                 $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}',{$_assign});?>";
             } else {
                 $_output .= "\$_smarty_tpl->assign({$_assign} , {$_function} ({$_params},\$_smarty_tpl), true);?>";
             }
         } else {
             $compiler->has_output = true;
-            if ($_smarty_tpl->caching) {
+            if ($_smarty_tpl->caching && !$nocacheParam) {
                 $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}');?>";
             } else {
                 $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_ldelim.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
index 91b44881e..8c6b701e1 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
@@ -20,16 +20,17 @@ class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
      * Compiles code for the {ldelim} tag
      * This tag does output the left delimiter
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
         // this tag does not return compiled code
         $compiler->has_code = true;
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_nocache.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_nocache.php
index ba39717fd..b29a993aa 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_nocache.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_nocache.php
@@ -17,20 +17,25 @@
 class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
 {
     /**
+     * Array of names of valid option flags
+     *
+     * @var array
+     */
+    public $option_flags = array();
+
+    /**
      * Compiles code for the {nocache} tag
      * This tag does not generate compiled output. It only sets a compiler flag.
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return bool
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
+        $this->openTag($compiler, 'nocache', array($compiler->nocache));
         // enter nocache mode
         $compiler->nocache = true;
         // this tag does not return compiled code
@@ -52,16 +57,16 @@ class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
      * Compiles code for the {/nocache} tag
      * This tag does not generate compiled output. It only sets a compiler flag.
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return bool
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
         // leave nocache mode
-        $compiler->nocache = false;
+        list($compiler->nocache) = $this->closeTag($compiler, array('nocache'));
         // this tag does not return compiled code
         $compiler->has_code = false;
 
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
index 3dff8538e..9e2eea233 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
@@ -27,15 +27,15 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
     /**
      * Compiles code for the execution of block plugin
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of block plugin
-     * @param  string $function  PHP function name
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     * @param  string                               $tag       name of block plugin
+     * @param  string                               $function  PHP function name
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag, $function)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function)
     {
         if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
             // opening tag of block plugin
@@ -60,7 +60,7 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
             // maybe nocache because of nocache variables or nocache plugin
             $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
             // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            $output = "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
         } else {
             // must endblock be nocache?
             if ($compiler->nocache) {
@@ -75,9 +75,13 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
                 $mod_pre = $mod_post = '';
             } else {
                 $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
+                $mod_post = 'echo ' .
+                    $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'],
+                                                                             'value'        => 'ob_get_clean()')) . ';';
             }
-            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . " } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post .
+                " } array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
         }
 
         return $output . "\n";
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php
new file mode 100644
index 000000000..50c25bdb6
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile ForeachSection
+ * Shared methods for {foreach} {section} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile ForeachSection Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_CompileBase
+{
+
+    /**
+     * Preg search pattern
+     *
+     * @var string
+     */
+    private $propertyPreg = '';
+
+    /**
+     * Offsets in preg match result
+     *
+     * @var array
+     */
+    private $resultOffsets = array();
+
+    /**
+     * Start offset
+     *
+     * @var int
+     */
+    private $startOffset = 0;
+
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = '';
+
+    /**
+     * Valid properties of $smarty.xxx variable
+     *
+     * @var array
+     */
+    public static $nameProperties = array();
+
+    /**
+     * {section} tag has no item properties
+     *
+     * @var array
+     */
+    public $itemProperties = null;
+
+    /**
+     * {section} tag has always name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = true;
+
+    /**
+     * @var array
+     */
+    public $matchResults = array();
+
+    /**
+     * Scan sources for used tag attributes
+     *
+     * @param  array                                $attributes
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function scanForProperties($attributes, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->propertyPreg = '~(';
+        $this->startOffset = 0;
+        $this->resultOffsets = array();
+        $this->matchResults = array('named' => array(), 'item' => array());
+        if ($this->isNamed) {
+            $this->buildPropertyPreg(true, $attributes);
+        }
+        if (isset($this->itemProperties)) {
+            if ($this->isNamed) {
+                $this->propertyPreg .= '|';
+            }
+            $this->buildPropertyPreg(false, $attributes);
+        }
+        $this->propertyPreg .= ')\W~i';
+        // Template source
+        $this->matchTemplateSource($compiler);
+        // Parent template source
+        $this->matchParentTemplateSource($compiler);
+        // {block} source
+        $this->matchBlockSource($compiler);
+    }
+
+    /**
+     * Build property preg string
+     *
+     * @param bool  $named
+     * @param array $attributes
+     */
+    public function buildPropertyPreg($named, $attributes)
+    {
+        if ($named) {
+            $this->resultOffsets['named'] = $this->startOffset + 3;
+            $this->propertyPreg .= "([\$]smarty[.]{$this->tagName}[.]{$attributes['name']}[.](";
+            $className = get_class($this);
+            $properties = $className::$nameProperties;
+        } else {
+            $this->resultOffsets['item'] = $this->startOffset + 3;
+            $this->propertyPreg .= "([\$]{$attributes['item']}[@](";
+            $properties = $this->itemProperties;
+        }
+        $this->startOffset += count($properties) + 2;
+        $propName = reset($properties);
+        while ($propName) {
+            $this->propertyPreg .= "({$propName})";
+            $propName = next($properties);
+            if ($propName) {
+                $this->propertyPreg .= '|';
+            }
+        }
+        $this->propertyPreg .= '))';
+    }
+
+    /**
+     * Find matches in source string
+     *
+     * @param string $source
+     */
+    public function matchProperty($source)
+    {
+        preg_match_all($this->propertyPreg, $source, $match, PREG_SET_ORDER);
+        foreach ($this->resultOffsets as $key => $offset) {
+            foreach ($match as $m) {
+                if (isset($m[$offset]) && !empty($m[$offset])) {
+                    $this->matchResults[$key][strtolower($m[$offset])] = true;
+                }
+            }
+        }
+    }
+
+    /**
+     * Find matches in template source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->matchProperty($compiler->parser->lex->data);
+    }
+
+    /**
+     * Find matches in all parent template source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchParentTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // search parent compiler template source
+        $nextCompiler = $compiler;
+        while ($nextCompiler !== $nextCompiler->parent_compiler) {
+            $nextCompiler = $nextCompiler->parent_compiler;
+            if ($compiler !== $nextCompiler) {
+                // get template source
+                $_content = $nextCompiler->template->source->getContent();
+                if ($_content != '') {
+                    // run pre filter if required
+                    if ((isset($nextCompiler->smarty->autoload_filters['pre']) ||
+                            isset($nextCompiler->smarty->registered_filters['pre']))) {
+                        $_content = $nextCompiler->smarty->ext->_filter_Handler->runFilter('pre', $_content, $nextCompiler->template);
+                    }
+                    $this->matchProperty($_content);
+                }
+            }
+        }
+    }
+
+    /**
+     * Find matches in {block} tag source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchBlockSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+
+    }
+
+    /**
+     * Compiles code for the {$smarty.foreach.xxx} or {$smarty.section.xxx}tag
+     *
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public static function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        $tag = strtolower(trim($parameter[ 0 ], '"\''));
+        $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
+        if (!$name) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
+        }
+        /* @var Smarty_Internal_Compile_Foreach|Smarty_Internal_Compile_Section $className */
+        $className = 'Smarty_Internal_Compile_' . ucfirst($tag);
+        $property = isset($parameter[ 2 ]) ? strtolower($compiler->getId($parameter[ 2 ])) : false;
+        if (!$property || !in_array($property, $className::$nameProperties)) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
+        }
+        $tagVar = "'__smarty_{$tag}_{$name}'";
+        return "(isset(\$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}']) ? \$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}'] : null)";
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
index 4fbd4dc18..0d0ab8138 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array();
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -34,15 +35,15 @@ class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_Co
     /**
      * Compiles code for the execution of function plugin
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      * @param  array  $parameter array with compilation parameter
      * @param  string $tag       name of function plugin
-     * @param  string $function  PHP function name
+     * @param  string                               $function PHP function name
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag, $function)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase  $compiler, $parameter, $tag, $function)
     {
         // This tag does create output
         $compiler->has_output = true;
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
index ba03bfcfa..9594d2ae7 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
@@ -20,13 +20,14 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
     /**
      * Compiles code for modifier execution
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -52,7 +53,8 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                                 $output = "{$function}({$params})";
                             } else {
                                 if (is_object($function[0])) {
-                                    $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
+                                    $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' .
+                                        $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
                                 } else {
                                     $output = $function[0] . '::' . $function[1] . '(' . $params . ')';
                                 }
@@ -73,7 +75,9 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                         // modifiercompiler plugin
                         if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
                             // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
+                            if (!is_object($compiler->smarty->security_policy) ||
+                                $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
                                 $plugin = 'smarty_modifiercompiler_' . $modifier;
                                 $output = $plugin($single_modifier, $compiler);
                             }
@@ -85,7 +89,9 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                         // modifier plugin
                         if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
                             // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
+                            if (!is_object($compiler->smarty->security_policy) ||
+                                $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
                                 $output = "{$function}({$params})";
                             }
                             $compiler->known_modifier_type[$modifier] = $type;
@@ -96,7 +102,9 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                         // PHP function
                         if (is_callable($modifier)) {
                             // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)) {
+                            if (!is_object($compiler->smarty->security_policy) ||
+                                $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
+                            ) {
                                 $output = "{$modifier}({$params})";
                             }
                             $compiler->known_modifier_type[$modifier] = $type;
@@ -105,21 +113,29 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                         break;
                     case 6:
                         // default plugin handler
-                        if (isset($compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier]) || (is_callable($compiler->smarty->default_plugin_handler_func) && $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))) {
+                        if (isset($compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier]) ||
+                            (is_callable($compiler->smarty->default_plugin_handler_func) &&
+                                $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))
+                        ) {
                             $function = $compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0];
                             // check if modifier allowed
-                            if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
+                            if (!is_object($compiler->smarty->security_policy) ||
+                                $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
                                 if (!is_array($function)) {
                                     $output = "{$function}({$params})";
                                 } else {
                                     if (is_object($function[0])) {
-                                        $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
+                                        $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' .
+                                            $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
                                     } else {
                                         $output = $function[0] . '::' . $function[1] . '(' . $params . ')';
                                     }
                                 }
                             }
-                            if (isset($compiler->template->required_plugins['nocache'][$modifier][Smarty::PLUGIN_MODIFIER]['file']) || isset($compiler->template->required_plugins['compiled'][$modifier][Smarty::PLUGIN_MODIFIER]['file'])) {
+                            if (isset($compiler->parent_compiler->template->compiled->required_plugins['nocache'][$modifier][Smarty::PLUGIN_MODIFIER]['file']) ||
+                                isset($compiler->parent_compiler->template->compiled->required_plugins['compiled'][$modifier][Smarty::PLUGIN_MODIFIER]['file'])
+                            ) {
                                 // was a plugin
                                 $compiler->known_modifier_type[$modifier] = 4;
                             } else {
@@ -130,7 +146,7 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                 }
             }
             if (!isset($compiler->known_modifier_type[$modifier])) {
-                $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", null, true);
             }
         }
 
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
index 5418fefff..d2bc5d60c 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
@@ -27,15 +27,15 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
     /**
      * Compiles code for the execution of block plugin
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of block object
-     * @param  string $method    name of method to call
+     * @param  array                                $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                $parameter array with compilation parameter
+     * @param  string                               $tag       name of block object
+     * @param  string                               $method    name of method to call
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag, $method)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $method)
     {
         if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
             // opening tag of block plugin
@@ -60,7 +60,8 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
             // maybe nocache because of nocache variables or nocache plugin
             $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
             // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}->{$method}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            $output =
+                "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}->{$method}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
         } else {
             $base_tag = substr($tag, 0, - 5);
             // must endblock be nocache?
@@ -76,9 +77,13 @@ class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Inter
                 $mod_pre = $mod_post = '';
             } else {
                 $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
+                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(),
+                                                            array('modifierlist' => $parameter['modifier_list'],
+                                                                  'value'        => 'ob_get_clean()')) . ';';
             }
-            $output = "<?php \$_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "  } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                " echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " .
+                $mod_post . "  } array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
         }
 
         return $output . "\n";
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
index d6eb47ab3..e306e0f6d 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
@@ -27,15 +27,15 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
     /**
      * Compiles code for the execution of function plugin
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of function
-     * @param  string $method    name of method to call
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     * @param  string                                      $tag       name of function
+     * @param  string                                      $method    name of method to call
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag, $method)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $method)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_php.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_php.php
new file mode 100644
index 000000000..3ca63a548
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_php.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile PHP Expression
+ * Compiles any tag which will output an expression or variable
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile PHP Expression Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
+{
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('code', 'type');
+
+    /**
+     * Compiles code for generating output from any expression
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $compiler->has_code = false;
+        if ($_attr['type'] == 'xml') {
+            $compiler->tag_nocache = true;
+            $save = $compiler->template->compiled->has_nocache_code;
+            $output = addcslashes($_attr['code'], "'\\");
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $compiler->processNocacheCode("<?php echo '" .
+                                                                                                                                                                    $output .
+                                                                                                                                                                    "';?>", $compiler, true)));
+            $compiler->template->compiled->has_nocache_code = $save;
+            return '';
+        }
+        if ($_attr['type'] != 'tag') {
+            if ($compiler->php_handling == Smarty::PHP_REMOVE) {
+                return '';
+            } elseif ($compiler->php_handling == Smarty::PHP_QUOTE) {
+                $output = preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i', array($this,
+                                                                                                                                                              'quote'), $_attr['code']);
+                $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Text($output));
+                return '';
+            } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr['type'] == 'unmatched') {
+                $compiler->tag_nocache = true;
+                $save = $compiler->template->compiled->has_nocache_code;
+                $output = addcslashes($_attr['code'], "'\\");
+                $compiler->parser->current_buffer->append_subtree($compiler->parser, new Smarty_Internal_ParseTree_Tag($compiler->parser, $compiler->processNocacheCode("<?php echo '" .
+                                                                                                                                                                        $output .
+                                                                                                                                                                        "';?>", $compiler, true)));
+                $compiler->template->compiled->has_nocache_code = $save;
+                return '';
+            } elseif ($compiler->php_handling == Smarty::PHP_ALLOW) {
+                if (!($compiler->smarty instanceof SmartyBC)) {
+                    $compiler->trigger_template_error('$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it', null, true);
+                }
+                $compiler->has_code = true;
+                return $_attr['code'];
+            } else {
+                $compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
+            }
+        } else {
+            $compiler->has_code = true;
+            if (!($compiler->smarty instanceof SmartyBC)) {
+                $compiler->trigger_template_error('{php}{/php} tags not allowed. Use SmartyBC to enable them', null, true);
+            }
+            $ldel = preg_quote($compiler->smarty->left_delimiter, '#');
+            $rdel = preg_quote($compiler->smarty->right_delimiter, '#');
+            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr['code'], $match);
+            if (!empty($match[2])) {
+                if ('nocache' == trim($match[2])) {
+                    $compiler->tag_nocache = true;
+                } else {
+                    $compiler->trigger_template_error("illegal value of option flag \"{$match[2]}\"", null, true);
+                }
+            }
+            return preg_replace(array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#",
+                                      "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"), array('<?php ', '?>'), $_attr['code']);
+        }
+    }
+
+    /**
+     * Lexer code for PHP tags
+     *
+     * This code has been moved from lexer here fo easier debugging and maintenance
+     *
+     * @param $lex
+     */
+    public function parsePhp($lex)
+    {
+        $lex->token = Smarty_Internal_Templateparser::TP_PHP;
+        $close = 0;
+        $lex->taglineno = $lex->line;
+        $closeTag = '?>';
+        if (strpos($lex->value, '<?xml') === 0) {
+            $lex->is_xml = true;
+            $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
+            return;
+        } elseif (strpos($lex->value, '<?') === 0) {
+            $lex->phpType = 'php';
+        } elseif (strpos($lex->value, '<%') === 0) {
+            $lex->phpType = 'asp';
+            $closeTag = '%>';
+        } elseif (strpos($lex->value, '%>') === 0) {
+            $lex->phpType = 'unmatched';
+        } elseif (strpos($lex->value, '?>') === 0) {
+            if ($lex->is_xml) {
+                $lex->is_xml = false;
+                $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
+                return;
+            }
+            $lex->phpType = 'unmatched';
+        } elseif (strpos($lex->value, '<s') === 0) {
+            $lex->phpType = 'script';
+            $closeTag = '</script>';
+        } elseif (strpos($lex->value, $lex->smarty->left_delimiter) === 0) {
+            if ($lex->isAutoLiteral()) {
+                $lex->token = Smarty_Internal_Templateparser::TP_TEXT;
+                return;
+            }
+            $closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
+            if ($lex->value == $closeTag) {
+                $lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
+            }
+            $lex->phpType = 'tag';
+        }
+        if ($lex->phpType == 'unmatched') {
+            return;
+        }
+        if (($lex->phpType == 'php' || $lex->phpType == 'asp') &&
+            ($lex->compiler->php_handling == Smarty::PHP_PASSTHRU || $lex->compiler->php_handling == Smarty::PHP_QUOTE)
+        ) {
+            return;
+        }
+        $start = $lex->counter + strlen($lex->value);
+        $body = true;
+        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+            $close = $match[0][1];
+        } else {
+            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+        }
+        while ($body) {
+            if (preg_match('~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+                $value = $match[0][0];
+                $from = $pos = $match[0][1];
+                if ($pos > $close) {
+                    $body = false;
+                } else {
+                    $start = $pos + strlen($value);
+                    $phpCommentStart = $value == '/*';
+                    if ($phpCommentStart) {
+                        $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
+                        if ($phpCommentEnd) {
+                            $pos2 = $match[0][1];
+                            $start = $pos2 + strlen($match[0][0]);
+                        }
+                    }
+                    while ($close > $pos && $close < $start) {
+                        if (preg_match('~' . preg_quote($closeTag, '~') .
+                                       '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $from)) {
+                            $close = $match[0][1];
+                            $from = $close + strlen($match[0][0]);
+                        } else {
+                            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+                        }
+                    }
+                    if ($phpCommentStart && (!$phpCommentEnd || $pos2 > $close)) {
+                        $lex->taglineno = $lex->line + substr_count(substr($lex->data, $lex->counter, $start), "\n");
+                        $lex->compiler->trigger_template_error("missing PHP comment closing tag '*/'");
+                    }
+                }
+            } else {
+                $body = false;
+            }
+        }
+        $lex->value = substr($lex->data, $lex->counter, $close + strlen($closeTag) - $lex->counter);
+    }
+
+    /*
+     * Call back function for $php_handling = PHP_QUOTE
+     *
+     */
+    /**
+     * @param $match
+     *
+     * @return string
+     */
+    private function quote($match)
+    {
+        return htmlspecialchars($match[0], ENT_QUOTES);
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
index 188bbe77a..c0c089bff 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
      * @see Smarty_Internal_CompileBase
      */
     public $optional_attributes = array('assign');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -34,14 +35,14 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
     /**
      * Compiles code for generating output from any expression
      *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
      *
-     * @throws SmartyException
-     * @return string compiled code
+     * @return string
+     * @throws \SmartyException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
@@ -57,7 +58,8 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
             $output = $parameter['value'];
             // tag modifier
             if (!empty($parameter['modifierlist'])) {
-                $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'], 'value' => $output));
+                $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'],
+                                                                                   'value'        => $output));
             }
             if (!$_attr['nofilter']) {
                 // default modifier
@@ -74,7 +76,8 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
                         }
                         $compiler->default_modifier_list = $modifierlist;
                     }
-                    $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list, 'value' => $output));
+                    $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list,
+                                                                                       'value'        => $output));
                 }
                 // autoescape html
                 if ($compiler->template->smarty->escape_html) {
@@ -82,7 +85,8 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
                 }
                 // loop over registered filters
                 if (!empty($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE])) {
-                    foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key => $function) {
+                    foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key =>
+                             $function) {
                         if (!is_array($function)) {
                             $output = "{$function}({$output},\$_smarty_tpl)";
                         } elseif (is_object($function[0])) {
@@ -104,13 +108,14 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
                         }
                     }
                 }
-                if (isset($compiler->template->variable_filters)) {
-                    foreach ($compiler->template->variable_filters as $filter) {
-                        if (count($filter) == 1 && ($result = $this->compile_output_filter($compiler, $filter[0], $output)) !== false) {
-                            $output = $result;
-                        } else {
-                            $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => array($filter), 'value' => $output));
-                        }
+                foreach ($compiler->variable_filters as $filter) {
+                    if (count($filter) == 1 &&
+                        ($result = $this->compile_output_filter($compiler, $filter[0], $output)) !== false
+                    ) {
+                        $output = $result;
+                    } else {
+                        $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => array($filter),
+                                                                                           'value'        => $output));
                     }
                 }
             }
@@ -123,23 +128,23 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
     }
 
     /**
-     * @param object $compiler compiler object
-     * @param string $name     name of variable filter
-     * @param string   $output   embedded output
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param string                                $name     name of variable filter
+     * @param string                                $output   embedded output
      *
      * @return string
      */
-    private function compile_output_filter($compiler, $name, $output)
+    private function compile_output_filter(Smarty_Internal_TemplateCompilerBase $compiler, $name, $output)
     {
         $plugin_name = "smarty_variablefilter_{$name}";
         $path = $compiler->smarty->loadPlugin($plugin_name, false);
         if ($path) {
             if ($compiler->template->caching) {
-                $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
-                $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
+                $compiler->parent_compiler->template->compiled->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
+                $compiler->parent_compiler->template->compiled->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
             } else {
-                $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
-                $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
+                $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
+                $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
             }
         } else {
             // not found
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
index 68ab644fc..78d95f720 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
@@ -27,14 +27,14 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
     /**
      * Compiles code for the execution of a block function
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of block function
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     * @param  string                                      $tag       name of block function
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag)
     {
         if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
             // opening tag of block plugin
@@ -69,11 +69,11 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
             $function = $tag_info[0];
             // compile code
             if (!is_array($function)) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+                $output = "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
             } elseif (is_object($function[0])) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+                $output = "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
             } else {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+                $output = "<?php \$_smarty_tpl->smarty->_cache['tag_stack'][] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
             }
         } else {
             // must endblock be nocache?
@@ -95,14 +95,22 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
                 $mod_pre = $mod_post = '';
             } else {
                 $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
+                $mod_post = 'echo ' .
+                    $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'],
+                                                                             'value'        => 'ob_get_clean()')) . ';';
             }
             if (!is_array($function)) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);" . $mod_post . " } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                    " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);" . $mod_post .
+                    " } array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
             } elseif (is_object($function[0])) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                    " echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " .
+                    $mod_post . "} array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
             } else {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre .
+                    " echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " .
+                    $mod_post . "} array_pop(\$_smarty_tpl->smarty->_cache['tag_stack']);?>";
             }
         }
 
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
index dfb4572f4..6bddc7529 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
@@ -27,14 +27,14 @@ class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Interna
     /**
      * Compiles code for the execution of a registered function
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of function
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
+     * @param  string                                      $tag       name of function
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter, $tag)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag)
     {
         // This tag does create output
         $compiler->has_output = true;
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
index 23b17ae14..5a8c54faa 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -19,96 +19,111 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
     /**
      * Compiles code for the special $smarty variables
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     * @param         $parameter
+     * @param  array                                       $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase        $compiler compiler object
+     * @param                                              $parameter
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         $_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
-        $compiled_ref = ' ';
-        $variable = trim($_index[0], "'");
-        switch ($variable) {
-            case 'foreach':
-                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-            case 'section':
-                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-            case 'capture':
-                return "Smarty::\$_smarty_vars$parameter";
-            case 'now':
-                return 'time()';
-            case 'cookies':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
+        $variable = strtolower($compiler->getId($_index[0]));
+        if ($variable === false) {
+            $compiler->trigger_template_error("special \$Smarty variable name index can not be variable", null, true);
+        }
+        if (!isset($compiler->smarty->security_policy) ||
+            $compiler->smarty->security_policy->isTrustedSpecialSmartyVar($variable, $compiler)
+        ) {
+            switch ($variable) {
+                case 'foreach':
+                case 'section':
+                    return Smarty_Internal_Compile_Private_ForeachSection::compileSpecialVariable(array(), $compiler, $_index);
+                case 'capture':
+                    if (class_exists('Smarty_Internal_Compile_Capture')) {
+                        return Smarty_Internal_Compile_Capture::compileSpecialVariable(array(), $compiler, $_index);
+                    }
+                    return '';
+                case 'now':
+                    return 'time()';
+                case 'cookies':
+                    if (isset($compiler->smarty->security_policy) &&
+                        !$compiler->smarty->security_policy->allow_super_globals
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                        break;
+                    }
+                    return '$_COOKIE';
+                case 'get':
+                case 'post':
+                case 'env':
+                case 'server':
+                case 'session':
+                case 'request':
+                    if (isset($compiler->smarty->security_policy) &&
+                        !$compiler->smarty->security_policy->allow_super_globals
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                        break;
+                    }
+                    $compiled_ref = '$_' . strtoupper($variable);
                     break;
-                }
-                $compiled_ref = '$_COOKIE';
-                break;
 
-            case 'get':
-            case 'post':
-            case 'env':
-            case 'server':
-            case 'session':
-            case 'request':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
-                    break;
-                }
-                $compiled_ref = '$_' . strtoupper($variable);
-                break;
+                case 'template':
+                    return 'basename($_smarty_tpl->source->filepath)';
 
-            case 'template':
-                return 'basename($_smarty_tpl->source->filepath)';
+                case 'template_object':
+                    return '$_smarty_tpl';
 
-            case 'template_object':
-                return '$_smarty_tpl';
+                case 'current_dir':
+                    return 'dirname($_smarty_tpl->source->filepath)';
 
-            case 'current_dir':
-                return 'dirname($_smarty_tpl->source->filepath)';
+                case 'version':
+                    $_version = Smarty::SMARTY_VERSION;
 
-            case 'version':
-                $_version = Smarty::SMARTY_VERSION;
-
-                return "'$_version'";
-
-            case 'const':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_constants) {
-                    $compiler->trigger_template_error("(secure mode) constants not permitted");
-                    break;
-                }
+                    return "'$_version'";
 
-                return "@constant({$_index[1]})";
+                case 'const':
+                    if (isset($compiler->smarty->security_policy) &&
+                        !$compiler->smarty->security_policy->allow_constants
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) constants not permitted");
+                        break;
+                    }
+                    if (strpos($_index[1], '$') === false && strpos($_index[1], '\'') === false) {
+                        return "@constant('{$_index[1]}')";
+                    } else {
+                        return "@constant({$_index[1]})";
+                    }
 
-            case 'config':
-                if (isset($_index[2])) {
-                    return "(is_array(\$tmp = \$_smarty_tpl->getConfigVariable($_index[1])) ? \$tmp[$_index[2]] : null)";
-                } else {
-                    return "\$_smarty_tpl->getConfigVariable($_index[1])";
-                }
-            case 'ldelim':
-                $_ldelim = $compiler->smarty->left_delimiter;
+                case 'config':
+                    if (isset($_index[2])) {
+                        return "(is_array(\$tmp = \$_smarty_tpl->smarty->ext->_config->_getConfigVariable(\$_smarty_tpl, $_index[1])) ? \$tmp[$_index[2]] : null)";
+                    } else {
+                        return "\$_smarty_tpl->smarty->ext->_config->_getConfigVariable(\$_smarty_tpl, $_index[1])";
+                    }
+                case 'ldelim':
+                    $_ldelim = $compiler->smarty->left_delimiter;
 
-                return "'$_ldelim'";
+                    return "'$_ldelim'";
 
-            case 'rdelim':
-                $_rdelim = $compiler->smarty->right_delimiter;
+                case 'rdelim':
+                    $_rdelim = $compiler->smarty->right_delimiter;
 
-                return "'$_rdelim'";
+                    return "'$_rdelim'";
 
-            default:
-                $compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is invalid');
-                break;
-        }
-        if (isset($_index[1])) {
-            array_shift($_index);
-            foreach ($_index as $_ind) {
-                $compiled_ref = $compiled_ref . "[$_ind]";
+                default:
+                    $compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is invalid');
+                    break;
             }
+            if (isset($_index[1])) {
+                array_shift($_index);
+                foreach ($_index as $_ind) {
+                    $compiled_ref = $compiled_ref . "[$_ind]";
+                }
+            }
+            return $compiled_ref;
         }
-
-        return $compiled_ref;
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_rdelim.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
index dcff2ae41..22b33eaa2 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
@@ -25,11 +25,11 @@ class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
         if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
         // this tag does not return compiled code
         $compiler->has_code = true;
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_section.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_section.php
index 5ac3fb067..079903c2b 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_section.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_section.php
@@ -14,7 +14,7 @@
  * @package    Smarty
  * @subpackage Compiler
  */
-class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase
+class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_ForeachSection
 {
     /**
      * Attribute definition: Overwrites base class.
@@ -23,6 +23,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $required_attributes = array('name', 'loop');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -30,6 +31,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase
      * @see Smarty_Internal_CompileBase
      */
     public $shorttag_order = array('name', 'loop');
+
     /**
      * Attribute definition: Overwrites base class.
      *
@@ -39,102 +41,342 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase
     public $optional_attributes = array('start', 'step', 'max', 'show');
 
     /**
+     * counter
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = 'section';
+
+    /**
+     * Valid properties of $smarty.section.name.xxx variable
+     *
+     * @var array
+     */
+    public static $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'rownum',
+                                          'index_prev', 'index_next');
+
+    /**
+     * {section} tag has no item properties
+     *
+     * @var array
+     */
+    public $itemProperties = null;
+
+    /**
+     * {section} tag has always name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = true;
+
+    /**
      * Compiles code for the {section} tag
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param  array                                 $args     array with attributes from parser
+     * @param  \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
+        $compiler->loopNesting++;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-
-        $this->openTag($compiler, 'section', array('section', $compiler->nocache));
+        $attributes = array('name' => $compiler->getId($_attr['name']));
+        unset($_attr['name']);
+        foreach ($attributes as $a => $v) {
+            if ($v === false) {
+                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+            }
+        }
+        $local = "\$__section_{$attributes['name']}_" . $this->counter ++ . '_';
+        $sectionVar = "\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']";
+        $this->openTag($compiler, 'section', array('section', $compiler->nocache, $local, $sectionVar));
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
 
-        $output = "<?php ";
-
-        $section_name = $_attr['name'];
-
-        $output .= "if (isset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name])) unset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]);\n";
-        $section_props = "\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]";
+        $initLocal = array('saved' => "isset(\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']) ? \$_smarty_tpl->tpl_vars['__section_{$attributes['name']}'] : false",);
+        $initNamedProperty = array();
+        $initFor = array();
+        $incFor = array();
+        $cmpFor = array();
+        $propValue = array('index'     => "{$sectionVar}->value['index']", 'show' => 'true', 'step' => 1,
+                           'iteration' => "{$local}iteration",
 
+        );
+        $propType = array('index' => 2, 'iteration' => 2, 'show' => 0, 'step' => 0,);
+        // search for used tag attributes
+        $this->scanForProperties($attributes, $compiler);
+        if (!empty($this->matchResults['named'])) {
+            $namedAttr = $this->matchResults['named'];
+        }
+        $namedAttr['index'] = true;
+        $output = "<?php\n";
         foreach ($_attr as $attr_name => $attr_value) {
             switch ($attr_name) {
                 case 'loop':
-                    $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop); unset(\$_loop);\n";
+                    if (is_numeric($attr_value)) {
+                        $v = (int) $attr_value;
+                        $t = 0;
+                    } else {
+                        $v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))";
+                        $t = 1;
+                    }
+                    if (isset($namedAttr['loop'])) {
+                        $initNamedProperty['loop'] = "'loop' => {$v}";
+                        if ($t == 1) {
+                            $v = "{$sectionVar}->value['loop']";
+                        }
+                    } elseif ($t == 1) {
+                        $initLocal['loop'] = $v;
+                        $v = "{$local}loop";
+                    }
                     break;
-
                 case 'show':
                     if (is_bool($attr_value)) {
-                        $show_attr_value = $attr_value ? 'true' : 'false';
+                        $v = $attr_value ? 'true' : 'false';
+                        $t = 0;
                     } else {
-                        $show_attr_value = "(bool) $attr_value";
+                        $v = "(bool) $attr_value";
+                        $t = 3;
                     }
-                    $output .= "{$section_props}['show'] = $show_attr_value;\n";
                     break;
-
-                case 'name':
-                    $output .= "{$section_props}['$attr_name'] = $attr_value;\n";
+                case 'step':
+                    if (is_numeric($attr_value)) {
+                        $v = (int) $attr_value;
+                        $v = ($v == 0) ? 1 : $v;
+                        $t = 0;
+                        break;
+                    }
+                    $initLocal['step'] = "((int)@$attr_value) == 0 ? 1 : (int)@$attr_value";
+                    $v = "{$local}step";
+                    $t = 2;
                     break;
 
                 case 'max':
                 case 'start':
-                    $output .= "{$section_props}['$attr_name'] = (int) $attr_value;\n";
-                    break;
-
-                case 'step':
-                    $output .= "{$section_props}['$attr_name'] = ((int) $attr_value) == 0 ? 1 : (int) $attr_value;\n";
+                    if (is_numeric($attr_value)) {
+                        $v = (int) $attr_value;
+                        $t = 0;
+                        break;
+                    }
+                    $v = "(int)@$attr_value";
+                    $t = 3;
                     break;
             }
+            if ($t == 3 && $compiler->getId($attr_value)) {
+                $t = 1;
+            }
+            $propValue[$attr_name] = $v;
+            $propType[$attr_name] = $t;
         }
 
-        if (!isset($_attr['show'])) {
-            $output .= "{$section_props}['show'] = true;\n";
+        if (isset($namedAttr['step'])) {
+            $initNamedProperty['step'] = $propValue['step'];
         }
-
-        if (!isset($_attr['loop'])) {
-            $output .= "{$section_props}['loop'] = 1;\n";
+        if (isset($namedAttr['iteration'])) {
+            $propValue['iteration'] = "{$sectionVar}->value['iteration']";
         }
+        $incFor['iteration'] = "{$propValue['iteration']}++";
+        $initFor['iteration'] = "{$propValue['iteration']} = 1";
 
-        if (!isset($_attr['max'])) {
-            $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
+        if ($propType['step'] == 0) {
+            if ($propValue['step'] == 1) {
+                $incFor['index'] = "{$sectionVar}->value['index']++";
+            } elseif ($propValue['step'] > 1) {
+                $incFor['index'] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+            } else {
+                $incFor['index'] = "{$sectionVar}->value['index'] -= " . - $propValue['step'];
+            }
         } else {
-            $output .= "if ({$section_props}['max'] < 0)\n" . "    {$section_props}['max'] = {$section_props}['loop'];\n";
+            $incFor['index'] = "{$sectionVar}->value['index'] += {$propValue['step']}";
         }
 
-        if (!isset($_attr['step'])) {
-            $output .= "{$section_props}['step'] = 1;\n";
+        if (!isset($propValue['max'])) {
+            $propValue['max'] = $propValue['loop'];
+            $propType['max'] = $propType['loop'];
+        } elseif ($propType['max'] != 0) {
+            $propValue['max'] = "{$propValue['max']} < 0 ? {$propValue['loop']} : {$propValue['max']}";
+            $propType['max'] = 1;
+        } else {
+            if ($propValue['max'] < 0) {
+                $propValue['max'] = $propValue['loop'];
+                $propType['max'] = $propType['loop'];
+            }
         }
 
-        if (!isset($_attr['start'])) {
-            $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
+        if (!isset($propValue['start'])) {
+            $start_code = array(1 => "{$propValue['step']} > 0 ? ", 2 => '0', 3 => ' : ', 4 => $propValue['loop'],
+                                5 => ' - 1');
+            if ($propType['loop'] == 0) {
+                $start_code[5] = '';
+                $start_code[4] = $propValue['loop'] - 1;
+            }
+            if ($propType['step'] == 0) {
+                if ($propValue['step'] > 0) {
+                    $start_code = array(1 => '0');
+                    $propType['start'] = 0;
+                } else {
+                    $start_code[1] = $start_code[2] = $start_code[3] = '';
+                    $propType['start'] = $propType['loop'];
+                }
+            } else {
+                $propType['start'] = 1;
+            }
+            $propValue['start'] = join('', $start_code);
         } else {
-            $output .= "if ({$section_props}['start'] < 0)\n" . "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . "else\n" . "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
+            $start_code = array(1  => "{$propValue['start']} < 0 ? ", 2 => 'max(', 3 => "{$propValue['step']} > 0 ? ",
+                                4  => '0', 5 => ' : ', 6 => '-1', 7 => ', ',
+                                8  => "{$propValue['start']} + {$propValue['loop']}", 10 => ')', 11 => ' : ',
+                                12 => 'min(', 13 => $propValue['start'], 14 => ', ',
+                                15 => "{$propValue['step']} > 0 ? ", 16 => $propValue['loop'], 17 => ' : ',
+                                18 => $propType['loop'] == 0 ? $propValue['loop'] - 1 : "{$propValue['loop']} - 1",
+                                19 => ')');
+            if ($propType['step'] == 0) {
+                $start_code[3] = $start_code[5] = $start_code[15] = $start_code[17] = '';
+                if ($propValue['step'] > 0) {
+                    $start_code[6] = $start_code[18] = '';
+                } else {
+                    $start_code[4] = $start_code[16] = '';
+                }
+            }
+            if ($propType['start'] == 0) {
+                if ($propType['loop'] == 0) {
+                    $start_code[8] = $propValue['start'] + $propValue['loop'];
+                }
+                $propType['start'] = $propType['step'] + $propType['loop'];
+                $start_code[1] = '';
+                if ($propValue['start'] < 0) {
+                    for ($i = 11; $i <= 19; $i ++) {
+                        $start_code[$i] = '';
+                    }
+                    if ($propType['start'] == 0) {
+                        $start_code = array(max($propValue['step'] > 0 ? 0 : - 1, $propValue['start'] +
+                                                                                $propValue['loop']));
+                    }
+                } else {
+                    for ($i = 1; $i <= 11; $i ++) {
+                        $start_code[$i] = '';
+                    }
+                    if ($propType['start'] == 0) {
+                        $start_code = array(min($propValue['step'] > 0 ? $propValue['loop'] : $propValue['loop'] -
+                            1, $propValue['start']));
+                    }
+                }
+            }
+            $propValue['start'] = join('', $start_code);
+        }
+        if ($propType['start'] != 0) {
+            $initLocal['start'] = $propValue['start'];
+            $propValue['start'] = "{$local}start";
         }
 
-        $output .= "if ({$section_props}['show']) {\n";
+        $initFor['index'] = "{$sectionVar}->value['index'] = {$propValue['start']}";
+
         if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
-            $output .= "    {$section_props}['total'] = {$section_props}['loop'];\n";
+            $propValue['total'] = $propValue['loop'];
+            $propType['total'] = $propType['loop'];
         } else {
-            $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
+            $propType['total'] = $propType['start'] + $propType['loop'] + $propType['step'] + $propType['max'];
+            if ($propType['total'] == 0) {
+                $propValue['total'] = min(ceil(($propValue['step'] > 0 ? $propValue['loop'] -
+                                                   $propValue['start'] : (int) $propValue['start'] + 1) /
+                                               abs($propValue['step'])), $propValue['max']);
+            } else {
+                $total_code = array(1  => 'min(', 2 => 'ceil(', 3 => '(', 4 => "{$propValue['step']} > 0 ? ",
+                                    5  => $propValue['loop'], 6 => ' - ', 7 => $propValue['start'], 8 => ' : ',
+                                    9  => $propValue['start'], 10 => '+ 1', 11 => ')', 12 => '/ ', 13 => 'abs(',
+                                    14 => $propValue['step'], 15 => ')', 16 => ')', 17 => ", {$propValue['max']})",);
+                if (!isset($propValue['max'])) {
+                    $total_code[1] = $total_code[17] = '';
+                }
+                if ($propType['loop'] + $propType['start'] == 0) {
+                    $total_code[5] = $propValue['loop'] - $propValue['start'];
+                    $total_code[6] = $total_code[7] = '';
+                }
+                if ($propType['start'] == 0) {
+                    $total_code[9] = (int) $propValue['start'] + 1;
+                    $total_code[10] = '';
+                }
+                if ($propType['step'] == 0) {
+                    $total_code[13] = $total_code[15] = '';
+                    if ($propValue['step'] == 1 || $propValue['step'] == - 1) {
+                        $total_code[2] = $total_code[12] = $total_code[14] = $total_code[16] = '';
+                    } elseif ($propValue['step'] < 0) {
+                        $total_code[14] = - $propValue['step'];
+                    }
+                    $total_code[4] = '';
+                    if ($propValue['step'] > 0) {
+                        $total_code[8] = $total_code[9] = $total_code[10] = '';
+                    } else {
+                        $total_code[5] = $total_code[6] = $total_code[7] = $total_code[8] = '';
+                    }
+                }
+                $propValue['total'] = join('', $total_code);
+            }
         }
-        $output .= "    if ({$section_props}['total'] == 0)\n" . "        {$section_props}['show'] = false;\n" . "} else\n" . "    {$section_props}['total'] = 0;\n";
 
-        $output .= "if ({$section_props}['show']):\n";
-        $output .= "
-            for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
-                 {$section_props}['iteration'] <= {$section_props}['total'];
-                 {$section_props}['index'] += {$section_props}['step'], {$section_props}['iteration']++):\n";
-        $output .= "{$section_props}['rownum'] = {$section_props}['iteration'];\n";
-        $output .= "{$section_props}['index_prev'] = {$section_props}['index'] - {$section_props}['step'];\n";
-        $output .= "{$section_props}['index_next'] = {$section_props}['index'] + {$section_props}['step'];\n";
-        $output .= "{$section_props}['first']      = ({$section_props}['iteration'] == 1);\n";
-        $output .= "{$section_props}['last']       = ({$section_props}['iteration'] == {$section_props}['total']);\n";
+        if (isset($namedAttr['total'])) {
+            $initNamedProperty['total'] = "'total' => {$propValue['total']}";
+            if ($propType['total'] > 0) {
+                $propValue['total'] = "{$sectionVar}->value['total']";
+            }
+        } elseif ($propType['total'] > 0) {
+            $initLocal['total'] = $propValue['total'];
+            $propValue['total'] = "{$local}total";
+        }
+
+        $cmpFor['iteration'] = "{$propValue['iteration']} <= {$propValue['total']}";
+
+        foreach ($initLocal as $key => $code) {
+            $output .= "{$local}{$key} = {$code};\n";
+        }
 
+        $_vars = 'array(' . join(', ', $initNamedProperty) . ')';
+        $output .= "{$sectionVar} = new Smarty_Variable({$_vars});\n";
+        $cond_code = "{$propValue['total']} != 0";
+        if ($propType['total'] == 0) {
+            if ($propValue['total'] == 0) {
+                $cond_code = 'false';
+            } else {
+                $cond_code = 'true';
+            }
+        }
+        if ($propType['show'] > 0) {
+            $output .= "{$local}show = {$propValue['show']} ? {$cond_code} : false;\n";
+            $output .= "if ({$local}show) {\n";
+        } elseif ($propValue['show'] == 'true') {
+            $output .= "if ({$cond_code}) {\n";
+        } else {
+            $output .= "if (false) {\n";
+        }
+        $jinit = join(', ', $initFor);
+        $jcmp = join(', ', $cmpFor);
+        $jinc = join(', ', $incFor);
+        $output .= "for ({$jinit}; {$jcmp}; {$jinc}){\n";
+        if (isset($namedAttr['rownum'])) {
+            $output .= "{$sectionVar}->value['rownum'] = {$propValue['iteration']};\n";
+        }
+        if (isset($namedAttr['index_prev'])) {
+            $output .= "{$sectionVar}->value['index_prev'] = {$propValue['index']} - {$propValue['step']};\n";
+        }
+        if (isset($namedAttr['index_next'])) {
+            $output .= "{$sectionVar}->value['index_next'] = {$propValue['index']} + {$propValue['step']};\n";
+        }
+        if (isset($namedAttr['first'])) {
+            $output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} == 1);\n";
+        }
+        if (isset($namedAttr['last'])) {
+            $output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} == {$propValue['total']});\n";
+        }
         $output .= "?>";
 
         return $output;
@@ -152,20 +394,20 @@ class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {sectionelse} tag
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        list($openTag, $nocache) = $this->closeTag($compiler, array('section'));
-        $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache));
+        list($openTag, $nocache, $local, $sectionVar) = $this->closeTag($compiler, array('section'));
+        $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache, $local, $sectionVar));
 
-        return "<?php endfor; else: ?>";
+        return "<?php }} else {\n ?>";
     }
 }
 
@@ -180,27 +422,33 @@ class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {/section} tag
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param  array                                $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
+        $compiler->loopNesting--;
         // must endblock be nocache?
         if ($compiler->nocache) {
             $compiler->tag_nocache = true;
         }
 
-        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('section', 'sectionelse'));
+        list($openTag, $compiler->nocache, $local, $sectionVar) = $this->closeTag($compiler, array('section',
+                                                                                                   'sectionelse'));
 
+        $output = "<?php\n";
         if ($openTag == 'sectionelse') {
-            return "<?php endif; ?>";
+            $output .= "}\n";
         } else {
-            return "<?php endfor; endif; ?>";
+            $output .= "}\n}\n";
         }
+        $output .= "if ({$local}saved) {\n";
+        $output .= "{$sectionVar} = {$local}saved;\n";
+        $output .= "}\n";
+        $output .= "?>";
+
+        return $output;
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_setfilter.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
index 8e91ba6d0..b4932c1e1 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
@@ -25,10 +25,10 @@ class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $compiler->variable_filter_stack[] = $compiler->template->variable_filters;
-        $compiler->template->variable_filters = $parameter['modifier_list'];
+        $compiler->variable_filter_stack[] = $compiler->variable_filters;
+        $compiler->variable_filters = $parameter['modifier_list'];
         // this tag does not return compiled code
         $compiler->has_code = false;
 
@@ -53,14 +53,14 @@ class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $_attr = $this->getAttributes($compiler, $args);
         // reset variable filter to previous state
         if (count($compiler->variable_filter_stack)) {
-            $compiler->template->variable_filters = array_pop($compiler->variable_filter_stack);
+            $compiler->variable_filters = array_pop($compiler->variable_filter_stack);
         } else {
-            $compiler->template->variable_filters = array();
+            $compiler->variable_filters = array();
         }
         // this tag does not return compiled code
         $compiler->has_code = false;
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php
new file mode 100644
index 000000000..c7bf1f8fb
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Shared Inheritance
+ * Shared methods for {extends} and {block} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Shared Inheritance Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Shared_Inheritance extends Smarty_Internal_CompileBase
+{
+    /**
+     * Register post compile callback to compile inheritance initialization code
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param bool|false                            $initChildSequence if true force child template
+     */
+    public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+    {
+        if ($initChildSequence || !isset($compiler->_cache['inheritanceInit'])) {
+            $compiler->registerPostCompileCallback(array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
+                                                   array($initChildSequence), 'inheritanceInit', $initChildSequence);
+
+            $compiler->_cache['inheritanceInit'] = true;
+        }
+    }
+
+    /**
+     * Compile inheritance initialization code as prefix
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param bool|false                            $initChildSequence if true force child template
+     */
+    static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+    {
+        $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->ext->_inheritance->init(\$_smarty_tpl, " .
+            var_export($initChildSequence, true) . ");\n?>\n";
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_while.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_while.php
index 36dc049db..bd31f6671 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compile_while.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_while.php
@@ -19,48 +19,63 @@ class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {while} tag
      *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
+     * @param  array                                       $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param  array                                       $parameter array with compilation parameter
      *
      * @return string compiled code
+     * @throws \SmartyCompilerException
      */
-    public function compile($args, $compiler, $parameter)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
+        $compiler->loopNesting++;
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         $this->openTag($compiler, 'while', $compiler->nocache);
 
         if (!array_key_exists("if condition", $parameter)) {
-            $compiler->trigger_template_error("missing while condition", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("missing while condition", null, true);
         }
 
         // maybe nocache because of nocache variables
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        $_output = "<?php\n";
         if (is_array($parameter['if condition'])) {
             if ($compiler->nocache) {
                 $_nocache = ',true';
                 // create nocache var to make it know for further compiling
                 if (is_array($parameter['if condition']['var'])) {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
+                    $var = trim($parameter['if condition']['var']['var'], "'");
                 } else {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+                    $var = trim($parameter['if condition']['var'], "'");
+                }
+                if (isset($compiler->template->tpl_vars[$var])) {
+                    $compiler->template->tpl_vars[$var]->nocache = true;
+                } else {
+                    $compiler->template->tpl_vars[$var] = new Smarty_Variable(null, true);
                 }
             } else {
                 $_nocache = '';
             }
             if (is_array($parameter['if condition']['var'])) {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
+                $_output .= "if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] .
+                    "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] .
+                    "]->value)) \$_smarty_tpl->smarty->ext->_var->createLocalArrayVariable(\$_smarty_tpl, " . $parameter['if condition']['var']['var'] .
+                    "$_nocache);\n";
+                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" .
+                    $parameter['if condition']['var']['smarty_internal_index'] . " = " .
+                    $parameter['if condition']['value'] . ") {?>";
             } else {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
+                $_output .= "if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] .
+                    "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] .
+                    "] = new Smarty_Variable(null{$_nocache});";
+                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " .
+                    $parameter['if condition']['value'] . ") {?>";
             }
-
-            return $_output;
         } else {
-            return "<?php while ({$parameter['if condition']}) {?>";
-        }
+            $_output .= "while ({$parameter['if condition']}) {?>";
+         }
+        return $_output;
     }
 }
 
@@ -75,19 +90,19 @@ class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase
     /**
      * Compiles code for the {/while} tag
      *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
+     * @param  array                                       $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
      * @return string compiled code
      */
-    public function compile($args, $compiler)
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {
+        $compiler->loopNesting--;
         // must endblock be nocache?
         if ($compiler->nocache) {
             $compiler->tag_nocache = true;
         }
         $compiler->nocache = $this->closeTag($compiler, array('while'));
-
-        return "<?php }?>";
+        return "<?php }?>\n";
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compilebase.php b/library/Smarty/libs/sysplugins/smarty_internal_compilebase.php
index f78f15f40..0803f27a6 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_compilebase.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_compilebase.php
@@ -21,6 +21,7 @@ abstract class Smarty_Internal_CompileBase
      * @var array
      */
     public $required_attributes = array();
+
     /**
      * Array of names of optional attribute required by tag
      * use array('_any') if there is no restriction of attributes names
@@ -28,12 +29,14 @@ abstract class Smarty_Internal_CompileBase
      * @var array
      */
     public $optional_attributes = array();
+
     /**
      * Shorttag attribute order defined by its names
      *
      * @var array
      */
     public $shorttag_order = array();
+
     /**
      * Array of names of valid option flags
      *
@@ -68,7 +71,7 @@ abstract class Smarty_Internal_CompileBase
                     $_indexed_attr[$this->shorttag_order[$key]] = $mixed;
                 } else {
                     // too many shorthands
-                    $compiler->trigger_template_error('too many shorthand attributes', $compiler->lex->taglineno);
+                    $compiler->trigger_template_error('too many shorthand attributes', null, true);
                 }
                 // named attribute
             } else {
@@ -90,7 +93,7 @@ abstract class Smarty_Internal_CompileBase
                             $_indexed_attr[$kv['key']] = false;
                         }
                     } else {
-                        $compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", $compiler->lex->taglineno);
+                        $compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", null, true);
                     }
                     // must be named attribute
                 } else {
@@ -102,7 +105,7 @@ abstract class Smarty_Internal_CompileBase
         // check if all required attributes present
         foreach ($this->required_attributes as $attr) {
             if (!array_key_exists($attr, $_indexed_attr)) {
-                $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", null, true);
             }
         }
         // check for not allowed attributes
@@ -110,7 +113,7 @@ abstract class Smarty_Internal_CompileBase
             $tmp_array = array_merge($this->required_attributes, $this->optional_attributes, $this->option_flags);
             foreach ($_indexed_attr as $key => $dummy) {
                 if (!in_array($key, $tmp_array) && $key !== 0) {
-                    $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", $compiler->lex->taglineno);
+                    $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", null, true);
                 }
             }
         }
@@ -162,12 +165,13 @@ abstract class Smarty_Internal_CompileBase
                 }
             }
             // wrong nesting of tags
-            $compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag . "{$compiler->smarty->right_delimiter} tag");
+            $compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag .
+                                              "{$compiler->smarty->right_delimiter} tag");
 
             return;
         }
         // wrong nesting of tags
-        $compiler->trigger_template_error("unexpected closing tag", $compiler->lex->taglineno);
+        $compiler->trigger_template_error("unexpected closing tag", null, true);
 
         return;
     }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_config.php b/library/Smarty/libs/sysplugins/smarty_internal_config.php
deleted file mode 100644
index 25694d5a9..000000000
--- a/library/Smarty/libs/sysplugins/smarty_internal_config.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Config
- *
- * @package    Smarty
- * @subpackage Config
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Config
- * Main class for config variables
- *
- * @package    Smarty
- * @subpackage Config
- * @ignore
- */
-class Smarty_Internal_Config
-{
-    /**
-     * Smarty instance
-     *
-     * @var Smarty object
-     */
-    public $smarty = null;
-    /**
-     * Object of config var storage
-     *
-     * @var object
-     */
-    public $data = null;
-    /**
-     * Config resource
-     *
-     * @var string
-     */
-    public $config_resource = null;
-    /**
-     * Compiled config file
-     *
-     * @var string
-     */
-    public $compiled_config = null;
-    /**
-     * filepath of compiled config file
-     *
-     * @var string
-     */
-    public $compiled_filepath = null;
-    /**
-     * Filemtime of compiled config Filemtime
-     *
-     * @var int
-     */
-    public $compiled_timestamp = null;
-    /**
-     * flag if compiled config file is invalid and must be (re)compiled
-     *
-     * @var bool
-     */
-    public $mustCompile = null;
-    /**
-     * Config file compiler object
-     *
-     * @var Smarty_Internal_Config_File_Compiler object
-     */
-    public $compiler_object = null;
-
-    /**
-     * Constructor of config file object
-     *
-     * @param string $config_resource config file resource name
-     * @param Smarty $smarty          Smarty instance
-     * @param object $data            object for config vars storage
-     */
-    public function __construct($config_resource, $smarty, $data = null)
-    {
-        $this->data = $data;
-        $this->smarty = $smarty;
-        $this->config_resource = $config_resource;
-    }
-
-    /**
-     * Returns the compiled  filepath
-     *
-     * @return string the compiled filepath
-     */
-    public function getCompiledFilepath()
-    {
-        return $this->compiled_filepath === null ?
-            ($this->compiled_filepath = $this->buildCompiledFilepath()) :
-            $this->compiled_filepath;
-    }
-
-    /**
-     * Get file path.
-     *
-     * @return string
-     */
-    public function buildCompiledFilepath()
-    {
-        $_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null;
-        $_flag = (int) $this->smarty->config_read_hidden + (int) $this->smarty->config_booleanize * 2
-            + (int) $this->smarty->config_overwrite * 4;
-        $_filepath = sha1(realpath($this->source->filepath) . $_flag);
-        // if use_sub_dirs, break file into directories
-        if ($this->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-                . substr($_filepath, 2, 2) . DS
-                . substr($_filepath, 4, 2) . DS
-                . $_filepath;
-        }
-        $_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        }
-        $_compile_dir = $this->smarty->getCompileDir();
-
-        return $_compile_dir . $_filepath . '.' . basename($this->source->name) . '.config' . '.php';
-    }
-
-    /**
-     * Returns the timestamp of the compiled file
-     *
-     * @return integer the file timestamp
-     */
-    public function getCompiledTimestamp()
-    {
-        return $this->compiled_timestamp === null
-            ? ($this->compiled_timestamp = (file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false)
-            : $this->compiled_timestamp;
-    }
-
-    /**
-     * Returns if the current config file must be compiled
-     * It does compare the timestamps of config source and the compiled config and checks the force compile configuration
-     *
-     * @return boolean true if the file must be compiled
-     */
-    public function mustCompile()
-    {
-        return $this->mustCompile === null ?
-            $this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp() === false || $this->smarty->compile_check && $this->getCompiledTimestamp() < $this->source->timestamp) :
-            $this->mustCompile;
-    }
-
-    /**
-     * Returns the compiled config file
-     * It checks if the config file must be compiled or just read the compiled version
-     *
-     * @return string the compiled config file
-     */
-    public function getCompiledConfig()
-    {
-        if ($this->compiled_config === null) {
-            // see if template needs compiling.
-            if ($this->mustCompile()) {
-                $this->compileConfigSource();
-            } else {
-                $this->compiled_config = file_get_contents($this->getCompiledFilepath());
-            }
-        }
-
-        return $this->compiled_config;
-    }
-
-    /**
-     * Compiles the config files
-     *
-     * @throws Exception
-     */
-    public function compileConfigSource()
-    {
-        // compile template
-        if (!is_object($this->compiler_object)) {
-            // load compiler
-            $this->compiler_object = new Smarty_Internal_Config_File_Compiler($this->smarty);
-        }
-        // compile locking
-        if ($this->smarty->compile_locking) {
-            if ($saved_timestamp = $this->getCompiledTimestamp()) {
-                touch($this->getCompiledFilepath());
-            }
-        }
-        // call compiler
-        try {
-            $this->compiler_object->compileSource($this);
-        }
-        catch (Exception $e) {
-            // restore old timestamp in case of error
-            if ($this->smarty->compile_locking && $saved_timestamp) {
-                touch($this->getCompiledFilepath(), $saved_timestamp);
-            }
-            throw $e;
-        }
-        // compiling succeeded
-        // write compiled template
-        Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->getCompiledConfig(), $this->smarty);
-    }
-
-    /**
-     * load config variables
-     *
-     * @param mixed         $sections array of section names, single section or null
-     * @param string $scope    global,parent or local
-     *
-     * @throws Exception
-     */
-    public function loadConfigVars($sections = null, $scope = 'local')
-    {
-        if ($this->data instanceof Smarty_Internal_Template) {
-            $this->data->properties['file_dependency'][sha1($this->source->filepath)] = array($this->source->filepath, $this->source->timestamp, 'file');
-        }
-        if ($this->mustCompile()) {
-            $this->compileConfigSource();
-        }
-        // pointer to scope
-        if ($scope == 'local') {
-            $scope_ptr = $this->data;
-        } elseif ($scope == 'parent') {
-            if (isset($this->data->parent)) {
-                $scope_ptr = $this->data->parent;
-            } else {
-                $scope_ptr = $this->data;
-            }
-        } elseif ($scope == 'root' || $scope == 'global') {
-            $scope_ptr = $this->data;
-            while (isset($scope_ptr->parent)) {
-                $scope_ptr = $scope_ptr->parent;
-            }
-        }
-        $_config_vars = array();
-        include($this->getCompiledFilepath());
-        // copy global config vars
-        foreach ($_config_vars['vars'] as $variable => $value) {
-            if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-                $scope_ptr->config_vars[$variable] = $value;
-            } else {
-                $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
-            }
-        }
-        // scan sections
-        if (!empty($sections)) {
-            foreach ((array) $sections as $this_section) {
-                if (isset($_config_vars['sections'][$this_section])) {
-                    foreach ($_config_vars['sections'][$this_section]['vars'] as $variable => $value) {
-                        if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-                            $scope_ptr->config_vars[$variable] = $value;
-                        } else {
-                            $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * set Smarty property in template context
-     *
-     * @param  string $property_name property name
-     * @param  mixed  $value         value
-     *
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'source':
-            case 'compiled':
-                $this->$property_name = $value;
-
-                return;
-        }
-
-        throw new SmartyException("invalid config property '$property_name'.");
-    }
-
-    /**
-     * get Smarty property in template context
-     *
-     * @param  string $property_name property name
-     *
-     * @return \Smarty_Config_Source|\Smarty_Template_Compiled
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'source':
-                if (empty($this->config_resource)) {
-                    throw new SmartyException("Unable to parse resource name \"{$this->config_resource}\"");
-                }
-                $this->source = Smarty_Resource::config($this);
-
-                return $this->source;
-
-            case 'compiled':
-                $this->compiled = $this->source->getCompiled($this);
-
-                return $this->compiled;
-        }
-
-        throw new SmartyException("config attribute '$property_name' does not exist.");
-    }
-}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_config_file_compiler.php b/library/Smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
index 117310439..56d3b0665 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
@@ -18,6 +18,20 @@
 class Smarty_Internal_Config_File_Compiler
 {
     /**
+     * Lexer class name
+     *
+     * @var string
+     */
+    public $lexer_class;
+
+    /**
+     * Parser class name
+     *
+     * @var string
+     */
+    public $parser_class;
+
+    /**
      * Lexer object
      *
      * @var object
@@ -41,9 +55,9 @@ class Smarty_Internal_Config_File_Compiler
     /**
      * Smarty object
      *
-     * @var Smarty_Internal_Config object
+     * @var Smarty_Internal_Template object
      */
-    public $config;
+    public $template;
 
     /**
      * Compiled config data sections and variables
@@ -53,39 +67,52 @@ class Smarty_Internal_Config_File_Compiler
     public $config_data = array();
 
     /**
+     * compiled config data must always be written
+     *
+     * @var bool
+     */
+    public $write_compiled_code = true;
+
+    /**
      * Initialize compiler
      *
-     * @param Smarty $smarty base instance
+     * @param string $lexer_class  class name
+     * @param string $parser_class class name
+     * @param Smarty $smarty       global instance
      */
-    public function __construct($smarty)
+    public function __construct($lexer_class, $parser_class, Smarty $smarty)
     {
         $this->smarty = $smarty;
+        // get required plugins
+        $this->lexer_class = $lexer_class;
+        $this->parser_class = $parser_class;
+        $this->smarty = $smarty;
         $this->config_data['sections'] = array();
         $this->config_data['vars'] = array();
     }
 
     /**
-     * Method to compile a Smarty template.
+     * Method to compile Smarty config source.
      *
-     * @param  Smarty_Internal_Config $config config object
+     * @param Smarty_Internal_Template $template
      *
-     * @return bool                   true if compiling succeeded, false if it failed
+     * @return bool true if compiling succeeded, false if it failed
      */
-    public function compileSource(Smarty_Internal_Config $config)
+    public function compileTemplate(Smarty_Internal_Template $template)
     {
-        /* here is where the compiling takes place. Smarty
-          tags in the templates are replaces with PHP code,
-          then written to compiled files. */
-        $this->config = $config;
-        // get config file source
-        $_content = $config->source->content . "\n";
-        // on empty template just return
-        if ($_content == '') {
-            return true;
+        $this->template = $template;
+        $this->template->compiled->file_dependency[$this->template->source->uid] = array($this->template->source->filepath,
+                                                                                             $this->template->source->getTimeStamp(),
+                                                                                             $this->template->source->type);
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->start_compile($this->template);
         }
         // init the lexer/parser to compile the config file
-        $lex = new Smarty_Internal_Configfilelexer($_content, $this);
-        $parser = new Smarty_Internal_Configfileparser($lex, $this);
+        /* @var Smarty_Internal_ConfigFileLexer $lex */
+        $lex = new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $template->source->getContent()) .
+                                      "\n", $this);
+        /* @var Smarty_Internal_ConfigFileParser $parser */
+        $parser = new $this->parser_class($lex, $this);
 
         if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
             $mbEncoding = mb_internal_encoding();
@@ -94,7 +121,6 @@ class Smarty_Internal_Config_File_Compiler
             $mbEncoding = null;
         }
 
-
         if ($this->smarty->_parserdebug) {
             $parser->PrintTrace();
         }
@@ -111,8 +137,17 @@ class Smarty_Internal_Config_File_Compiler
         if ($mbEncoding) {
             mb_internal_encoding($mbEncoding);
         }
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->end_compile($this->template);
+        }
+        // template header code
+        $template_header = "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " .
+            strftime("%Y-%m-%d %H:%M:%S") . "\n";
+        $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
 
-        $config->compiled_config = '<?php $_config_vars = ' . var_export($this->config_data, true) . '; ?>';
+        $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
+            var_export($this->config_data, true) . '); ?>';
+        return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
     }
 
     /**
@@ -129,13 +164,13 @@ class Smarty_Internal_Config_File_Compiler
     {
         $this->lex = Smarty_Internal_Configfilelexer::instance();
         $this->parser = Smarty_Internal_Configfileparser::instance();
-        // get template source line which has error
+        // get config source line which has error
         $line = $this->lex->line;
         if (isset($args)) {
             // $line--;
         }
         $match = preg_split("/\n/", $this->lex->data);
-        $error_text = "Syntax error in config file '{$this->config->source->filepath}' on line {$line} '{$match[$line - 1]}' ";
+        $error_text = "Syntax error in config file '{$this->template->source->filepath}' on line {$line} '{$match[$line - 1]}' ";
         if (isset($args)) {
             // individual error message
             $error_text .= $args;
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_configfilelexer.php b/library/Smarty/libs/sysplugins/smarty_internal_configfilelexer.php
index f0292196b..e62728c2c 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_configfilelexer.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_configfilelexer.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Smarty Internal Plugin Configfilelexer
+ *
  * This is the lexer to break the config file source into tokens
  *
  * @package    Smarty
@@ -9,25 +10,134 @@
  */
 
 /**
- * Smarty Internal Plugin Configfilelexer
+ * Smarty_Internal_Configfilelexer
+ *
+ * This is the config file lexer.
+ * It is generated from the smarty_internal_configfilelexer.plex file
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
  */
 class Smarty_Internal_Configfilelexer
 {
-
+    /**
+     * Source
+     *
+     * @var string
+     */
     public $data;
+
+    /**
+     * byte counter
+     *
+     * @var int
+     */
     public $counter;
+
+    /**
+     * token number
+     *
+     * @var int
+     */
     public $token;
+
+    /**
+     * token value
+     *
+     * @var string
+     */
     public $value;
-    public $node;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
     public $line;
-    private $state = 1;
+
+    /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    private $compiler = null;
+
+    /**
+     * copy of config_booleanize
+     *
+     * @var bool
+     */
+    private $configBooleanize = false;
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
     public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
     public $yyTracePrompt;
-    public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE');
-    public $smarty_token_names = array( // Text for parser error messages
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION',
+                               6 => 'TRIPPLE');
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var sring
+     */
+    private $yy_global_pattern1 = null;
+
+    private $yy_global_pattern2 = null;
+
+    private $yy_global_pattern3 = null;
+
+    private $yy_global_pattern4 = null;
+
+    private $yy_global_pattern5 = null;
+
+    private $yy_global_pattern6 = null;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
     );
 
-    function __construct($data, $compiler)
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
     {
         // set instance object
         self::instance($this);
@@ -39,6 +149,7 @@ class Smarty_Internal_Configfilelexer
         $this->line = 1;
         $this->compiler = $compiler;
         $this->smarty = $compiler->smarty;
+        $this->configBooleanize = $this->smarty->config_booleanize;
     }
 
     public static function &instance($new_instance = null)
@@ -57,6 +168,7 @@ class Smarty_Internal_Configfilelexer
     }
 
     private $_yy_state = 1;
+
     private $_yy_stack = array();
 
     public function yylex()
@@ -97,41 +209,28 @@ class Smarty_Internal_Configfilelexer
 
     public function yylex1()
     {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-            3 => 0,
-            4 => 0,
-            5 => 0,
-            6 => 0,
-            7 => 0,
-            8 => 0,
-        );
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state START');
+                if (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state START');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r1_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -151,8 +250,7 @@ class Smarty_Internal_Configfilelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
@@ -160,52 +258,52 @@ class Smarty_Internal_Configfilelexer
 
     const START = 1;
 
-    function yy_r1_1($yy_subpatterns)
+    function yy_r1_1()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
         $this->yypushstate(self::COMMENT);
     }
 
-    function yy_r1_2($yy_subpatterns)
+    function yy_r1_2()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
         $this->yypushstate(self::SECTION);
     }
 
-    function yy_r1_3($yy_subpatterns)
+    function yy_r1_3()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
     }
 
-    function yy_r1_4($yy_subpatterns)
+    function yy_r1_4()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
         $this->yypushstate(self::VALUE);
     }
 
-    function yy_r1_5($yy_subpatterns)
+    function yy_r1_5()
     {
 
         return false;
     }
 
-    function yy_r1_6($yy_subpatterns)
+    function yy_r1_6()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
     }
 
-    function yy_r1_7($yy_subpatterns)
+    function yy_r1_7()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_ID;
     }
 
-    function yy_r1_8($yy_subpatterns)
+    function yy_r1_8()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
@@ -213,42 +311,28 @@ class Smarty_Internal_Configfilelexer
 
     public function yylex2()
     {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-            3 => 0,
-            4 => 0,
-            5 => 0,
-            6 => 0,
-            7 => 0,
-            8 => 0,
-            9 => 0,
-        );
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state VALUE');
+                if (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state VALUE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r2_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -268,8 +352,7 @@ class Smarty_Internal_Configfilelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
@@ -277,51 +360,53 @@ class Smarty_Internal_Configfilelexer
 
     const VALUE = 2;
 
-    function yy_r2_1($yy_subpatterns)
+    function yy_r2_1()
     {
 
         return false;
     }
 
-    function yy_r2_2($yy_subpatterns)
+    function yy_r2_2()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
         $this->yypopstate();
     }
 
-    function yy_r2_3($yy_subpatterns)
+    function yy_r2_3()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_INT;
         $this->yypopstate();
     }
 
-    function yy_r2_4($yy_subpatterns)
+    function yy_r2_4()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
         $this->yypushstate(self::TRIPPLE);
     }
 
-    function yy_r2_5($yy_subpatterns)
+    function yy_r2_5()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
         $this->yypopstate();
     }
 
-    function yy_r2_6($yy_subpatterns)
+    function yy_r2_6()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
         $this->yypopstate();
     }
 
-    function yy_r2_7($yy_subpatterns)
+    function yy_r2_7()
     {
 
-        if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no"))) {
+        if (!$this->configBooleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes",
+                "no"))
+        ) {
             $this->yypopstate();
             $this->yypushstate(self::NAKED_STRING_VALUE);
             return true; //reprocess in new state
@@ -331,14 +416,14 @@ class Smarty_Internal_Configfilelexer
         }
     }
 
-    function yy_r2_8($yy_subpatterns)
+    function yy_r2_8()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
         $this->yypopstate();
     }
 
-    function yy_r2_9($yy_subpatterns)
+    function yy_r2_9()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
@@ -348,34 +433,28 @@ class Smarty_Internal_Configfilelexer
 
     public function yylex3()
     {
-        $tokenMap = array(
-            1 => 0,
-        );
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = "/\G([^\n]+?(?=[ \t\r]*\n))/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state NAKED_STRING_VALUE');
+                if (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state NAKED_STRING_VALUE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r3_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -395,8 +474,7 @@ class Smarty_Internal_Configfilelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
@@ -404,7 +482,7 @@ class Smarty_Internal_Configfilelexer
 
     const NAKED_STRING_VALUE = 3;
 
-    function yy_r3_1($yy_subpatterns)
+    function yy_r3_1()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
@@ -413,36 +491,28 @@ class Smarty_Internal_Configfilelexer
 
     public function yylex4()
     {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-            3 => 0,
-        );
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state COMMENT');
+                if (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state COMMENT');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r4_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -462,8 +532,7 @@ class Smarty_Internal_Configfilelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
@@ -471,19 +540,19 @@ class Smarty_Internal_Configfilelexer
 
     const COMMENT = 4;
 
-    function yy_r4_1($yy_subpatterns)
+    function yy_r4_1()
     {
 
         return false;
     }
 
-    function yy_r4_2($yy_subpatterns)
+    function yy_r4_2()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
     }
 
-    function yy_r4_3($yy_subpatterns)
+    function yy_r4_3()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
@@ -492,35 +561,28 @@ class Smarty_Internal_Configfilelexer
 
     public function yylex5()
     {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-        );
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state SECTION');
+                if (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state SECTION');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r5_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -540,8 +602,7 @@ class Smarty_Internal_Configfilelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
@@ -549,13 +610,13 @@ class Smarty_Internal_Configfilelexer
 
     const SECTION = 5;
 
-    function yy_r5_1($yy_subpatterns)
+    function yy_r5_1()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
     }
 
-    function yy_r5_2($yy_subpatterns)
+    function yy_r5_2()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
@@ -564,35 +625,28 @@ class Smarty_Internal_Configfilelexer
 
     public function yylex6()
     {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-        );
+        if (!isset($this->yy_global_pattern6)) {
+            $this->yy_global_pattern6 = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state TRIPPLE');
+                if (strlen($yysubmatches[0]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' . substr($this->data, $this->counter, 5) . '... state TRIPPLE');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r6_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r6_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -612,8 +666,7 @@ class Smarty_Internal_Configfilelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
@@ -621,7 +674,7 @@ class Smarty_Internal_Configfilelexer
 
     const TRIPPLE = 6;
 
-    function yy_r6_1($yy_subpatterns)
+    function yy_r6_1()
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
@@ -629,7 +682,7 @@ class Smarty_Internal_Configfilelexer
         $this->yypushstate(self::START);
     }
 
-    function yy_r6_2($yy_subpatterns)
+    function yy_r6_2()
     {
 
         $to = strlen($this->data);
@@ -642,5 +695,5 @@ class Smarty_Internal_Configfilelexer
         $this->value = substr($this->data, $this->counter, $to - $this->counter);
         $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
     }
-}
 
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_configfileparser.php b/library/Smarty/libs/sysplugins/smarty_internal_configfileparser.php
index fc476ce0a..69aaf990f 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_configfileparser.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_configfileparser.php
@@ -1,17 +1,9 @@
 <?php
 
-/**
- * Smarty Internal Plugin Configfileparser
- * This is the config file parser.
- * It is generated from the internal.configfileparser.y file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
 class TPC_yyToken implements ArrayAccess
 {
     public $string = '';
+
     public $metadata = array();
 
     public function __construct($s, $m = array())
@@ -31,7 +23,7 @@ class TPC_yyToken implements ArrayAccess
 
     public function __toString()
     {
-        return $this->_string;
+        return $this->string;
     }
 
     public function offsetExists($offset)
@@ -48,8 +40,7 @@ class TPC_yyToken implements ArrayAccess
     {
         if ($offset === null) {
             if (isset($value[0])) {
-                $x = ($value instanceof TPC_yyToken) ?
-                    $value->metadata : $value;
+                $x = ($value instanceof TPC_yyToken) ? $value->metadata : $value;
                 $this->metadata = array_merge($this->metadata, $x);
 
                 return;
@@ -76,8 +67,8 @@ class TPC_yyToken implements ArrayAccess
 
 class TPC_yyStackEntry
 {
-    public $stateno; /* The state-number */
-    public $major; /* The major token value.  This is the code
+    public $stateno;       /* The state-number */
+    public $major;         /* The major token value.  This is the code
                      ** number for the token at this stack level */
     public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
@@ -85,26 +76,112 @@ class TPC_yyStackEntry
 
 ;
 
-#line 12 "smarty_internal_configfileparser.y"
-class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparser.php"
+#line 12 "../smarty/lexer/smarty_internal_configfileparser.y"
+
+/**
+ * Smarty Internal Plugin Configfileparse
+ *
+ * This is the config file parser.
+ * It is generated from the smarty_internal_configfileparser.y file
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Configfileparser
 {
-    #line 14 "smarty_internal_configfileparser.y"
+    #line 25 "../smarty/lexer/smarty_internal_configfileparser.y"
 
-    // states whether the parse was successful or not
+    /**
+     * result status
+     *
+     * @var bool
+     */
     public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
     public $retvalue = 0;
+
+    /**
+     * @var
+     */
+    public $yymajor;
+
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Configfilelexer
+     */
     private $lex;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
     private $internalError = false;
 
-    function __construct($lex, $compiler)
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    public $compiler = null;
+
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * copy of config_overwrite property
+     *
+     * @var bool
+     */
+    private $configOverwrite = false;
+
+    /**
+     * copy of config_read_hidden property
+     *
+     * @var bool
+     */
+    private $configReadHidden = false;
+
+    /**
+     * helper map
+     *
+     * @var array
+     */
+    private static $escapes_single = Array('\\' => '\\', '\'' => '\'');
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Configfilelexer      $lex
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
     {
         // set instance object
         self::instance($this);
         $this->lex = $lex;
         $this->smarty = $compiler->smarty;
         $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
     }
 
+    /**
+     * @param null $new_instance
+     *
+     * @return null
+     */
     public static function &instance($new_instance = null)
     {
         static $instance = null;
@@ -114,9 +191,17 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
         return $instance;
     }
 
+    /**
+     * parse optional boolean keywords
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
     private function parse_bool($str)
     {
-        if (in_array(strtolower($str), array('on', 'yes', 'true'))) {
+        $str = strtolower($str);
+        if (in_array($str, array('on', 'yes', 'true'))) {
             $res = true;
         } else {
             $res = false;
@@ -124,9 +209,15 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
         return $res;
     }
 
-    private static $escapes_single = Array('\\' => '\\',
-                                           '\'' => '\'');
-
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
     private static function parse_single_quoted_string($qstr)
     {
         $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
@@ -140,30 +231,48 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
                     $s = self::$escapes_single[$s[1]];
                 }
             }
-
             $str .= $s;
         }
-
         return $str;
     }
 
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
     private static function parse_double_quoted_string($qstr)
     {
         $inner_str = substr($qstr, 1, strlen($qstr) - 2);
         return stripcslashes($inner_str);
     }
 
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
     private static function parse_tripple_double_quoted_string($qstr)
     {
         return stripcslashes($qstr);
     }
 
+    /**
+     * set a config variable in target array
+     *
+     * @param array $var
+     * @param array $target_array
+     */
     private function set_var(Array $var, Array &$target_array)
     {
         $key = $var["key"];
         $value = $var["value"];
 
-        if ($this->smarty->config_overwrite || !isset($target_array['vars'][$key])) {
+        if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
             $target_array['vars'][$key] = $value;
         } else {
             settype($target_array['vars'][$key], 'array');
@@ -171,6 +280,11 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
         }
     }
 
+    /**
+     * add config variable to global vars
+     *
+     * @param array $vars
+     */
     private function add_global_vars(Array $vars)
     {
         if (!isset($this->compiler->config_data['vars'])) {
@@ -181,6 +295,12 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
         }
     }
 
+    /**
+     * add config variable to section
+     *
+     * @param string $section_name
+     * @param array  $vars
+     */
     private function add_section_vars($section_name, Array $vars)
     {
         if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
@@ -191,158 +311,92 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
         }
     }
 
-    #line 174 "smarty_internal_configfileparser.php"
-
     const TPC_OPENB = 1;
+
     const TPC_SECTION = 2;
+
     const TPC_CLOSEB = 3;
+
     const TPC_DOT = 4;
+
     const TPC_ID = 5;
+
     const TPC_EQUAL = 6;
+
     const TPC_FLOAT = 7;
+
     const TPC_INT = 8;
+
     const TPC_BOOL = 9;
+
     const TPC_SINGLE_QUOTED_STRING = 10;
+
     const TPC_DOUBLE_QUOTED_STRING = 11;
+
     const TPC_TRIPPLE_QUOTES = 12;
+
     const TPC_TRIPPLE_TEXT = 13;
+
     const TPC_TRIPPLE_QUOTES_END = 14;
+
     const TPC_NAKED_STRING = 15;
+
     const TPC_OTHER = 16;
+
     const TPC_NEWLINE = 17;
+
     const TPC_COMMENTSTART = 18;
+
     const YY_NO_ACTION = 60;
+
     const YY_ACCEPT_ACTION = 59;
+
     const YY_ERROR_ACTION = 58;
 
     const YY_SZ_ACTTAB = 38;
-    static public $yy_action = array(
-        /*     0 */
-        29, 30, 34, 33, 24, 13, 19, 25, 35, 21,
-        /*    10 */
-        59, 8, 3, 1, 20, 12, 14, 31, 20, 12,
-        /*    20 */
-        15, 17, 23, 18, 27, 26, 4, 5, 6, 32,
-        /*    30 */
-        2, 11, 28, 22, 16, 9, 7, 10,
-    );
-    static public $yy_lookahead = array(
-        /*     0 */
-        7, 8, 9, 10, 11, 12, 5, 27, 15, 16,
-        /*    10 */
-        20, 21, 23, 23, 17, 18, 13, 14, 17, 18,
-        /*    20 */
-        15, 2, 17, 4, 25, 26, 6, 3, 3, 14,
-        /*    30 */
-        23, 1, 24, 17, 2, 25, 22, 25,
-    );
+
+    static public $yy_action = array(29, 30, 34, 33, 24, 13, 19, 25, 35, 21, 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, 15,
+        17, 23, 18, 27, 26, 4, 5, 6, 32, 2, 11, 28, 22, 16, 9, 7, 10,);
+
+    static public $yy_lookahead = array(7, 8, 9, 10, 11, 12, 5, 27, 15, 16, 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, 15,
+        2, 17, 4, 25, 26, 6, 3, 3, 14, 23, 1, 24, 17, 2, 25, 22, 25,);
+
     const YY_SHIFT_USE_DFLT = - 8;
+
     const YY_SHIFT_MAX = 19;
-    static public $yy_shift_ofst = array(
-        /*     0 */
-        - 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8,
-        /*    10 */
-        - 8, 19, 5, 3, 15, 16, 24, 25, 32, 20,
-    );
+
+    static public $yy_shift_ofst = array(- 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8, - 8, 19, 5, 3, 15, 16, 24, 25, 32,
+        20,);
+
     const YY_REDUCE_USE_DFLT = - 21;
+
     const YY_REDUCE_MAX = 10;
-    static public $yy_reduce_ofst = array(
-        /*     0 */
-        - 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7,
-        /*    10 */
-        - 11,
-    );
-    static public $yyExpectedTokens = array(
-        /* 0 */
-        array(),
-        /* 1 */
-        array(5, 17, 18,),
-        /* 2 */
-        array(5, 17, 18,),
-        /* 3 */
-        array(5, 17, 18,),
-        /* 4 */
-        array(7, 8, 9, 10, 11, 12, 15, 16,),
-        /* 5 */
-        array(17, 18,),
-        /* 6 */
-        array(17, 18,),
-        /* 7 */
-        array(1,),
-        /* 8 */
-        array(),
-        /* 9 */
-        array(),
-        /* 10 */
-        array(),
-        /* 11 */
-        array(2, 4,),
-        /* 12 */
-        array(15, 17,),
-        /* 13 */
-        array(13, 14,),
-        /* 14 */
-        array(14,),
-        /* 15 */
-        array(17,),
-        /* 16 */
-        array(3,),
-        /* 17 */
-        array(3,),
-        /* 18 */
-        array(2,),
-        /* 19 */
-        array(6,),
-        /* 20 */
-        array(),
-        /* 21 */
-        array(),
-        /* 22 */
-        array(),
-        /* 23 */
-        array(),
-        /* 24 */
-        array(),
-        /* 25 */
-        array(),
-        /* 26 */
-        array(),
-        /* 27 */
-        array(),
-        /* 28 */
-        array(),
-        /* 29 */
-        array(),
-        /* 30 */
-        array(),
-        /* 31 */
-        array(),
-        /* 32 */
-        array(),
-        /* 33 */
-        array(),
-        /* 34 */
-        array(),
-        /* 35 */
-        array(),
-    );
-    static public $yy_default = array(
-        /*     0 */
-        44, 37, 41, 40, 58, 58, 58, 36, 39, 44,
-        /*    10 */
-        44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-        /*    20 */
-        55, 54, 57, 56, 50, 45, 43, 42, 38, 46,
-        /*    30 */
-        47, 52, 51, 49, 48, 53,
-    );
+
+    static public $yy_reduce_ofst = array(- 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7, - 11,);
+
+    static public $yyExpectedTokens = array(array(), array(5, 17, 18,), array(5, 17, 18,), array(5, 17, 18,),
+        array(7, 8, 9, 10, 11, 12, 15, 16,), array(17, 18,), array(17, 18,), array(1,), array(), array(), array(),
+        array(2, 4,), array(15, 17,), array(13, 14,), array(14,), array(17,), array(3,), array(3,), array(2,),
+        array(6,), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(), array(),
+        array(), array(), array(), array(), array(),);
+
+    static public $yy_default = array(44, 37, 41, 40, 58, 58, 58, 36, 39, 44, 44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+        55, 54, 57, 56, 50, 45, 43, 42, 38, 46, 47, 52, 51, 49, 48, 53,);
+
     const YYNOCODE = 29;
+
     const YYSTACKDEPTH = 100;
+
     const YYNSTATE = 36;
+
     const YYNRULE = 22;
+
     const YYERRORSYMBOL = 19;
+
     const YYERRSYMDT = 'yy0';
+
     const YYFALLBACK = 0;
+
     public static $yyFallback = array();
 
     public function Trace($TraceFILE, $zTracePrompt)
@@ -363,67 +417,26 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
     }
 
     public $yyTraceFILE;
+
     public $yyTracePrompt;
-    public $yyidx; /* Index of top element in stack */
-    public $yyerrcnt; /* Shifts left before out of the error */
-    public $yystack = array(); /* The parser's stack */
-
-    public $yyTokenName = array(
-        '$', 'OPENB', 'SECTION', 'CLOSEB',
-        'DOT', 'ID', 'EQUAL', 'FLOAT',
-        'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING',
-        'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING',
-        'OTHER', 'NEWLINE', 'COMMENTSTART', 'error',
-        'start', 'global_vars', 'sections', 'var_list',
-        'section', 'newline', 'var', 'value',
-    );
-
-    public static $yyRuleName = array(
-        /*   0 */
-        "start ::= global_vars sections",
-        /*   1 */
-        "global_vars ::= var_list",
-        /*   2 */
-        "sections ::= sections section",
-        /*   3 */
-        "sections ::=",
-        /*   4 */
-        "section ::= OPENB SECTION CLOSEB newline var_list",
-        /*   5 */
-        "section ::= OPENB DOT SECTION CLOSEB newline var_list",
-        /*   6 */
-        "var_list ::= var_list newline",
-        /*   7 */
-        "var_list ::= var_list var",
-        /*   8 */
-        "var_list ::=",
-        /*   9 */
-        "var ::= ID EQUAL value",
-        /*  10 */
-        "value ::= FLOAT",
-        /*  11 */
-        "value ::= INT",
-        /*  12 */
-        "value ::= BOOL",
-        /*  13 */
-        "value ::= SINGLE_QUOTED_STRING",
-        /*  14 */
-        "value ::= DOUBLE_QUOTED_STRING",
-        /*  15 */
-        "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END",
-        /*  16 */
-        "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END",
-        /*  17 */
-        "value ::= NAKED_STRING",
-        /*  18 */
-        "value ::= OTHER",
-        /*  19 */
-        "newline ::= NEWLINE",
-        /*  20 */
-        "newline ::= COMMENTSTART NEWLINE",
-        /*  21 */
-        "newline ::= COMMENTSTART NAKED_STRING NEWLINE",
-    );
+
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array('$', 'OPENB', 'SECTION', 'CLOSEB', 'DOT', 'ID', 'EQUAL', 'FLOAT', 'INT', 'BOOL',
+        'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END',
+        'NAKED_STRING', 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error', 'start', 'global_vars', 'sections', 'var_list',
+        'section', 'newline', 'var', 'value',);
+
+    public static $yyRuleName = array('start ::= global_vars sections', 'global_vars ::= var_list',
+        'sections ::= sections section', 'sections ::=', 'section ::= OPENB SECTION CLOSEB newline var_list',
+        'section ::= OPENB DOT SECTION CLOSEB newline var_list', 'var_list ::= var_list newline',
+        'var_list ::= var_list var', 'var_list ::=', 'var ::= ID EQUAL value', 'value ::= FLOAT', 'value ::= INT',
+        'value ::= BOOL', 'value ::= SINGLE_QUOTED_STRING', 'value ::= DOUBLE_QUOTED_STRING',
+        'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END', 'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END',
+        'value ::= NAKED_STRING', 'value ::= OTHER', 'newline ::= NEWLINE', 'newline ::= COMMENTSTART NEWLINE',
+        'newline ::= COMMENTSTART NAKED_STRING NEWLINE',);
 
     public function tokenName($tokenType)
     {
@@ -441,20 +454,18 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
     {
         switch ($yymajor) {
             default:
-                break; /* If no destructor action specified: do nothing */
+                break;   /* If no destructor action specified: do nothing */
         }
     }
 
     public function yy_pop_parser_stack()
     {
-        if (!count($this->yystack)) {
+        if (empty($this->yystack)) {
             return;
         }
         $yytos = array_pop($this->yystack);
         if ($this->yyTraceFILE && $this->yyidx >= 0) {
-            fwrite($this->yyTraceFILE,
-                   $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                   "\n");
+            fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . "\n");
         }
         $yymajor = $yytos->major;
         self::yy_destructor($yymajor, $yytos->minor);
@@ -475,10 +486,18 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
 
     public function yy_get_expected_tokens($token)
     {
+        static $res3 = array();
+        static $res4 = array();
         $state = $this->yystack[$this->yyidx]->stateno;
         $expected = self::$yyExpectedTokens[$state];
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return $expected;
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return $expected;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -496,18 +515,22 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
                         return array_unique($expected);
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]);
                     if (isset(self::$yyExpectedTokens[$nextstate])) {
                         $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                        if (in_array($token,
-                                     self::$yyExpectedTokens[$nextstate], true)) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-
-                            return array_unique($expected);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
                         }
                     }
                     if ($nextstate < self::YYNSTATE) {
@@ -515,7 +538,7 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
                         $this->yyidx ++;
                         $x = new TPC_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
                         $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
@@ -545,12 +568,20 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
 
     public function yy_is_expected_token($token)
     {
+        static $res = array();
+        static $res2 = array();
         if ($token === 0) {
             return true; // 0 is not part of this
         }
         $state = $this->yystack[$this->yyidx]->stateno;
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return true;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
+                return true;
+            }
+        } else {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return true;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -568,24 +599,27 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
                         return true;
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                        in_array($token, self::$yyExpectedTokens[$nextstate], true)
-                    ) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-
-                        return true;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
                         $this->yyidx ++;
                         $x = new TPC_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
                         $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
@@ -634,16 +668,10 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-            self::$yy_lookahead[$i] != $iLookAhead
-        ) {
-            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                && ($iFallback = self::$yyFallback[$iLookAhead]) != 0
-            ) {
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
                 if ($this->yyTraceFILE) {
-                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " .
-                        $this->yyTokenName[$iLookAhead] . " => " .
-                        $this->yyTokenName[$iFallback] . "\n");
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[$iLookAhead] . " => " . $this->yyTokenName[$iFallback] . "\n");
                 }
 
                 return $this->yy_find_shift_action($iFallback);
@@ -670,9 +698,7 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-            self::$yy_lookahead[$i] != $iLookAhead
-        ) {
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
             return self::$yy_default[$stateno];
         } else {
             return self::$yy_action[$i];
@@ -690,11 +716,10 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-            #line 125 "smarty_internal_configfileparser.y"
+            #line 255 "../smarty/lexer/smarty_internal_configfileparser.y"
 
             $this->internalError = true;
             $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
-            #line 601 "smarty_internal_configfileparser.php"
 
             return;
         }
@@ -702,194 +727,147 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
         $yytos->stateno = $yyNewState;
         $yytos->major = $yyMajor;
         $yytos->minor = $yypMinor;
-        array_push($this->yystack, $yytos);
+        $this->yystack[] = $yytos;
         if ($this->yyTraceFILE && $this->yyidx > 0) {
-            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
-                    $yyNewState);
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState);
             fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
             for ($i = 1; $i <= $this->yyidx; $i ++) {
-                fprintf($this->yyTraceFILE, " %s",
-                        $this->yyTokenName[$this->yystack[$i]->major]);
+                fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[$this->yystack[$i]->major]);
             }
             fwrite($this->yyTraceFILE, "\n");
         }
     }
 
-    public static $yyRuleInfo = array(
-        array('lhs' => 20, 'rhs' => 2),
-        array('lhs' => 21, 'rhs' => 1),
-        array('lhs' => 22, 'rhs' => 2),
-        array('lhs' => 22, 'rhs' => 0),
-        array('lhs' => 24, 'rhs' => 5),
-        array('lhs' => 24, 'rhs' => 6),
-        array('lhs' => 23, 'rhs' => 2),
-        array('lhs' => 23, 'rhs' => 2),
-        array('lhs' => 23, 'rhs' => 0),
-        array('lhs' => 26, 'rhs' => 3),
-        array('lhs' => 27, 'rhs' => 1),
-        array('lhs' => 27, 'rhs' => 1),
-        array('lhs' => 27, 'rhs' => 1),
-        array('lhs' => 27, 'rhs' => 1),
-        array('lhs' => 27, 'rhs' => 1),
-        array('lhs' => 27, 'rhs' => 3),
-        array('lhs' => 27, 'rhs' => 2),
-        array('lhs' => 27, 'rhs' => 1),
-        array('lhs' => 27, 'rhs' => 1),
-        array('lhs' => 25, 'rhs' => 1),
-        array('lhs' => 25, 'rhs' => 2),
-        array('lhs' => 25, 'rhs' => 3),
-    );
-
-    public static $yyReduceMap = array(
-        0  => 0,
-        2  => 0,
-        3  => 0,
-        19 => 0,
-        20 => 0,
-        21 => 0,
-        1  => 1,
-        4  => 4,
-        5  => 5,
-        6  => 6,
-        7  => 7,
-        8  => 8,
-        9  => 9,
-        10 => 10,
-        11 => 11,
-        12 => 12,
-        13 => 13,
-        14 => 14,
-        15 => 15,
-        16 => 16,
-        17 => 17,
-        18 => 17,
-    );
-
-    #line 131 "smarty_internal_configfileparser.y"
+    public static $yyRuleInfo = array(array(0 => 20, 1 => 2), array(0 => 21, 1 => 1), array(0 => 22, 1 => 2),
+        array(0 => 22, 1 => 0), array(0 => 24, 1 => 5), array(0 => 24, 1 => 6), array(0 => 23, 1 => 2),
+        array(0 => 23, 1 => 2), array(0 => 23, 1 => 0), array(0 => 26, 1 => 3), array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 3), array(0 => 27, 1 => 2), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1),
+        array(0 => 25, 1 => 1), array(0 => 25, 1 => 2), array(0 => 25, 1 => 3),);
+
+    public static $yyReduceMap = array(0  => 0, 2 => 0, 3 => 0, 19 => 0, 20 => 0, 21 => 0, 1 => 1, 4 => 4, 5 => 5,
+                                       6  => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13,
+                                       14 => 14, 15 => 15, 16 => 16, 17 => 17, 18 => 17,);
+
+    #line 261 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r0()
     {
         $this->_retvalue = null;
     }
-    #line 675 "smarty_internal_configfileparser.php"
-    #line 136 "smarty_internal_configfileparser.y"
+
+    #line 266 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r1()
     {
         $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
         $this->_retvalue = null;
     }
-    #line 680 "smarty_internal_configfileparser.php"
-    #line 149 "smarty_internal_configfileparser.y"
+
+    #line 280 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r4()
     {
         $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
         $this->_retvalue = null;
     }
-    #line 686 "smarty_internal_configfileparser.php"
-    #line 154 "smarty_internal_configfileparser.y"
+
+    #line 285 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r5()
     {
-        if ($this->smarty->config_read_hidden) {
+        if ($this->configReadHidden) {
             $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
         }
         $this->_retvalue = null;
     }
-    #line 694 "smarty_internal_configfileparser.php"
-    #line 162 "smarty_internal_configfileparser.y"
+
+    #line 293 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r6()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
-    #line 699 "smarty_internal_configfileparser.php"
-    #line 166 "smarty_internal_configfileparser.y"
+
+    #line 297 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r7()
     {
         $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 704 "smarty_internal_configfileparser.php"
-    #line 170 "smarty_internal_configfileparser.y"
+
+    #line 301 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r8()
     {
         $this->_retvalue = Array();
     }
-    #line 709 "smarty_internal_configfileparser.php"
-    #line 176 "smarty_internal_configfileparser.y"
+
+    #line 307 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r9()
     {
-        $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + - 2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = Array("key"   => $this->yystack[$this->yyidx + - 2]->minor,
+                                 "value" => $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 714 "smarty_internal_configfileparser.php"
-    #line 181 "smarty_internal_configfileparser.y"
+
+    #line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r10()
     {
         $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 719 "smarty_internal_configfileparser.php"
-    #line 185 "smarty_internal_configfileparser.y"
+
+    #line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r11()
     {
         $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 724 "smarty_internal_configfileparser.php"
-    #line 189 "smarty_internal_configfileparser.y"
+
+    #line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r12()
     {
         $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 729 "smarty_internal_configfileparser.php"
-    #line 193 "smarty_internal_configfileparser.y"
+
+    #line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r13()
     {
         $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 734 "smarty_internal_configfileparser.php"
-    #line 197 "smarty_internal_configfileparser.y"
+
+    #line 328 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r14()
     {
         $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 739 "smarty_internal_configfileparser.php"
-    #line 201 "smarty_internal_configfileparser.y"
+
+    #line 332 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r15()
     {
         $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + - 1]->minor);
     }
-    #line 744 "smarty_internal_configfileparser.php"
-    #line 205 "smarty_internal_configfileparser.y"
+
+    #line 336 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r16()
     {
         $this->_retvalue = '';
     }
-    #line 749 "smarty_internal_configfileparser.php"
-    #line 209 "smarty_internal_configfileparser.y"
+
+    #line 340 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r17()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
 
-    #line 754 "smarty_internal_configfileparser.php"
-
     private $_retvalue;
 
     public function yy_reduce($yyruleno)
     {
-        $yymsp = $this->yystack[$this->yyidx];
-        if ($this->yyTraceFILE && $yyruleno >= 0
-            && $yyruleno < count(self::$yyRuleName)
-        ) {
-            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
-                    $this->yyTracePrompt, $yyruleno,
-                    self::$yyRuleName[$yyruleno]);
+        if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno, self::$yyRuleName[$yyruleno]);
         }
 
         $this->_retvalue = $yy_lefthand_side = null;
-        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
+        if (isset(self::$yyReduceMap[$yyruleno])) {
             // call the action
             $this->_retvalue = null;
             $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
             $yy_lefthand_side = $this->_retvalue;
         }
-        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
-        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
+        $yygoto = self::$yyRuleInfo[$yyruleno][0];
+        $yysize = self::$yyRuleInfo[$yyruleno][1];
         $this->yyidx -= $yysize;
         for ($i = $yysize; $i; $i --) {
             // pop all of the right-hand side parameters
@@ -924,12 +902,11 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
 
     public function yy_syntax_error($yymajor, $TOKEN)
     {
-        #line 118 "smarty_internal_configfileparser.y"
+        #line 248 "../smarty/lexer/smarty_internal_configfileparser.y"
 
         $this->internalError = true;
         $this->yymajor = $yymajor;
         $this->compiler->trigger_config_file_error();
-        #line 816 "smarty_internal_configfileparser.php"
     }
 
     public function yy_accept()
@@ -938,20 +915,18 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
             fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
-            $stack = $this->yy_pop_parser_stack();
+            $this->yy_pop_parser_stack();
         }
-        #line 110 "smarty_internal_configfileparser.y"
+        #line 241 "../smarty/lexer/smarty_internal_configfileparser.y"
 
         $this->successful = !$this->internalError;
         $this->internalError = false;
         $this->retvalue = $this->_retvalue;
-        //echo $this->retvalue."\n\n";
-        #line 833 "smarty_internal_configfileparser.php"
     }
 
     public function doParse($yymajor, $yytokenvalue)
     {
-        $yyerrorhit = 0; /* True if yymajor has invoked an error */
+        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
 
         if ($this->yyidx === null || $this->yyidx < 0) {
             $this->yyidx = 0;
@@ -960,20 +935,17 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
             $x->stateno = 0;
             $x->major = 0;
             $this->yystack = array();
-            array_push($this->yystack, $x);
+            $this->yystack[] = $x;
         }
         $yyendofinput = ($yymajor == 0);
 
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sInput %s\n",
-                    $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+            fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
         }
 
         do {
             $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL &&
-                !$this->yy_is_expected_token($yymajor)
-            ) {
+            if ($yymajor < self::YYERRORSYMBOL && !$this->yy_is_expected_token($yymajor)) {
                 // force a syntax error
                 $yyact = self::YY_ERROR_ACTION;
             }
@@ -989,8 +961,7 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
                 $this->yy_reduce($yyact - self::YYNSTATE);
             } elseif ($yyact == self::YY_ERROR_ACTION) {
                 if ($this->yyTraceFILE) {
-                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
-                            $this->yyTracePrompt);
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt);
                 }
                 if (self::YYERRORSYMBOL) {
                     if ($this->yyerrcnt < 0) {
@@ -999,16 +970,12 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
                     $yymx = $this->yystack[$this->yyidx]->major;
                     if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
                         if ($this->yyTraceFILE) {
-                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
-                                    $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
                         }
                         $this->yy_destructor($yymajor, $yytokenvalue);
                         $yymajor = self::YYNOCODE;
                     } else {
-                        while ($this->yyidx >= 0 &&
-                            $yymx != self::YYERRORSYMBOL &&
-                            ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                        ) {
+                        while ($this->yyidx >= 0 && $yymx != self::YYERRORSYMBOL && ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE) {
                             $this->yy_pop_parser_stack();
                         }
                         if ($this->yyidx < 0 || $yymajor == 0) {
@@ -1040,3 +1007,4 @@ class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparse
         } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
     }
 }
+
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_data.php b/library/Smarty/libs/sysplugins/smarty_internal_data.php
index 9e16f10c0..53f351b41 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_data.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_data.php
@@ -13,564 +13,213 @@
  *
  * @package    Smarty
  * @subpackage Template
+ *
+ * @method mixed getConfigVars(string $varName = null, bool $searchParents = true)
+ * @method mixed getStreamVariable(string $variable)
+ * @method Smarty_Internal_Data clearAssign(mixed $tpl_var)
+ * @method Smarty_Internal_Data clearAllAssign()
+ * @method Smarty_Internal_Data clearConfig(string $varName = null)
+ * @method Smarty_Internal_Data configLoad(string $config_file, mixed $sections = null, string $scope = 'local')
+ * @property int $scope
  */
 class Smarty_Internal_Data
 {
     /**
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
+     */
+    public $_objType = 4;
+
+    /**
      * name of class used for templates
      *
      * @var string
      */
     public $template_class = 'Smarty_Internal_Template';
+
     /**
      * template variables
      *
-     * @var array
+     * @var Smarty_Variable[]
      */
     public $tpl_vars = array();
+
     /**
      * parent template (if any)
      *
-     * @var Smarty_Internal_Template
+     * @var Smarty|Smarty_Internal_Template|Smarty_Internal_Data
      */
     public $parent = null;
+
     /**
      * configuration settings
      *
-     * @var array
+     * @var string[]
      */
     public $config_vars = array();
 
     /**
-     * assigns a Smarty variable
-     *
-     * @param  array|string $tpl_var the template variable name(s)
-     * @param  mixed        $value   the value to assign
-     * @param  boolean      $nocache if true any output of this variable will be not cached
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function assign($tpl_var, $value = null, $nocache = false)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $_key => $_val) {
-                if ($_key != '') {
-                    $this->tpl_vars[$_key] = new Smarty_variable($_val, $nocache);
-                }
-            }
-        } else {
-            if ($tpl_var != '') {
-                $this->tpl_vars[$tpl_var] = new Smarty_variable($value, $nocache);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * assigns a global Smarty variable
+     * extension handler
      *
-     * @param  string  $varname the global variable name
-     * @param  mixed   $value   the value to assign
-     * @param  boolean $nocache if true any output of this variable will be not cached
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @var Smarty_Internal_Extension_Handler
      */
-    public function assignGlobal($varname, $value = null, $nocache = false)
-    {
-        if ($varname != '') {
-            Smarty::$global_tpl_vars[$varname] = new Smarty_variable($value, $nocache);
-            $ptr = $this;
-            while ($ptr instanceof Smarty_Internal_Template) {
-                $ptr->tpl_vars[$varname] = clone Smarty::$global_tpl_vars[$varname];
-                $ptr = $ptr->parent;
-            }
-        }
-
-        return $this;
-    }
+    public $ext = null;
 
     /**
-     * assigns values to template variables by reference
+     * Smarty_Internal_Data constructor.
      *
-     * @param string   $tpl_var the template variable name
-     * @param          $value
-     * @param  boolean $nocache if true any output of this variable will be not cached
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * Install extension handler
      */
-    public function assignByRef($tpl_var, &$value, $nocache = false)
+    public function __construct()
     {
-        if ($tpl_var != '') {
-            $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
-            $this->tpl_vars[$tpl_var]->value = & $value;
-        }
-
-        return $this;
+        $this->ext = new Smarty_Internal_Extension_Handler();
+        $this->ext->objType = $this->_objType;
     }
 
     /**
-     * appends values to template variables
+     * assigns a Smarty variable
      *
      * @param  array|string $tpl_var the template variable name(s)
-     * @param  mixed        $value   the value to append
-     * @param  boolean      $merge   flag if array elements shall be merged
+     * @param  mixed        $value   the value to assign
      * @param  boolean      $nocache if true any output of this variable will be not cached
      *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for
+     *                              chaining
      */
-    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
+    public function assign($tpl_var, $value = null, $nocache = false)
     {
         if (is_array($tpl_var)) {
-            // $tpl_var is an array, ignore $value
             foreach ($tpl_var as $_key => $_val) {
                 if ($_key != '') {
-                    if (!isset($this->tpl_vars[$_key])) {
-                        $tpl_var_inst = $this->getVariable($_key, null, true, false);
-                        if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-                            $this->tpl_vars[$_key] = new Smarty_variable(null, $nocache);
-                        } else {
-                            $this->tpl_vars[$_key] = clone $tpl_var_inst;
-                        }
-                    }
-                    if (!(is_array($this->tpl_vars[$_key]->value) || $this->tpl_vars[$_key]->value instanceof ArrayAccess)) {
-                        settype($this->tpl_vars[$_key]->value, 'array');
-                    }
-                    if ($merge && is_array($_val)) {
-                        foreach ($_val as $_mkey => $_mval) {
-                            $this->tpl_vars[$_key]->value[$_mkey] = $_mval;
-                        }
-                    } else {
-                        $this->tpl_vars[$_key]->value[] = $_val;
+                    $this->tpl_vars[$_key] = new Smarty_Variable($_val, $nocache);
+                    if ($this->_objType == 2 && $this->scope) {
+                        $this->ext->_updateScope->updateScope($this, $_key);
                     }
                 }
             }
         } else {
-            if ($tpl_var != '' && isset($value)) {
-                if (!isset($this->tpl_vars[$tpl_var])) {
-                    $tpl_var_inst = $this->getVariable($tpl_var, null, true, false);
-                    if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-                        $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
-                    } else {
-                        $this->tpl_vars[$tpl_var] = clone $tpl_var_inst;
-                    }
-                }
-                if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-                    settype($this->tpl_vars[$tpl_var]->value, 'array');
-                }
-                if ($merge && is_array($value)) {
-                    foreach ($value as $_mkey => $_mval) {
-                        $this->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
-                    }
-                } else {
-                    $this->tpl_vars[$tpl_var]->value[] = $value;
+            if ($tpl_var != '') {
+                $this->tpl_vars[$tpl_var] = new Smarty_Variable($value, $nocache);
+                if ($this->_objType == 2 && $this->scope) {
+                    $this->ext->_updateScope->updateScope($this, $tpl_var);
                 }
             }
         }
-
         return $this;
     }
 
     /**
-     * appends values to template variables by reference
+     * appends values to template variables
      *
-     * @param  string  $tpl_var the template variable name
-     * @param  mixed   &$value  the referenced value to append
-     * @param  boolean $merge   flag if array elements shall be merged
+     * @api  Smarty::append()
+     * @link http://www.smarty.net/docs/en/api.append.tpl
      *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function appendByRef($tpl_var, &$value, $merge = false)
-    {
-        if ($tpl_var != '' && isset($value)) {
-            if (!isset($this->tpl_vars[$tpl_var])) {
-                $this->tpl_vars[$tpl_var] = new Smarty_variable();
-            }
-            if (!is_array($this->tpl_vars[$tpl_var]->value)) {
-                settype($this->tpl_vars[$tpl_var]->value, 'array');
-            }
-            if ($merge && is_array($value)) {
-                foreach ($value as $_key => $_val) {
-                    $this->tpl_vars[$tpl_var]->value[$_key] = & $value[$_key];
-                }
-            } else {
-                $this->tpl_vars[$tpl_var]->value[] = & $value;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns a single or all template variables
-     *
-     * @param  string  $varname        variable name or null
-     * @param  object   $_ptr           optional pointer to data object
-     * @param  boolean $search_parents include parent templates?
+     * @param  array|string $tpl_var                                           the template variable name(s)
+     * @param  mixed        $value                                             the value to append
+     * @param  bool         $merge                                             flag if array elements shall be merged
+     * @param  bool         $nocache                                           if true any output of this variable will
+     *                                                                         be not cached
      *
-     * @return string  variable value or or array of variables
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
-    public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
+    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
     {
-        if (isset($varname)) {
-            $_var = $this->getVariable($varname, $_ptr, $search_parents, false);
-            if (is_object($_var)) {
-                return $_var->value;
-            } else {
-                return null;
-            }
-        } else {
-            $_result = array();
-            if ($_ptr === null) {
-                $_ptr = $this;
-            }
-            while ($_ptr !== null) {
-                foreach ($_ptr->tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[$key] = $var->value;
-                    }
-                }
-                // not found, try at parent
-                if ($search_parents) {
-                    $_ptr = $_ptr->parent;
-                } else {
-                    $_ptr = null;
-                }
-            }
-            if ($search_parents && isset(Smarty::$global_tpl_vars)) {
-                foreach (Smarty::$global_tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[$key] = $var->value;
-                    }
-                }
-            }
-
-            return $_result;
-        }
+        return $this->ext->append->append($this, $tpl_var, $value, $merge, $nocache);
     }
 
     /**
-     * clear the given assigned template variable.
-     *
-     * @param  string|array $tpl_var the template variable(s) to clear
+     * assigns a global Smarty variable
      *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function clearAssign($tpl_var)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $curr_var) {
-                unset($this->tpl_vars[$curr_var]);
-            }
-        } else {
-            unset($this->tpl_vars[$tpl_var]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * clear all the assigned template variables.
+     * @param  string  $varName the global variable name
+     * @param  mixed   $value   the value to assign
+     * @param  boolean $nocache if true any output of this variable will be not cached
      *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
-    public function clearAllAssign()
+    public function assignGlobal($varName, $value = null, $nocache = false)
     {
-        $this->tpl_vars = array();
-
-        return $this;
+        return $this->ext->assignGlobal->assignGlobal($this, $varName, $value, $nocache);
     }
 
     /**
-     * load a config file, optionally load just selected sections
+     * appends values to template variables by reference
      *
-     * @param  string $config_file filename
-     * @param  mixed  $sections    array of section names, single section or null
+     * @param  string  $tpl_var the template variable name
+     * @param  mixed   &$value  the referenced value to append
+     * @param  boolean $merge   flag if array elements shall be merged
      *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
-    public function configLoad($config_file, $sections = null)
+    public function appendByRef($tpl_var, &$value, $merge = false)
     {
-        // load Config class
-        $config = new Smarty_Internal_Config($config_file, $this->smarty, $this);
-        $config->loadConfigVars($sections);
-
-        return $this;
+        return $this->ext->appendByRef->appendByRef($this, $tpl_var, $value, $merge);
     }
 
     /**
-     * gets the object of a Smarty variable
+     * assigns values to template variables by reference
      *
-     * @param  string  $variable       the name of the Smarty variable
-     * @param  object  $_ptr           optional pointer to data object
-     * @param  boolean $search_parents search also in parent data
-     * @param bool     $error_enable
+     * @param string   $tpl_var the template variable name
+     * @param          $value
+     * @param  boolean $nocache if true any output of this variable will be not cached
      *
-     * @return object  the object of the variable
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
      */
-    public function getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true)
+    public function assignByRef($tpl_var, &$value, $nocache = false)
     {
-        if ($_ptr === null) {
-            $_ptr = $this;
-        }
-        while ($_ptr !== null) {
-            if (isset($_ptr->tpl_vars[$variable])) {
-                // found it, return it
-                return $_ptr->tpl_vars[$variable];
-            }
-            // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            }
-        }
-        if (isset(Smarty::$global_tpl_vars[$variable])) {
-            // found it, return it
-            return Smarty::$global_tpl_vars[$variable];
-        }
-        if ($this->smarty->error_unassigned && $error_enable) {
-            // force a notice
-            $x = $$variable;
-        }
-
-        return new Undefined_Smarty_Variable;
+        return $this->ext->assignByRef->assignByRef($this, $tpl_var, $value, $nocache);
     }
 
     /**
-     * gets  a config variable
-     *
-     * @param  string $variable the name of the config variable
-     * @param bool    $error_enable
+     * Returns a single or all template variables
      *
-     * @return mixed  the value of the config variable
-     */
-    public function getConfigVariable($variable, $error_enable = true)
-    {
-        $_ptr = $this;
-        while ($_ptr !== null) {
-            if (isset($_ptr->config_vars[$variable])) {
-                // found it, return it
-                return $_ptr->config_vars[$variable];
-            }
-            // not found, try at parent
-            $_ptr = $_ptr->parent;
-        }
-        if ($this->smarty->error_unassigned && $error_enable) {
-            // force a notice
-            $x = $$variable;
-        }
-
-        return null;
-    }
-
-    /**
-     * gets  a stream variable
+     * @api  Smarty::getTemplateVars()
+     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
      *
-     * @param  string $variable the stream of the variable
+     * @param  string                                                 $varName       variable name or null
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
+     * @param  bool                                                   $searchParents include parent templates?
      *
-     * @throws SmartyException
-     * @return mixed  the value of the stream variable
+     * @return mixed variable value or or array of variables
      */
-    public function getStreamVariable($variable)
+    public function getTemplateVars($varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
     {
-        $_result = '';
-        $fp = fopen($variable, 'r+');
-        if ($fp) {
-            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
-                $_result .= $current_line;
-            }
-            fclose($fp);
-
-            return $_result;
-        }
-
-        if ($this->smarty->error_unassigned) {
-            throw new SmartyException('Undefined stream variable "' . $variable . '"');
-        } else {
-            return null;
-        }
+        return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
     }
 
     /**
-     * Returns a single or all config variables
+     * Follow the parent chain an merge template and config variables
      *
-     * @param  string $varname variable name or null
-     * @param bool    $search_parents
-     *
-     * @return string variable value or or array of variables
+     * @param \Smarty_Internal_Data|null $data
      */
-    public function getConfigVars($varname = null, $search_parents = true)
+    public function _mergeVars(Smarty_Internal_Data $data = null)
     {
-        $_ptr = $this;
-        $var_array = array();
-        while ($_ptr !== null) {
-            if (isset($varname)) {
-                if (isset($_ptr->config_vars[$varname])) {
-                    return $_ptr->config_vars[$varname];
-                }
-            } else {
-                $var_array = array_merge($_ptr->config_vars, $var_array);
+        if (isset($data)) {
+            if (!empty($this->tpl_vars)) {
+                $data->tpl_vars = array_merge($this->tpl_vars, $data->tpl_vars);
             }
-            // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
+            if (!empty($this->config_vars)) {
+                $data->config_vars = array_merge($this->config_vars, $data->config_vars);
             }
-        }
-        if (isset($varname)) {
-            return '';
         } else {
-            return $var_array;
+            $data = $this;
         }
-    }
-
-    /**
-     * Deassigns a single or all config variables
-     *
-     * @param  string $varname variable name or null
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function clearConfig($varname = null)
-    {
-        if (isset($varname)) {
-            unset($this->config_vars[$varname]);
-        } else {
-            $this->config_vars = array();
+        if (isset($this->parent)) {
+            $this->parent->_mergeVars($data);
         }
-
-        return $this;
     }
-}
-
-/**
- * class for the Smarty data object
- * The Smarty data object will hold Smarty variables in the current scope
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Smarty_Data extends Smarty_Internal_Data
-{
-    /**
-     * Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
 
     /**
-     * create Smarty data object
+     * Handle unknown class methods
      *
-     * @param Smarty|array $_parent parent template
-     * @param Smarty|Smarty_Internal_Template       $smarty  global smarty instance
+     * @param string $name unknown method-name
+     * @param array  $args argument array
      *
+     * @return mixed
      * @throws SmartyException
      */
-    public function __construct($_parent = null, $smarty = null)
-    {
-        $this->smarty = $smarty;
-        if (is_object($_parent)) {
-            // when object set up back pointer
-            $this->parent = $_parent;
-        } elseif (is_array($_parent)) {
-            // set up variable values
-            foreach ($_parent as $_key => $_val) {
-                $this->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        } elseif ($_parent != null) {
-            throw new SmartyException("Wrong type for template variables");
-        }
-    }
-}
-
-/**
- * class for the Smarty variable object
- * This class defines the Smarty variable object
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Smarty_Variable
-{
-    /**
-     * template variable
-     *
-     * @var mixed
-     */
-    public $value = null;
-    /**
-     * if true any output of this variable will be not cached
-     *
-     * @var boolean
-     */
-    public $nocache = false;
-    /**
-     * the scope the variable will have  (local,parent or root)
-     *
-     * @var int
-     */
-    public $scope = Smarty::SCOPE_LOCAL;
-
-    /**
-     * create Smarty variable object
-     *
-     * @param mixed   $value   the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @param int     $scope   the scope the variable will have  (local,parent or root)
-     */
-    public function __construct($value = null, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
-    {
-        $this->value = $value;
-        $this->nocache = $nocache;
-        $this->scope = $scope;
-    }
-
-    /**
-     * <<magic>> String conversion
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->value;
-    }
-}
-
-/**
- * class for undefined variable object
- * This class defines an object for undefined variable handling
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Undefined_Smarty_Variable
-{
-    /**
-     * Returns FALSE for 'nocache' and NULL otherwise.
-     *
-     * @param  string $name
-     *
-     * @return bool
-     */
-    public function __get($name)
-    {
-        if ($name == 'nocache') {
-            return false;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Always returns an empty string.
-     *
-     * @return string
-     */
-    public function __toString()
+    public function __call($name, $args)
     {
-        return "";
+        return $this->ext->_callExternalMethod($this, $name, $args);
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_debug.php b/library/Smarty/libs/sysplugins/smarty_internal_debug.php
index e5175d51d..0cbd54955 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_debug.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_debug.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Smarty Internal Plugin Debug
- * Class to collect data for the Smarty Debugging Consol
+ * Class to collect data for the Smarty Debugging Console
  *
  * @package    Smarty
  * @subpackage Debug
@@ -21,165 +21,245 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
      *
      * @var array
      */
-    public static $template_data = array();
+    public $template_data = array();
 
     /**
      * List of uid's which shall be ignored
      *
      * @var array
      */
-    public static $ignore_uid = array();
+    public $ignore_uid = array();
 
     /**
-     * Ignore template
+     * Index of display() and fetch() calls
+     *
+     * @var int
+     */
+    public $index = 0;
+
+    /**
+     * Counter for window offset
+     *
+     * @var int
+     */
+    public $offset = 0;
+
+    /**
+     * Start logging template
      *
-     * @param object $template
+     * @param \Smarty_Internal_Template $template template
+     * @param null                      $mode     true: display   false: fetch  null: subtemplate
      */
-    public static function ignore($template)
+    public function start_template(Smarty_Internal_Template $template, $mode = null)
     {
-        // calculate Uid if not already done
-        if ($template->source->uid == '') {
-            $template->source->filepath;
+        if (isset($mode)) {
+            $this->index ++;
+            $this->offset ++;
+            $this->template_data[$this->index] = null;
         }
-        self::$ignore_uid[$template->source->uid] = true;
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['start_template_time'] = microtime(true);
+    }
+
+    /**
+     * End logging of cache time
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function end_template(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['total_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_template_time'];
+        //$this->template_data[$this->index][$key]['properties'] = $template->properties;
     }
 
     /**
      * Start logging of compile time
      *
-     * @param object $template
+     * @param \Smarty_Internal_Template $template
      */
-    public static function start_compile($template)
+    public function start_compile(Smarty_Internal_Template $template)
     {
         static $_is_stringy = array('string' => true, 'eval' => true);
         if (!empty($template->compiler->trace_uid)) {
             $key = $template->compiler->trace_uid;
-            if (!isset(self::$template_data[$key])) {
+            if (!isset($this->template_data[$this->index][$key])) {
                 if (isset($_is_stringy[$template->source->type])) {
-                    self::$template_data[$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\'';
+                    $this->template_data[$this->index][$key]['name'] =
+                        '\'' . substr($template->source->name, 0, 25) . '...\'';
                 } else {
-                    self::$template_data[$key]['name'] = $template->source->filepath;
+                    $this->template_data[$this->index][$key]['name'] = $template->source->filepath;
                 }
-                self::$template_data[$key]['compile_time'] = 0;
-                self::$template_data[$key]['render_time'] = 0;
-                self::$template_data[$key]['cache_time'] = 0;
+                $this->template_data[$this->index][$key]['compile_time'] = 0;
+                $this->template_data[$this->index][$key]['render_time'] = 0;
+                $this->template_data[$this->index][$key]['cache_time'] = 0;
             }
         } else {
-            if (isset(self::$ignore_uid[$template->source->uid])) {
+            if (isset($this->ignore_uid[$template->source->uid])) {
                 return;
             }
-            $key = self::get_key($template);
+            $key = $this->get_key($template);
         }
-        self::$template_data[$key]['start_time'] = microtime(true);
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
     }
 
     /**
      * End logging of compile time
      *
-     * @param object $template
+     * @param \Smarty_Internal_Template $template
      */
-    public static function end_compile($template)
+    public function end_compile(Smarty_Internal_Template $template)
     {
         if (!empty($template->compiler->trace_uid)) {
             $key = $template->compiler->trace_uid;
         } else {
-            if (isset(self::$ignore_uid[$template->source->uid])) {
+            if (isset($this->ignore_uid[$template->source->uid])) {
                 return;
             }
 
-            $key = self::get_key($template);
+            $key = $this->get_key($template);
         }
-        self::$template_data[$key]['compile_time'] += microtime(true) - self::$template_data[$key]['start_time'];
+        $this->template_data[$this->index][$key]['compile_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
     }
 
     /**
      * Start logging of render time
      *
-     * @param object $template
+     * @param \Smarty_Internal_Template $template
      */
-    public static function start_render($template)
+    public function start_render(Smarty_Internal_Template $template)
     {
-        $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
     }
 
     /**
      * End logging of compile time
      *
-     * @param object $template
+     * @param \Smarty_Internal_Template $template
      */
-    public static function end_render($template)
+    public function end_render(Smarty_Internal_Template $template)
     {
-        $key = self::get_key($template);
-        self::$template_data[$key]['render_time'] += microtime(true) - self::$template_data[$key]['start_time'];
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['render_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
     }
 
     /**
      * Start logging of cache time
      *
-     * @param object $template cached template
+     * @param \Smarty_Internal_Template $template cached template
      */
-    public static function start_cache($template)
+    public function start_cache(Smarty_Internal_Template $template)
     {
-        $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
     }
 
     /**
      * End logging of cache time
      *
-     * @param object $template cached template
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function end_cache(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[$this->index][$key]['cache_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
+    }
+
+    /**
+     * Register template object
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function register_template(Smarty_Internal_Template $template)
+    {
+    }
+
+    /**
+     * Register data object
+     *
+     * @param \Smarty_Data $data data object
      */
-    public static function end_cache($template)
+    public static function register_data(Smarty_Data $data)
     {
-        $key = self::get_key($template);
-        self::$template_data[$key]['cache_time'] += microtime(true) - self::$template_data[$key]['start_time'];
     }
 
     /**
-     * Opens a window for the Smarty Debugging Consol and display the data
+     * Opens a window for the Smarty Debugging Console and display the data
      *
      * @param Smarty_Internal_Template|Smarty $obj object to debug
+     * @param bool                            $full
      */
-    public static function display_debug($obj)
+    public function display_debug($obj, $full = false)
     {
-        // prepare information of assigned variables
-        $ptr = self::get_debug_vars($obj);
-        if ($obj instanceof Smarty) {
-            $smarty = clone $obj;
+        if (!$full) {
+            $this->offset ++;
+            $savedIndex = $this->index;
+            $this->index = 9999;
+        }
+        if ($obj->_objType == 1) {
+            $smarty = $obj;
         } else {
-            $smarty = clone $obj->smarty;
+            $smarty = $obj->smarty;
         }
+        // create fresh instance of smarty for displaying the debug console
+        // to avoid problems if the application did overload the Smarty class
+        $debObj = new Smarty();
+        // copy the working dirs from application
+        $debObj->setCompileDir($smarty->getCompileDir());
+        // init properties by hand as user may have edited the original Smarty class
+        $debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ . '/../plugins' : $smarty->getPluginsDir());
+        $debObj->force_compile = false;
+        $debObj->compile_check = true;
+        $debObj->left_delimiter = '{';
+        $debObj->right_delimiter = '}';
+        $debObj->security_policy = null;
+        $debObj->debugging = false;
+        $debObj->debugging_ctrl = 'NONE';
+        $debObj->error_reporting = E_ALL & ~E_NOTICE;
+        $debObj->debug_tpl = isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
+        $debObj->registered_plugins = array();
+        $debObj->registered_resources = array();
+        $debObj->registered_filters = array();
+        $debObj->autoload_filters = array();
+        $debObj->default_modifiers = array();
+        $debObj->escape_html = true;
+        $debObj->caching = false;
+        $debObj->compile_id = null;
+        $debObj->cache_id = null;
+        // prepare information of assigned variables
+        $ptr = $this->get_debug_vars($obj);
         $_assigned_vars = $ptr->tpl_vars;
         ksort($_assigned_vars);
         $_config_vars = $ptr->config_vars;
         ksort($_config_vars);
-        $smarty->registered_filters = array();
-        $smarty->autoload_filters = array();
-        $smarty->default_modifiers = array();
-        $smarty->force_compile = false;
-        $smarty->left_delimiter = '{';
-        $smarty->right_delimiter = '}';
-        $smarty->debugging = false;
-        $smarty->debugging_ctrl = 'NONE';
-        $smarty->force_compile = false;
-        $_template = new Smarty_Internal_Template($smarty->debug_tpl, $smarty);
-        $_template->caching = false;
-        $_template->disableSecurity();
-        $_template->cache_id = null;
-        $_template->compile_id = null;
-        if ($obj instanceof Smarty_Internal_Template) {
+        $debugging = $smarty->debugging;
+
+        $_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
+        if ($obj->_objType == 2) {
             $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
         }
-        if ($obj instanceof Smarty) {
-            $_template->assign('template_data', self::$template_data);
+        if ($obj->_objType == 1 || $full) {
+            $_template->assign('template_data', $this->template_data[$this->index]);
         } else {
             $_template->assign('template_data', null);
         }
         $_template->assign('assigned_vars', $_assigned_vars);
         $_template->assign('config_vars', $_config_vars);
         $_template->assign('execution_time', microtime(true) - $smarty->start_time);
+        $_template->assign('display_mode', $debugging == 2 || !$full);
+        $_template->assign('offset', $this->offset * 50);
         echo $_template->fetch();
+        if (isset($full)) {
+            $this->index --;
+        }
+        if (!$full) {
+            $this->index = $savedIndex;
+        }
     }
 
     /**
@@ -189,31 +269,79 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
      *
      * @return StdClass
      */
-    public static function get_debug_vars($obj)
+    public function get_debug_vars($obj)
     {
-        $config_vars = $obj->config_vars;
+        $config_vars = array();
+        foreach ($obj->config_vars as $key => $var) {
+            $config_vars[$key]['value'] = $var;
+            if ($obj->_objType == 2) {
+                $config_vars[$key]['scope'] = $obj->source->type . ':' . $obj->source->name;
+            } elseif ($obj->_objType == 4) {
+                $tpl_vars[$key]['scope'] = $obj->dataObjectName;
+            } else {
+                $config_vars[$key]['scope'] = 'Smarty object';
+            }
+        }
         $tpl_vars = array();
         foreach ($obj->tpl_vars as $key => $var) {
-            $tpl_vars[$key] = clone $var;
-            if ($obj instanceof Smarty_Internal_Template) {
-                $tpl_vars[$key]->scope = $obj->source->type . ':' . $obj->source->name;
-            } elseif ($obj instanceof Smarty_Data) {
-                $tpl_vars[$key]->scope = 'Data object';
+            foreach ($var as $varkey => $varvalue) {
+                if ($varkey == 'value') {
+                    $tpl_vars[$key][$varkey] = $varvalue;
+                } else {
+                    if ($varkey == 'nocache') {
+                        if ($varvalue == true) {
+                            $tpl_vars[$key][$varkey] = $varvalue;
+                        }
+                    } else {
+                        if ($varkey != 'scope' || $varvalue !== 0) {
+                            $tpl_vars[$key]['attributes'][$varkey] = $varvalue;
+                        }
+                    }
+                }
+            }
+            if ($obj->_objType == 2) {
+                $tpl_vars[$key]['scope'] = $obj->source->type . ':' . $obj->source->name;
+            } elseif ($obj->_objType == 4) {
+                $tpl_vars[$key]['scope'] = $obj->dataObjectName;
             } else {
-                $tpl_vars[$key]->scope = 'Smarty root';
+                $tpl_vars[$key]['scope'] = 'Smarty object';
             }
         }
 
         if (isset($obj->parent)) {
-            $parent = self::get_debug_vars($obj->parent);
+            $parent = $this->get_debug_vars($obj->parent);
+            foreach ($parent->tpl_vars as $name => $pvar) {
+                if (isset($tpl_vars[$name]) && $tpl_vars[$name]['value'] === $pvar['value']) {
+                    $tpl_vars[$name]['scope'] = $pvar['scope'];
+                }
+            }
             $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
+
+            foreach ($parent->config_vars as $name => $pvar) {
+                if (isset($config_vars[$name]) && $config_vars[$name]['value'] === $pvar['value']) {
+                    $config_vars[$name]['scope'] = $pvar['scope'];
+                }
+            }
             $config_vars = array_merge($parent->config_vars, $config_vars);
         } else {
-            foreach (Smarty::$global_tpl_vars as $name => $var) {
-                if (!array_key_exists($name, $tpl_vars)) {
-                    $clone = clone $var;
-                    $clone->scope = 'Global';
-                    $tpl_vars[$name] = $clone;
+            foreach (Smarty::$global_tpl_vars as $key => $var) {
+                if (!array_key_exists($key, $tpl_vars)) {
+                    foreach ($var as $varkey => $varvalue) {
+                        if ($varkey == 'value') {
+                            $tpl_vars[$key][$varkey] = $varvalue;
+                        } else {
+                            if ($varkey == 'nocache') {
+                                if ($varvalue == true) {
+                                    $tpl_vars[$key][$varkey] = $varvalue;
+                                }
+                            } else {
+                                if ($varkey != 'scope' || $varvalue !== 0) {
+                                    $tpl_vars[$key]['attributes'][$varkey] = $varvalue;
+                                }
+                            }
+                        }
+                    }
+                    $tpl_vars[$key]['scope'] = 'Global';
                 }
             }
         }
@@ -224,11 +352,11 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
     /**
      * Return key into $template_data for template
      *
-     * @param  object $template template object
+     * @param \Smarty_Internal_Template $template template object
      *
      * @return string key into $template_data
      */
-    private static function get_key($template)
+    private function get_key(Smarty_Internal_Template $template)
     {
         static $_is_stringy = array('string' => true, 'eval' => true);
         // calculate Uid if not already done
@@ -236,19 +364,67 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
             $template->source->filepath;
         }
         $key = $template->source->uid;
-        if (isset(self::$template_data[$key])) {
+        if (isset($this->template_data[$this->index][$key])) {
             return $key;
         } else {
             if (isset($_is_stringy[$template->source->type])) {
-                self::$template_data[$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\'';
+                $this->template_data[$this->index][$key]['name'] =
+                    '\'' . substr($template->source->name, 0, 25) . '...\'';
             } else {
-                self::$template_data[$key]['name'] = $template->source->filepath;
+                $this->template_data[$this->index][$key]['name'] = $template->source->filepath;
             }
-            self::$template_data[$key]['compile_time'] = 0;
-            self::$template_data[$key]['render_time'] = 0;
-            self::$template_data[$key]['cache_time'] = 0;
+            $this->template_data[$this->index][$key]['compile_time'] = 0;
+            $this->template_data[$this->index][$key]['render_time'] = 0;
+            $this->template_data[$this->index][$key]['cache_time'] = 0;
+            $this->template_data[$this->index][$key]['total_time'] = 0;
 
             return $key;
         }
     }
+
+    /**
+     * Ignore template
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function ignore(Smarty_Internal_Template $template)
+    {
+        // calculate Uid if not already done
+        if ($template->source->uid == '') {
+            $template->source->filepath;
+        }
+        $this->ignore_uid[$template->source->uid] = true;
+    }
+
+    /**
+     * handle 'URL' debugging mode
+     *
+     * @param Smarty $smarty
+     */
+    public function debugUrl(Smarty $smarty)
+    {
+        if (isset($_SERVER['QUERY_STRING'])) {
+            $_query_string = $_SERVER['QUERY_STRING'];
+        } else {
+            $_query_string = '';
+        }
+        if (false !== strpos($_query_string, $smarty->smarty_debug_id)) {
+            if (false !== strpos($_query_string, $smarty->smarty_debug_id . '=on')) {
+                // enable debugging for this browser session
+                setcookie('SMARTY_DEBUG', true);
+                $smarty->debugging = true;
+            } elseif (false !== strpos($_query_string, $smarty->smarty_debug_id . '=off')) {
+                // disable debugging for this browser session
+                setcookie('SMARTY_DEBUG', false);
+                $smarty->debugging = false;
+            } else {
+                // enable debugging for this page
+                $smarty->debugging = true;
+            }
+        } else {
+            if (isset($_COOKIE['SMARTY_DEBUG'])) {
+                $smarty->debugging = true;
+            }
+        }
+    }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_extension_clear.php b/library/Smarty/libs/sysplugins/smarty_internal_extension_clear.php
new file mode 100644
index 000000000..c595214d8
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_extension_clear.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * Smarty Extension Clear
+ *
+ * $smarty->clear() method file cache file resource
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Extension_Clear
+{
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public static function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
+        $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
+        $_dir = $smarty->getCacheDir();
+        if ($_dir == '/') { //We should never want to delete this!
+            return 0;
+        }
+        $_dir_length = strlen($_dir);
+        if (isset($_cache_id)) {
+            $_cache_id_parts = explode('|', $_cache_id);
+            $_cache_id_parts_count = count($_cache_id_parts);
+            if ($smarty->use_sub_dirs) {
+                foreach ($_cache_id_parts as $id_part) {
+                    $_dir .= $id_part . DS;
+                }
+            }
+        }
+        if (isset($resource_name)) {
+            $_save_stat = $smarty->caching;
+            $smarty->caching = true;
+            $tpl = new $smarty->template_class($resource_name, $smarty);
+            $smarty->caching = $_save_stat;
+
+            // remove from template cache
+            $tpl->source; // have the template registered before unset()
+
+            if ($tpl->source->exists) {
+                $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
+            } else {
+                return 0;
+            }
+        }
+        $_count = 0;
+        $_time = time();
+        if (file_exists($_dir)) {
+            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
+            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
+            foreach ($_cache as $_file) {
+                if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+                    continue;
+                }
+                // directory ?
+                if ($_file->isDir()) {
+                    if (!$_cache->isDot()) {
+                        // delete folder if empty
+                        @rmdir($_file->getPathname());
+                    }
+                } else {
+                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string) $_file, $_dir_length)));
+                    $_parts_count = count($_parts);
+                    // check name
+                    if (isset($resource_name)) {
+                        if ($_parts[$_parts_count - 1] != $_resourcename_parts) {
+                            continue;
+                        }
+                    }
+                    // check compile id
+                    if (isset($_compile_id) && (!isset($_parts[$_parts_count - 2 - $_compile_id_offset]) ||
+                            $_parts[$_parts_count - 2 - $_compile_id_offset] != $_compile_id)
+                    ) {
+                        continue;
+                    }
+                    // check cache id
+                    if (isset($_cache_id)) {
+                        // count of cache id parts
+                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset :
+                            $_parts_count - 1 - $_compile_id_offset;
+                        if ($_parts_count < $_cache_id_parts_count) {
+                            continue;
+                        }
+                        for ($i = 0; $i < $_cache_id_parts_count; $i ++) {
+                            if ($_parts[$i] != $_cache_id_parts[$i]) {
+                                continue 2;
+                            }
+                        }
+                    }
+                    // expired ?
+                    if (isset($exp_time)) {
+                        if ($exp_time < 0) {
+                            preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_file), $match);
+                            if ($_time < (@filemtime($_file) + $match[1])) {
+                                continue;
+                            }
+                        } else {
+                            if ($_time - @filemtime($_file) < $exp_time) {
+                                continue;
+                            }
+                        }
+                    }
+                    // remove from template cache
+                    if (isset($smarty->_cache['template_objects'])) {
+                        foreach ($smarty->_cache['template_objects'] as $key => $tpl) {
+                            if (isset($tpl->cached) && $tpl->cached->filepath == (string) $_file) {
+                                unset($smarty->_cache['template_objects'][$key]);
+                            }
+                        }
+                    }
+                    $_count += @unlink((string) $_file) ? 1 : 0;
+                    if (function_exists('opcache_invalidate')) {
+                        opcache_invalidate((string) $_file);
+                    }
+                }
+            }
+        }
+        return $_count;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_extension_handler.php b/library/Smarty/libs/sysplugins/smarty_internal_extension_handler.php
new file mode 100644
index 000000000..68012d86f
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_extension_handler.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * Smarty Extension handler
+ *
+ * Load extensions dynamically
+ *
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ * @property Smarty_Internal_Runtime_Inheritance      $_inheritance
+ * @property Smarty_Internal_Runtime_SubTemplate      $_subTemplate
+ * @property Smarty_Internal_Runtime_TplFunction      $_tplFunction
+ * @property Smarty_Internal_Runtime_Var              $_var
+ * @property Smarty_Internal_Runtime_Config           $_config
+ * @property Smarty_Internal_Runtime_Foreach          $_foreach
+ * @property Smarty_Internal_Runtime_Hhvm             $_hhvm
+ * @property Smarty_Internal_Runtime_WriteFile        $_writeFile
+ * @property Smarty_Internal_Runtime_ValidateCompiled $_validateCompiled
+ * @property Smarty_Internal_Runtime_CodeFrame        $_codeFrame
+ * @property Smarty_Internal_Runtime_FilterHandler    $_filterHandler
+ * @property Smarty_Internal_Runtime_GetIncludePath   $_getIncludePath
+ * @property Smarty_Internal_Runtime_UpdateScope      $_updateScope
+ * @property Smarty_Internal_Runtime_IsCached         $_isCached
+ * @property Smarty_Internal_Runtime_CacheModify      $_cacheModify
+ * @property Smarty_Internal_Runtime_UpdateCache      $_updateCache
+ * @property Smarty_Internal_Method_GetTemplateVars   $getTemplateVars
+ * @property Smarty_Internal_Method_Append            $append
+ * @property Smarty_Internal_Method_AppendByRef       $appendByRef
+ * @property Smarty_Internal_Method_AssignGlobal      $assignGlobal
+ * @property Smarty_Internal_Method_AssignByRef       $assignByRef
+ * @property Smarty_Internal_Method_LoadFilter        $loadFilter
+ * @property Smarty_Internal_Method_LoadPlugin        $loadPlugin
+ * @property Smarty_Internal_Method_RegisterFilter    $registerFilter
+ * @property Smarty_Internal_Method_RegisterObject    $registerObject
+ * @property Smarty_Internal_Method_RegisterPlugin    $registerPlugin
+ */
+class Smarty_Internal_Extension_Handler
+{
+
+    public $objType = null;
+
+    /**
+     * Cache for property information from generic getter/setter
+     * Preloaded with names which should not use with generic getter/setter
+     *
+     * @var array
+     */
+    private $_property_info = array('AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0,
+                                    'DebugTemplate'   => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0,
+                                    'TemplateVars'    => 0,);#
+
+    private $resolvedProperties = array();
+
+    /**
+     * Call external Method
+     *
+     * @param \Smarty_Internal_Data $data
+     * @param string                $name external method names
+     * @param array                 $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
+     */
+    public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
+    {
+        /* @var Smarty $data ->smarty */
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if (!isset($smarty->ext->$name)) {
+            $class = 'Smarty_Internal_Method_' . ucfirst($name);
+            if (preg_match('/^(set|get)([A-Z].*)$/', $name, $match)) {
+                if (!isset($this->_property_info[$prop = $match[2]])) {
+                    // convert camel case to underscored name
+                    $this->resolvedProperties[$prop] = $pn = strtolower(join('_',
+                                                                             preg_split('/([A-Z][^A-Z]*)/', $prop, - 1,
+                                                                                        PREG_SPLIT_NO_EMPTY |
+                                                                                        PREG_SPLIT_DELIM_CAPTURE)));
+                    $this->_property_info[$prop] = property_exists($data, $pn) ? 1 :
+                        ($data->_objType == 2 && property_exists($smarty, $pn) ? 2 : 0);
+                }
+                if ($this->_property_info[$prop]) {
+                    $pn = $this->resolvedProperties[$prop];
+                    if ($match[1] == 'get') {
+                        return $this->_property_info[$prop] == 1 ? $data->$pn : $data->smarty->$pn;
+                    } else {
+                        return $this->_property_info[$prop] == 1 ? $data->$pn = $args[0] :
+                            $data->smarty->$pn = $args[0];
+                    }
+                } elseif (!class_exists($class)) {
+                    throw new SmartyException("property '$pn' does not exist.");
+                }
+            }
+            if (class_exists($class)) {
+                $callback = array($smarty->ext->$name = new $class(), $name);
+            }
+        } else {
+            $callback = array($smarty->ext->$name, $name);
+        }
+        array_unshift($args, $data);
+        if (isset($callback) && $callback[0]->objMap | $data->_objType) {
+            return call_user_func_array($callback, $args);
+        }
+        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args);
+    }
+
+    /**
+     * set extension property
+     *
+     * @param string $property_name property name
+     * @param mixed  $value         value
+     *
+     * @throws SmartyException
+     */
+    public function __set($property_name, $value)
+    {
+        $this->$property_name = $value;
+    }
+
+    /**
+     * get extension object
+     *
+     * @param string $property_name property name
+     *
+     * @return mixed|Smarty_Template_Cached
+     * @throws SmartyException
+     */
+    public function __get($property_name)
+    {
+        // object properties of runtime template extensions will start with '_'
+        if ($property_name[0] == '_') {
+            $class = 'Smarty_Internal_Runtime_' . ucfirst(substr($property_name, 1));
+        } else {
+            $class = 'Smarty_Internal_Method_' . ucfirst($property_name);
+        }
+        if (class_exists($class)) {
+            return $this->$property_name = new $class();
+        }
+        return $this;
+    }
+
+    /**
+     * Call error handler for undefined method
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
+     */
+    public function __call($name, $args)
+    {
+        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args);
+    }
+
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_function_call_handler.php b/library/Smarty/libs/sysplugins/smarty_internal_function_call_handler.php
deleted file mode 100644
index a81ff728b..000000000
--- a/library/Smarty/libs/sysplugins/smarty_internal_function_call_handler.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Function Call Handler
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-
-/**
- * This class does call function defined with the {function} tag
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Function_Call_Handler
-{
-    /**
-     * This function handles calls to template functions defined by {function}
-     * It does create a PHP function at the first call
-     *
-     * @param string                   $_name     template function name
-     * @param Smarty_Internal_Template $_template template object
-     * @param array                    $_params   Smarty variables passed as call parameter
-     * @param string                   $_hash     nocache hash value
-     * @param bool                     $_nocache  nocache flag
-     */
-    public static function call($_name, Smarty_Internal_Template $_template, $_params, $_hash, $_nocache)
-    {
-        if ($_nocache) {
-            $_function = "smarty_template_function_{$_name}_nocache";
-        } else {
-            $_function = "smarty_template_function_{$_hash}_{$_name}";
-        }
-        if (!is_callable($_function)) {
-            $_code = "function {$_function}(\$_smarty_tpl,\$params) {
-    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
-    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
-            if ($_nocache) {
-                $_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!",
-                                             "!\\\'!"), array('', "'"), $_template->smarty->template_functions[$_name]['compiled']);
-                $_template->smarty->template_functions[$_name]['called_nocache'] = true;
-            } else {
-                $_code .= preg_replace("/{$_template->smarty->template_functions[$_name]['nocache_hash']}/", $_template->properties['nocache_hash'], $_template->smarty->template_functions[$_name]['compiled']);
-            }
-            $_code .= "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}";
-            eval($_code);
-        }
-        $_function($_template, $_params);
-    }
-}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_get_include_path.php b/library/Smarty/libs/sysplugins/smarty_internal_get_include_path.php
deleted file mode 100644
index d46ca7029..000000000
--- a/library/Smarty/libs/sysplugins/smarty_internal_get_include_path.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Smarty read include path plugin
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Monte Ohrt
- */
-
-/**
- * Smarty Internal Read Include Path Class
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Get_Include_Path
-{
-    /**
-     * Return full file path from PHP include_path
-     *
-     * @param  string $filepath filepath
-     *
-     * @return string|boolean full filepath or false
-     */
-    public static function getIncludePath($filepath)
-    {
-        static $_include_path = null;
-
-        if (function_exists('stream_resolve_include_path')) {
-            // available since PHP 5.3.2
-            return stream_resolve_include_path($filepath);
-        }
-
-        if ($_include_path === null) {
-            $_include_path = explode(PATH_SEPARATOR, get_include_path());
-        }
-
-        foreach ($_include_path as $_path) {
-            if (file_exists($_path . DS . $filepath)) {
-                return $_path . DS . $filepath;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php b/library/Smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php
new file mode 100644
index 000000000..b739f0e3e
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Smarty Method AddAutoloadFilters
+ *
+ * Smarty::addAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AddAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
+{
+
+    /**
+     * Add autoload filters
+     *
+     * @api Smarty::setAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  array                                                          $filters filters to load automatically
+     * @param  string                                                         $type    "pre", "output", … specify the
+     *                                                                                 filter type to set. Defaults to
+     *                                                                                 none treating $filters' keys as
+     *                                                                                 the appropriate types
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function addAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            if (!empty($smarty->autoload_filters[$type])) {
+                $smarty->autoload_filters[$type] = array_merge($smarty->autoload_filters[$type], (array) $filters);
+            } else {
+                $smarty->autoload_filters[$type] = (array) $filters;
+            }
+        } else {
+            foreach ((array) $filters as $type => $value) {
+                $this->_checkFilterType($type);
+                if (!empty($smarty->autoload_filters[$type])) {
+                    $smarty->autoload_filters[$type] = array_merge($smarty->autoload_filters[$type], (array) $value);
+                } else {
+                    $smarty->autoload_filters[$type] = (array) $value;
+                }
+            }
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php b/library/Smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php
new file mode 100644
index 000000000..55d2c9e71
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method AddDefaultModifiers
+ *
+ * Smarty::addDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AddDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Add default modifiers
+     *
+     * @api Smarty::addDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  array|string                                                   $modifiers modifier or list of modifiers
+     *                                                                                   to add
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function addDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (is_array($modifiers)) {
+            $this->default_modifiers = array_merge($smarty->default_modifiers, $modifiers);
+        } else {
+            $smarty->default_modifiers[] = $modifiers;
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_append.php b/library/Smarty/libs/sysplugins/smarty_internal_method_append.php
new file mode 100644
index 000000000..43df8803f
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_append.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Smarty Method Append
+ *
+ * Smarty::append() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_Append
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * appends values to template variables
+     *
+     * @api  Smarty::append()
+     * @link http://www.smarty.net/docs/en/api.append.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  array|string                                           $tpl_var the template variable name(s)
+     * @param  mixed                                                  $value   the value to append
+     * @param  bool                                                   $merge   flag if array elements shall be merged
+     * @param  bool                                                   $nocache if true any output of this variable will
+     *                                                                         be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function append(Smarty_Internal_Data $data, $tpl_var, $value = null, $merge = false, $nocache = false)
+    {
+        if (is_array($tpl_var)) {
+            // $tpl_var is an array, ignore $value
+            foreach ($tpl_var as $_key => $_val) {
+                if ($_key != '') {
+                    $this->append($data, $_key, $_val, $merge, $nocache);
+                }
+            }
+        } else {
+            if ($tpl_var != '' && isset($value)) {
+                if (!isset($data->tpl_vars[$tpl_var])) {
+                    $tpl_var_inst = $data->ext->getTemplateVars->_getVariable($data, $tpl_var, null, true, false);
+                    if ($tpl_var_inst instanceof Smarty_Undefined_Variable) {
+                        $data->tpl_vars[$tpl_var] = new Smarty_Variable(null, $nocache);
+                    } else {
+                        $data->tpl_vars[$tpl_var] = clone $tpl_var_inst;
+                    }
+                }
+                if (!(is_array($data->tpl_vars[$tpl_var]->value) ||
+                    $data->tpl_vars[$tpl_var]->value instanceof ArrayAccess)
+                ) {
+                    settype($data->tpl_vars[$tpl_var]->value, 'array');
+                }
+                if ($merge && is_array($value)) {
+                    foreach ($value as $_mkey => $_mval) {
+                        $data->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
+                    }
+                } else {
+                    $data->tpl_vars[$tpl_var]->value[] = $value;
+                }
+            }
+            if ($data->_objType == 2 && $data->scope) {
+                $data->ext->_updateScope->updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_appendbyref.php b/library/Smarty/libs/sysplugins/smarty_internal_method_appendbyref.php
new file mode 100644
index 000000000..124bb803a
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_appendbyref.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Method AppendByRef
+ *
+ * Smarty::appendByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AppendByRef
+{
+
+    /**
+     * appends values to template variables by reference
+     *
+     * @api  Smarty::appendByRef()
+     * @link http://www.smarty.net/docs/en/api.append.by.ref.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $tpl_var the template variable name
+     * @param  mixed                                                  &$value  the referenced value to append
+     * @param  bool                                                   $merge   flag if array elements shall be merged
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public static function appendByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $merge = false)
+    {
+        if ($tpl_var != '' && isset($value)) {
+            if (!isset($data->tpl_vars[$tpl_var])) {
+                $data->tpl_vars[$tpl_var] = new Smarty_Variable();
+            }
+            if (!is_array($data->tpl_vars[$tpl_var]->value)) {
+                settype($data->tpl_vars[$tpl_var]->value, 'array');
+            }
+            if ($merge && is_array($value)) {
+                foreach ($value as $_key => $_val) {
+                    $data->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key];
+                }
+            } else {
+                $data->tpl_vars[$tpl_var]->value[] = &$value;
+            }
+            if ($data->_objType == 2 && $data->scope) {
+                $data->ext->_updateScope->updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_assignbyref.php b/library/Smarty/libs/sysplugins/smarty_internal_method_assignbyref.php
new file mode 100644
index 000000000..a97125e30
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_assignbyref.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Smarty Method AssignByRef
+ *
+ * Smarty::assignByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AssignByRef
+{
+
+    /**
+     * assigns values to template variables by reference
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $tpl_var the template variable name
+     * @param                                                         $value
+     * @param  boolean                                                $nocache if true any output of this variable will be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $nocache)
+    {
+        if ($tpl_var != '') {
+            $data->tpl_vars[$tpl_var] = new Smarty_Variable(null, $nocache);
+            $data->tpl_vars[$tpl_var]->value = &$value;
+            if ($data->_objType == 2 && $data->scope) {
+                $data->ext->_updateScope->updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_assignglobal.php b/library/Smarty/libs/sysplugins/smarty_internal_method_assignglobal.php
new file mode 100644
index 000000000..23b13b3a2
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_assignglobal.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method AssignGlobal
+ *
+ * Smarty::assignGlobal() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AssignGlobal
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+     /**
+     * assigns a global Smarty variable
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string  $varName the global variable name
+     * @param  mixed   $value   the value to assign
+     * @param  boolean $nocache if true any output of this variable will be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignGlobal(Smarty_Internal_Data $data, $varName, $value = null, $nocache = false)
+    {
+        if ($varName != '') {
+            Smarty::$global_tpl_vars[$varName] = new Smarty_Variable($value, $nocache);
+            $ptr = $data;
+            while ($ptr->_objType == 2) {
+                $ptr->tpl_vars[$varName] = clone Smarty::$global_tpl_vars[$varName];
+                $ptr = $ptr->parent;
+            }
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_clearallassign.php b/library/Smarty/libs/sysplugins/smarty_internal_method_clearallassign.php
new file mode 100644
index 000000000..1e5fec4bd
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_clearallassign.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Smarty Method ClearAllAssign
+ *
+ * Smarty::clearAllAssign() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAllAssign
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear all the assigned template variables.
+     *
+     * @api  Smarty::clearAllAssign()
+     * @link http://www.smarty.net/docs/en/api.clear.all.assign.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearAllAssign(Smarty_Internal_Data $data)
+    {
+        $data->tpl_vars = array();
+
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_clearallcache.php b/library/Smarty/libs/sysplugins/smarty_internal_method_clearallcache.php
new file mode 100644
index 000000000..1fe37892e
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_clearallcache.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method ClearAllCache
+ *
+ * Smarty::clearAllCache() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAllCache
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Empty cache folder
+     *
+     * @api  Smarty::clearAllCache()
+     * @link http://www.smarty.net/docs/en/api.clear.all.cache.tpl
+     *
+     * @param \Smarty  $smarty
+     * @param  integer $exp_time expiration time
+     * @param  string  $type     resource type
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clearAllCache(Smarty $smarty, $exp_time = null, $type = null)
+    {
+        // load cache resource and call clearAll
+        $_cache_resource = Smarty_CacheResource::load($smarty, $type);
+        if ($smarty->caching_type != 'file') {
+            $_cache_resource->invalidLoadedCache($smarty);
+        }
+
+        return $_cache_resource->clearAll($smarty, $exp_time);
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_clearassign.php b/library/Smarty/libs/sysplugins/smarty_internal_method_clearassign.php
new file mode 100644
index 000000000..3a7bd1e47
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_clearassign.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method ClearAssign
+ *
+ * Smarty::clearAssign() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAssign
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear the given assigned template variable(s).
+     *
+     * @api  Smarty::clearAssign()
+     * @link http://www.smarty.net/docs/en/api.clear.assign.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string|array                                           $tpl_var the template variable(s) to clear
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearAssign(Smarty_Internal_Data $data, $tpl_var)
+    {
+        if (is_array($tpl_var)) {
+            foreach ($tpl_var as $curr_var) {
+                unset($data->tpl_vars[$curr_var]);
+            }
+        } else {
+            unset($data->tpl_vars[$tpl_var]);
+        }
+
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_clearcache.php b/library/Smarty/libs/sysplugins/smarty_internal_method_clearcache.php
new file mode 100644
index 000000000..a923b3ae1
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_clearcache.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Smarty Method ClearCache
+ *
+ * Smarty::clearCache() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearCache
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @api  Smarty::clearCache()
+     * @link http://www.smarty.net/docs/en/api.clear.cache.tpl
+     *
+     * @param \Smarty  $smarty
+     * @param  string  $template_name template name
+     * @param  string  $cache_id      cache id
+     * @param  string  $compile_id    compile id
+     * @param  integer $exp_time      expiration time
+     * @param  string  $type          resource type
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clearCache(Smarty $smarty, $template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
+    {
+        // load cache resource and call clear
+        $_cache_resource = Smarty_CacheResource::load($smarty, $type);
+        if ($smarty->caching_type != 'file' && !isset($template_name)) {
+            $_cache_resource->invalidLoadedCache($smarty);
+        }
+
+        return $_cache_resource->clear($smarty, $template_name, $cache_id, $compile_id, $exp_time);
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php b/library/Smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
new file mode 100644
index 000000000..ae1003238
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * Smarty Method ClearCompiledTemplate
+ *
+ * Smarty::clearCompiledTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearCompiledTemplate
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Delete compiled template file
+     *
+     * @api  Smarty::clearCompiledTemplate()
+     * @link http://www.smarty.net/docs/en/api.clear.compiled.template.tpl
+     *
+     * @param \Smarty  $smarty
+     * @param  string  $resource_name template name
+     * @param  string  $compile_id    compile id
+     * @param  integer $exp_time      expiration time
+     *
+     * @return integer number of template files deleted
+     */
+    public function clearCompiledTemplate(Smarty $smarty, $resource_name = null, $compile_id = null, $exp_time = null)
+    {
+
+        $_compile_dir = $smarty->getCompileDir();
+        if ($_compile_dir == '/') { //We should never want to delete this!
+            return 0;
+        }
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+        $_dir_sep = $smarty->use_sub_dirs ? DS : '^';
+        if (isset($resource_name)) {
+            $_save_stat = $smarty->caching;
+            $smarty->caching = false;
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $smarty->template_class($resource_name, $smarty);
+            $smarty->caching = $_save_stat;
+            if ($tpl->source->exists) {
+                // remove from compileds cache
+                $tpl->source->compileds = array();
+                $_resource_part_1 = basename(str_replace('^', DS, $tpl->compiled->filepath));
+                $_resource_part_1_length = strlen($_resource_part_1);
+            } else {
+                return 0;
+            }
+            $_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
+            $_resource_part_2_length = strlen($_resource_part_2);
+        }
+        $_dir = $_compile_dir;
+        if ($smarty->use_sub_dirs && isset($_compile_id)) {
+            $_dir .= $_compile_id . $_dir_sep;
+        }
+        if (isset($_compile_id)) {
+            $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
+            $_compile_id_part_length = strlen($_compile_id_part);
+        }
+        $_count = 0;
+        try {
+            $_compileDirs = new RecursiveDirectoryIterator($_dir);
+            // NOTE: UnexpectedValueException thrown for PHP >= 5.3
+        }
+        catch (Exception $e) {
+            return 0;
+        }
+        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
+        foreach ($_compile as $_file) {
+            if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+                continue;
+            }
+
+            $_filepath = (string) $_file;
+
+            if ($_file->isDir()) {
+                if (!$_compile->isDot()) {
+                    // delete folder if empty
+                    @rmdir($_file->getPathname());
+                }
+            } else {
+                $unlink = false;
+                if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) &&
+                            $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length))) &&
+                    (!isset($resource_name) || (isset($_filepath[$_resource_part_1_length]) &&
+                            substr_compare($_filepath, $_resource_part_1, - $_resource_part_1_length,
+                                           $_resource_part_1_length) == 0) ||
+                        (isset($_filepath[$_resource_part_2_length]) &&
+                            substr_compare($_filepath, $_resource_part_2, - $_resource_part_2_length,
+                                           $_resource_part_2_length) == 0))
+                ) {
+                    if (isset($exp_time)) {
+                        if (time() - @filemtime($_filepath) >= $exp_time) {
+                            $unlink = true;
+                        }
+                    } else {
+                        $unlink = true;
+                    }
+                }
+
+                if ($unlink && @unlink($_filepath)) {
+                    if (isset($smarty->_cache['template_objects'])) {
+                        foreach ($smarty->_cache['template_objects'] as $key => $tpl) {
+                            if (isset($tpl->compiled) && $tpl->compiled->filepath == $_filepath) {
+                                unset($smarty->_cache['template_objects'][$key]);
+                            }
+                        }
+                    }
+                    $_count ++;
+                    if (function_exists('opcache_invalidate')) {
+                        opcache_invalidate($_filepath);
+                    }
+                }
+            }
+        }
+        // clear compiled cache
+        if (!isset($resource_name) && isset($smarty->_cache['source_objects'])) {
+            foreach ($smarty->_cache['source_objects'] as $source) {
+                $source->compileds = array();
+            }
+        }
+        return $_count;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_clearconfig.php b/library/Smarty/libs/sysplugins/smarty_internal_method_clearconfig.php
new file mode 100644
index 000000000..9c6167f4d
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_clearconfig.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method ClearConfig
+ *
+ * Smarty::clearConfig() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearConfig
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear a single or all config variables
+     *
+     * @api  Smarty::clearConfig()
+     * @link http://www.smarty.net/docs/en/api.clear.config.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string|null                                            $name variable name or null
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearConfig(Smarty_Internal_Data $data, $name = null)
+    {
+        if (isset($name)) {
+            unset($data->config_vars[$name]);
+        } else {
+            $data->config_vars = array();
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php b/library/Smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php
new file mode 100644
index 000000000..4d6be65c4
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Smarty Method CompileAllConfig
+ *
+ * Smarty::compileAllConfig() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CompileAllConfig extends Smarty_Internal_Method_CompileAllTemplates
+{
+
+    /**
+     * Compile all config files
+     *
+     * @api  Smarty::compileAllConfig()
+     *
+     * @param \Smarty $smarty
+     * @param  string $extension     file extension
+     * @param  bool   $force_compile force all to recompile
+     * @param  int    $time_limit
+     * @param  int    $max_errors
+     *
+     * @return integer number of template files recompiled
+     */
+    public function compileAllConfig(Smarty $smarty, $extension = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
+    {
+        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors, true);
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php b/library/Smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php
new file mode 100644
index 000000000..685fc0c0d
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Smarty Method CompileAllTemplates
+ *
+ * Smarty::compileAllTemplates() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CompileAllTemplates
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Compile all template files
+     *
+     * @api  Smarty::compileAllTemplates()
+     *
+     * @param \Smarty $smarty
+     * @param  string $extension     file extension
+     * @param  bool   $force_compile force all to recompile
+     * @param  int    $time_limit
+     * @param  int    $max_errors
+     *
+     * @return integer number of template files recompiled
+     */
+    public function compileAllTemplates(Smarty $smarty, $extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
+    {
+        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors);
+    }
+
+    /**
+     * Compile all template or config files
+     *
+     * @param \Smarty $smarty
+     * @param  string $extension     template file name extension
+     * @param  bool   $force_compile force all to recompile
+     * @param  int    $time_limit    set maximum execution time
+     * @param  int    $max_errors    set maximum allowed errors
+     * @param bool    $isConfig      flag true if called for config files
+     *
+     * @return int number of template files compiled
+     */
+    protected function compileAll(Smarty $smarty, $extension, $force_compile, $time_limit, $max_errors, $isConfig = false)
+    {
+        // switch off time limit
+        if (function_exists('set_time_limit')) {
+            @set_time_limit($time_limit);
+        }
+        $_count = 0;
+        $_error_count = 0;
+        $sourceDir = $isConfig ? $smarty->getConfigDir() : $smarty->getTemplateDir();
+        // loop over array of source directories
+        foreach ($sourceDir as $_dir) {
+            $_dir_1 = new RecursiveDirectoryIterator($_dir);
+            $_dir_2 = new RecursiveIteratorIterator($_dir_1);
+            foreach ($_dir_2 as $_fileinfo) {
+                $_file = $_fileinfo->getFilename();
+                if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
+                    continue;
+                }
+                if (!substr_compare($_file, $extension, - strlen($extension)) == 0) {
+                    continue;
+                }
+                if ($_fileinfo->getPath() == !substr($_dir, 0, - 1)) {
+                    $_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
+                }
+                echo "\n<br>", $_dir, '---', $_file;
+                flush();
+                $_start_time = microtime(true);
+                $_smarty = clone $smarty;
+                $_smarty->force_compile = $force_compile;
+                try {
+                    /* @var Smarty_Internal_Template $_tpl */
+                    $_tpl = new $smarty->template_class($_file, $_smarty);
+                    $_tpl->caching = Smarty::CACHING_OFF;
+                    $_tpl->source = $isConfig ? Smarty_Template_Config::load($_tpl) : Smarty_Template_Source::load($_tpl);
+                    if ($_tpl->mustCompile()) {
+                        $_tpl->compileTemplateSource();
+                        $_count ++;
+                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
+                        flush();
+                    } else {
+                        echo ' is up to date';
+                        flush();
+                    }
+                }
+                catch (Exception $e) {
+                    echo "\n<br>        ------>Error: ", $e->getMessage(), "<br><br>\n";
+                    $_error_count ++;
+                }
+                // free memory
+                unset($_tpl);
+                $_smarty->_cache['template_objects'] = array();
+                if ($max_errors !== null && $_error_count == $max_errors) {
+                    echo "\n<br><br>too many errors\n";
+                    exit();
+                }
+            }
+        }
+        echo "\n<br>";
+        return $_count;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_configload.php b/library/Smarty/libs/sysplugins/smarty_internal_method_configload.php
new file mode 100644
index 000000000..ec023ec8f
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_configload.php
@@ -0,0 +1,182 @@
+<?php
+
+/**
+ * Smarty Method ConfigLoad
+ *
+ * Smarty::configLoad() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ConfigLoad
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * load a config file, optionally load just selected sections
+     *
+     * @api  Smarty::configLoad()
+     * @link http://www.smarty.net/docs/en/api.config.load.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $config_file filename
+     * @param  mixed                                                  $sections    array of section names, single
+     *                                                                             section or null
+     *
+     * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function configLoad(Smarty_Internal_Data $data, $config_file, $sections = null)
+    {
+        $this->_loadConfigFile($data, $config_file, $sections, 0);
+        return $data;
+    }
+
+    /**
+     * load a config file, optionally load just selected sections
+     *
+     * @api  Smarty::configLoad()
+     * @link http://www.smarty.net/docs/en/api.config.load.tpl
+     *
+     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
+     * @param  string                                                 $config_file filename
+     * @param  mixed                                                  $sections    array of section names, single
+     *                                                                             section or null
+     * @param int                                                     $scope       scope into which config variables
+     *                                                                             shall be loaded
+     *
+     * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function _loadConfigFile(Smarty_Internal_Data $data, $config_file, $sections = null, $scope = 0)
+    {
+        /* @var \Smarty $smarty */
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        /* @var \Smarty_Internal_Template $confObj */
+        $confObj = new Smarty_Internal_Template($config_file, $smarty, $data);
+        $confObj->caching = Smarty::CACHING_OFF;
+        $confObj->source = Smarty_Template_Config::load($confObj);
+        $confObj->source->config_sections = $sections;
+        $confObj->source->scope = $scope;
+        $confObj->compiled = Smarty_Template_Compiled::load($confObj);
+        $confObj->compiled->render($confObj);
+        if ($data->_objType == 2) {
+            $data->compiled->file_dependency[$confObj->source->uid] =
+                array($confObj->source->filepath, $confObj->source->getTimeStamp(), $confObj->source->type);
+        }
+    }
+
+    /**
+     * load config variables into template object
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param  array                    $_config_vars
+     *
+     */
+    public function _loadConfigVars(Smarty_Internal_Template $tpl, $_config_vars)
+    {
+        $this->_assignConfigVars($tpl->parent, $tpl, $_config_vars);
+        $scope = $tpl->source->scope;
+        if (!$scope && !$tpl->scope) {
+            return;
+        }
+        foreach (array($scope, $tpl->scope) as $s) {
+            $s = ($bubble_up = $s >= Smarty::SCOPE_BUBBLE_UP) ? $s - Smarty::SCOPE_BUBBLE_UP : $s;
+            if ($bubble_up && $s) {
+                $ptr = $tpl->parent->parent;
+                if (isset($ptr)) {
+                    $this->_assignConfigVars($ptr, $tpl, $_config_vars);
+                    $ptr = $ptr->parent;
+                }
+                if ($s == Smarty::SCOPE_PARENT) {
+                    continue;
+                }
+                while (isset($ptr) && $ptr->_objType == 2) {
+                    $this->_assignConfigVars($ptr, $tpl, $_config_vars);
+                    $ptr = $ptr->parent;
+                }
+                if ($s == Smarty::SCOPE_TPL_ROOT) {
+                    continue;
+                } elseif ($s == Smarty::SCOPE_SMARTY) {
+                    $this->_assignConfigVars($tpl->smarty, $tpl, $_config_vars);
+                } elseif ($s == Smarty::SCOPE_GLOBAL) {
+                    $this->_assignConfigVars($tpl->smarty, $tpl, $_config_vars);
+                } elseif ($s == Smarty::SCOPE_ROOT) {
+                    while (isset($ptr->parent)) {
+                        $ptr = $ptr->parent;
+                    }
+                    $this->_assignConfigVars($ptr, $tpl, $_config_vars);
+                }
+            }
+        }
+    }
+
+    /**
+     * Assign all config variables in given scope
+     *
+     * @param \Smarty_Internal_Data     $scope_ptr
+     * @param \Smarty_Internal_Template $tpl
+     * @param  array                    $_config_vars
+     */
+    public function _assignConfigVars(Smarty_Internal_Data $scope_ptr, Smarty_Internal_Template $tpl, $_config_vars)
+    {
+        // copy global config vars
+        foreach ($_config_vars['vars'] as $variable => $value) {
+            if ($tpl->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
+                $scope_ptr->config_vars[$variable] = $value;
+            } else {
+                $scope_ptr->config_vars[$variable] =
+                    array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
+            }
+        }
+        // scan sections
+        $sections = $tpl->source->config_sections;
+        if (!empty($sections)) {
+            foreach ((array) $sections as $tpl_section) {
+                if (isset($_config_vars['sections'][$tpl_section])) {
+                    foreach ($_config_vars['sections'][$tpl_section]['vars'] as $variable => $value) {
+                        if ($tpl->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
+                            $scope_ptr->config_vars[$variable] = $value;
+                        } else {
+                            $scope_ptr->config_vars[$variable] =
+                                array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * gets  a config variable value
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string                    $varName the name of the config variable
+     * @param bool                      $errorEnable
+     *
+     * @return mixed  the value of the config variable
+     */
+    public function _getConfigVariable(\Smarty_Internal_Template $tpl, $varName, $errorEnable = true)
+    {
+        $_ptr = $tpl;
+        while ($_ptr !== null) {
+            if (isset($_ptr->config_vars[$varName])) {
+                // found it, return it
+                return $_ptr->config_vars[$varName];
+            }
+            // not found, try at parent
+            $_ptr = $_ptr->parent;
+        }
+        if ($tpl->smarty->error_unassigned && $errorEnable) {
+            // force a notice
+            $x = $$varName;
+        }
+        return null;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_createdata.php b/library/Smarty/libs/sysplugins/smarty_internal_method_createdata.php
new file mode 100644
index 000000000..600bc777c
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_createdata.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method CreateData
+ *
+ * Smarty::createData() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CreateData
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * creates a data object
+     *
+     * @api  Smarty::createData()
+     * @link http://www.smarty.net/docs/en/api.create.data.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty      $obj
+     * @param \Smarty_Internal_Template|\Smarty_Internal_Data|\Smarty_Data|\Smarty $parent next higher level of Smarty
+     *                                                                                     variables
+     * @param string                                                               $name   optional data block name
+     *
+     * @returns Smarty_Data data object
+     */
+    public function createData(Smarty_Internal_TemplateBase $obj, Smarty_Internal_Data $parent = null, $name = null)
+    {
+        /* @var Smarty $smarty */
+        $smarty = isset($this->smarty) ? $this->smarty : $obj;
+        $dataObj = new Smarty_Data($parent, $smarty, $name);
+        if ($smarty->debugging) {
+            Smarty_Internal_Debug::register_data($dataObj);
+        }
+        return $dataObj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php b/library/Smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php
new file mode 100644
index 000000000..e1a7801f7
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Smarty Method GetAutoloadFilters
+ *
+ * Smarty::getAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
+{
+
+    /**
+     * Get autoload filters
+     *
+     * @api Smarty::getAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type type of filter to get auto loads
+     *                                                                              for. Defaults to all autoload
+     *                                                                              filters
+     *
+     * @return array  array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type
+     *                was specified
+     */
+    public function getAutoloadFilters(Smarty_Internal_TemplateBase $obj, $type = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            return isset($smarty->autoload_filters[$type]) ? $smarty->autoload_filters[$type] : array();
+        }
+        return $smarty->autoload_filters;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php b/library/Smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php
new file mode 100644
index 000000000..b15672168
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Smarty Method GetConfigVars
+ *
+ * Smarty::getConfigVars() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetConfigVars
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * Returns a single or all config variables
+     *
+     * @api  Smarty::getConfigVars()
+     * @link http://www.smarty.net/docs/en/api.get.config.vars.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $varname        variable name or null
+     * @param  bool                                                   $search_parents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     */
+    public function getConfigVars(Smarty_Internal_Data $data, $varname = null, $search_parents = true)
+    {
+        $_ptr = $data;
+        $var_array = array();
+        while ($_ptr !== null) {
+            if (isset($varname)) {
+                if (isset($_ptr->config_vars[$varname])) {
+                    return $_ptr->config_vars[$varname];
+                }
+            } else {
+                $var_array = array_merge($_ptr->config_vars, $var_array);
+            }
+            // not found, try at parent
+            if ($search_parents) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            }
+        }
+        if (isset($varname)) {
+            return '';
+        } else {
+            return $var_array;
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php b/library/Smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php
new file mode 100644
index 000000000..3c3432ce1
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Smarty Method GetDebugTemplate
+ *
+ * Smarty::getDebugTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetDebugTemplate
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * return name of debugging template
+     *
+     * @api Smarty::getDebugTemplate()
+
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     *
+     * @return string
+     */
+    public function getDebugTemplate(Smarty_Internal_TemplateBase $obj)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        return $smarty->debug_tpl;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php b/library/Smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php
new file mode 100644
index 000000000..32e0cc413
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Smarty Method GetDefaultModifiers
+ *
+ * Smarty::getDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Get default modifiers
+     *
+     * @api Smarty::getDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     *
+     * @return array list of default modifiers
+     */
+    public function getDefaultModifiers(Smarty_Internal_TemplateBase $obj)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        return $smarty->default_modifiers;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php b/library/Smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php
new file mode 100644
index 000000000..be0c0dba2
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method GetRegisteredObject
+ *
+ * Smarty::getRegisteredObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetRegisteredObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * return a reference to a registered object
+     *
+     * @api  Smarty::getRegisteredObject()
+     * @link http://www.smarty.net/docs/en/api.get.registered.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $object_name object name
+     *
+     * @return object
+     * @throws \SmartyException if no such object is found
+     */
+    public function getRegisteredObject(Smarty_Internal_TemplateBase $obj, $object_name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (!isset($smarty->registered_objects[$object_name])) {
+            throw new SmartyException("'$object_name' is not a registered object");
+        }
+        if (!is_object($smarty->registered_objects[$object_name][0])) {
+            throw new SmartyException("registered '$object_name' is not an object");
+        }
+        return $smarty->registered_objects[$object_name][0];
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php b/library/Smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php
new file mode 100644
index 000000000..b922fd088
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Smarty Method GetStreamVariable
+ *
+ * Smarty::getStreamVariable() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetStreamVariable
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * gets  a stream variable
+     *
+     * @api Smarty::getStreamVariable()
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $variable the stream of the variable
+     *
+     * @return mixed
+     * @throws \SmartyException
+     */
+    public function getStreamVariable(Smarty_Internal_Data $data, $variable)
+    {
+        $_result = '';
+        $fp = fopen($variable, 'r+');
+        if ($fp) {
+            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
+                $_result .= $current_line;
+            }
+            fclose($fp);
+
+            return $_result;
+        }
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if ($smarty->error_unassigned) {
+            throw new SmartyException('Undefined stream variable "' . $variable . '"');
+        } else {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_gettags.php b/library/Smarty/libs/sysplugins/smarty_internal_method_gettags.php
new file mode 100644
index 000000000..dd9e8d1ca
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_gettags.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Smarty Method GetTags
+ *
+ * Smarty::getTags() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetTags
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Return array of tag/attributes of all tags used by an template
+     *
+     * @api  Smarty::getTags()
+     * @link http://www.smarty.net/docs/en/api.get.tags.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param null|string|Smarty_Internal_Template                            $template
+     *
+     * @return array of tag/attributes
+     * @throws \SmartyException
+     */
+    public function getTags(Smarty_Internal_TemplateBase $obj, $template = null)
+    {
+        /* @var Smarty $smarty */
+        $smarty = isset($this->smarty) ? $this->smarty : $obj;
+        if ($obj->_objType == 2 && !isset($template)) {
+            $tpl = clone $obj;
+        } elseif (isset($template) && $template->_objType == 2) {
+            $tpl = clone $template;
+        } elseif (isset($template) && is_string($template)) {
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $smarty->template_class($template, $smarty);
+            // checks if template exists
+            if (!$tpl->source->exists) {
+                throw new SmartyException("Unable to load template {$tpl->source->type} '{$tpl->source->name}'");
+            }
+        }
+        if (isset($tpl)) {
+            $tpl->smarty = clone $tpl->smarty;
+            $tpl->smarty->_cache['get_used_tags'] = true;
+            $tpl->_cache['used_tags'] = array();
+            $tpl->smarty->merge_compiled_includes = false;
+            $tpl->smarty->disableSecurity();
+            $tpl->caching = false;
+            $tpl->loadCompiler();
+            $tpl->compiler->compileTemplate($tpl);
+            return $tpl->_cache['used_tags'];
+        }
+        throw new SmartyException("Missing template specification");
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php b/library/Smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php
new file mode 100644
index 000000000..235bece46
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Smarty Method GetTemplateVars
+ *
+ * Smarty::getTemplateVars() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetTemplateVars
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * Returns a single or all template variables
+     *
+     * @api  Smarty::getTemplateVars()
+     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param  string                                                 $varName        variable name or null
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr           optional pointer to data object
+     * @param  bool                                                   $searchParents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     */
+    public function getTemplateVars(Smarty_Internal_Data $data, $varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
+    {
+        if (isset($varName)) {
+            $_var = $this->_getVariable($data, $varName, $_ptr, $searchParents, false);
+            if (is_object($_var)) {
+                return $_var->value;
+            } else {
+                return null;
+            }
+        } else {
+            $_result = array();
+            if ($_ptr === null) {
+                $_ptr = $data;
+            }
+            while ($_ptr !== null) {
+                foreach ($_ptr->tpl_vars AS $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[$key] = $var->value;
+                    }
+                }
+                // not found, try at parent
+                if ($searchParents) {
+                    $_ptr = $_ptr->parent;
+                } else {
+                    $_ptr = null;
+                }
+            }
+            if ($searchParents && isset(Smarty::$global_tpl_vars)) {
+                foreach (Smarty::$global_tpl_vars AS $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[$key] = $var->value;
+                    }
+                }
+            }
+            return $_result;
+        }
+    }
+
+    /**
+     * gets the object of a Smarty variable
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                 $varName       the name of the Smarty variable
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr           optional pointer to data object
+     * @param bool                                                   $searchParents search also in parent data
+     * @param bool                                                    $errorEnable
+     *
+     * @return \Smarty_Variable
+     */
+    public function _getVariable(Smarty_Internal_Data $data, $varName, Smarty_Internal_Data $_ptr = null, $searchParents = true, $errorEnable = true)
+    {
+        if ($_ptr === null) {
+            $_ptr = $data;
+        }
+        while ($_ptr !== null) {
+            if (isset($_ptr->tpl_vars[$varName])) {
+                // found it, return it
+                return $_ptr->tpl_vars[$varName];
+            }
+            // not found, try at parent
+            if ($searchParents) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            }
+        }
+        if (isset(Smarty::$global_tpl_vars[$varName])) {
+            // found it, return it
+            return Smarty::$global_tpl_vars[$varName];
+        }
+        /* @var \Smarty $smarty */
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if ($smarty->error_unassigned && $errorEnable) {
+            // force a notice
+            $x = $$varName;
+        }
+
+        return new Smarty_Undefined_Variable;
+    }
+
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_loadfilter.php b/library/Smarty/libs/sysplugins/smarty_internal_method_loadfilter.php
new file mode 100644
index 000000000..7fb11179f
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_loadfilter.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Smarty Method LoadFilter
+ *
+ * Smarty::loadFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_LoadFilter
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::loadFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type filter type
+     * @param  string                                                         $name filter name
+     *
+     * @return bool
+     * @throws SmartyException if filter could not be loaded
+     */
+    public function loadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $this->_checkFilterType($type);
+        $_plugin = "smarty_{$type}filter_{$name}";
+        $_filter_name = $_plugin;
+        if (is_callable($_plugin)) {
+            $smarty->registered_filters[$type][$_filter_name] = $_plugin;
+            return true;
+        }
+        if ($smarty->loadPlugin($_plugin)) {
+            if (class_exists($_plugin, false)) {
+                $_plugin = array($_plugin, 'execute');
+            }
+            if (is_callable($_plugin)) {
+                $smarty->registered_filters[$type][$_filter_name] = $_plugin;
+                return true;
+            }
+        }
+        throw new SmartyException("{$type}filter \"{$name}\" not found or callable");
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[$type])) {
+            throw new SmartyException("Illegal filter type \"{$type}\"");
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_loadplugin.php b/library/Smarty/libs/sysplugins/smarty_internal_method_loadplugin.php
new file mode 100644
index 000000000..c153f55f0
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_loadplugin.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Smarty Extension Loadplugin
+ *
+ * $smarty->loadPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_LoadPlugin
+{
+    /**
+     * Cache of searched plugin files
+     *
+     * @var array
+     */
+    public $plugin_files = array();
+
+    /**
+     * Takes unknown classes and loads plugin files for them
+     * class name format: Smarty_PluginType_PluginName
+     * plugin filename format: plugintype.pluginname.php
+     *
+     * @param \Smarty $smarty
+     * @param  string $plugin_name class plugin name to load
+     * @param  bool   $check       check if already loaded
+     *
+     * @return bool|string
+     * @throws \SmartyException
+     */
+    public function loadPlugin(Smarty $smarty, $plugin_name, $check)
+    {
+        // if function or class exists, exit silently (already loaded)
+        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
+            return true;
+        }
+        if (!preg_match('#^smarty_((internal)|([^_]+))_(.+)$#i', $plugin_name, $match)) {
+            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
+        }
+        if (!empty($match[2])) {
+            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
+            if (isset($this->plugin_files[$file])) {
+                if ($this->plugin_files[$file] !== false) {
+                    return $this->plugin_files[$file];
+                } else {
+                    return false;
+                }
+            } else {
+                if (is_file($file)) {
+                    $this->plugin_files[$file] = $file;
+                    require_once($file);
+                    return $file;
+                } else {
+                    $this->plugin_files[$file] = false;
+                    return false;
+                }
+            }
+        }
+        // plugin filename is expected to be: [type].[name].php
+        $_plugin_filename = "{$match[1]}.{$match[4]}.php";
+        $_lower_filename = strtolower($_plugin_filename);
+        if (isset($this->plugin_files)) {
+            if (isset($this->plugin_files['plugins_dir'][$_lower_filename])) {
+                if (!$smarty->use_include_path || $this->plugin_files['plugins_dir'][$_lower_filename] !== false) {
+                    return $this->plugin_files['plugins_dir'][$_lower_filename];
+                }
+            }
+            if (!$smarty->use_include_path || $smarty->ext->_getIncludePath->isNewIncludePath($smarty)) {
+                unset($this->plugin_files['include_path']);
+            } else {
+                if (isset($this->plugin_files['include_path'][$_lower_filename])) {
+                    return $this->plugin_files['include_path'][$_lower_filename];
+                }
+            }
+        }
+        $_file_names = array($_plugin_filename);
+        if ($_lower_filename != $_plugin_filename) {
+            $_file_names[] = $_lower_filename;
+        }
+        $_p_dirs = $smarty->getPluginsDir();
+        if (!isset($this->plugin_files['plugins_dir'][$_lower_filename])) {
+            // loop through plugin dirs and find the plugin
+            foreach ($_p_dirs as $_plugin_dir) {
+                foreach ($_file_names as $name) {
+                    $file = $_plugin_dir . $name;
+                    if (is_file($file)) {
+                        $this->plugin_files['plugins_dir'][$_lower_filename] = $file;
+                        require_once($file);
+                        return $file;
+                    }
+                    $this->plugin_files['plugins_dir'][$_lower_filename] = false;
+                }
+            }
+        }
+        if ($smarty->use_include_path) {
+            foreach ($_file_names as $_file_name) {
+                // try PHP include_path
+                $file = $smarty->ext->_getIncludePath->getIncludePath($_p_dirs, $_file_name, $smarty);
+                $this->plugin_files['include_path'][$_lower_filename] = $file;
+                if ($file !== false) {
+                    require_once($file);
+                    return $file;
+                }
+            }
+        }
+        // no plugin loaded
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_mustcompile.php b/library/Smarty/libs/sysplugins/smarty_internal_method_mustcompile.php
new file mode 100644
index 000000000..f28a68e6d
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_mustcompile.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Smarty Method UnloadFilter
+ *
+ * Smarty_Internal_Template::mustCompile() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_MustCompile
+{
+    /**
+     * Valid for template object
+     *
+     * @var int
+     */
+    public $objMap = 2;
+
+    /**
+     * Returns if the current template must be compiled by the Smarty compiler
+     * It does compare the timestamps of template source and the compiled templates and checks the force compile
+     * configuration
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @return bool
+     * @throws \SmartyException
+     */
+    public function mustCompile(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->exists) {
+            if (isset($_template->parent) && $_template->parent->_objType == 2) {
+                $parent_resource = " in '$_template->parent->template_resource}'";
+            } else {
+                $parent_resource = '';
+            }
+            throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");
+        }
+        if ($_template->mustCompile === null) {
+            $_template->mustCompile = (!$_template->source->handler->uncompiled &&
+                ($_template->smarty->force_compile || $_template->source->handler->recompiled || !$_template->compiled->exists ||
+                    ($_template->smarty->compile_check && $_template->compiled->getTimeStamp() < $_template->source->getTimeStamp())));
+        }
+
+        return $_template->mustCompile;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php b/library/Smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php
new file mode 100644
index 000000000..55c5090ac
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Smarty Method RegisterCacheResource
+ *
+ * Smarty::registerCacheResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterCacheResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::registerCacheResource()
+     * @link http://www.smarty.net/docs/en/api.register.cacheresource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $name name of resource type
+     * @param \Smarty_CacheResource                                           $resource_handler
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function registerCacheResource(Smarty_Internal_TemplateBase $obj, $name, Smarty_CacheResource $resource_handler)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $smarty->registered_cache_resources[$name] = $resource_handler;
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_registerclass.php b/library/Smarty/libs/sysplugins/smarty_internal_method_registerclass.php
new file mode 100644
index 000000000..d2e5e20bb
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_registerclass.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Smarty Method RegisterClass
+ *
+ * Smarty::registerClass() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterClass
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers static classes to be used in templates
+     *
+     * @api  Smarty::registerClass()
+     * @link http://www.smarty.net/docs/en/api.register.class.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $class_name
+     * @param  string                                                         $class_impl the referenced PHP class to
+     *                                                                                    register
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerClass(Smarty_Internal_TemplateBase $obj, $class_name, $class_impl)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        // test if exists
+        if (!class_exists($class_impl)) {
+            throw new SmartyException("Undefined class '$class_impl' in register template class");
+        }
+        // register the class
+        $smarty->registered_classes[$class_name] = $class_impl;
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php b/library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
new file mode 100644
index 000000000..370aa38dc
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultConfigHandler
+ *
+ * Smarty::registerDefaultConfigHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultConfigHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Register config default handler
+     *
+     * @api  Smarty::registerDefaultConfigHandler()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  callable                                                       $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultConfigHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (is_callable($callback)) {
+            $smarty->default_config_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default config handler not callable");
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php b/library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
new file mode 100644
index 000000000..80b801ce5
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultPluginHandler
+ *
+ * Smarty::registerDefaultPluginHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultPluginHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a default plugin handler
+     *
+     * @api  Smarty::registerDefaultPluginHandler()
+     * @link http://www.smarty.net/docs/en/api.register.default.plugin.handler.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  callable                                                       $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultPluginHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (is_callable($callback)) {
+            $smarty->default_plugin_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default plugin handler '$callback' not callable");
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php b/library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
new file mode 100644
index 000000000..40979e7a6
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultTemplateHandler
+ *
+ * Smarty::registerDefaultTemplateHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultTemplateHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Register template default handler
+     *
+     * @api  Smarty::registerDefaultTemplateHandler()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  callable                                                       $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultTemplateHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (is_callable($callback)) {
+            $smarty->default_template_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default template handler not callable");
+        }
+        return $obj;
+    }
+
+    /**
+     * get default content from template or config resource handler
+     *
+     * @param Smarty_Template_Source $source
+     */
+    public static function _getDefaultTemplate(Smarty_Template_Source $source)
+    {
+        if ($source->isConfig) {
+            $default_handler = $source->smarty->default_config_handler_func;
+        } else {
+            $default_handler = $source->smarty->default_template_handler_func;
+        }
+        $_content = $_timestamp = null;
+        $_return = call_user_func_array($default_handler, array($source->type, $source->name, &$_content, &$_timestamp,
+                                                                $source->smarty));
+        if (is_string($_return)) {
+            $source->exists = is_file($_return);
+            if ($source->exists) {
+                $source->timestamp = filemtime($_return);
+            }
+            $source->filepath = $_return;
+        } elseif ($_return === true) {
+            $source->content = $_content;
+            $source->timestamp = $_timestamp;
+            $source->exists = true;
+            $source->handler->recompiled = true;
+            $source->filepath = false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_registerfilter.php b/library/Smarty/libs/sysplugins/smarty_internal_method_registerfilter.php
new file mode 100644
index 000000000..84b2c2630
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_registerfilter.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Smarty Method RegisterFilter
+ *
+ * Smarty::registerFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterFilter
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * Registers a filter function
+     *
+     * @api  Smarty::registerFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type filter type
+     * @param  callback                                                       $callback
+     * @param  string|null                                                    $name optional filter name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerFilter(Smarty_Internal_TemplateBase $obj, $type, $callback, $name = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $this->_checkFilterType($type);
+        $name = isset($name) ? $name : $this->_getFilterName($callback);
+        if (!is_callable($callback)) {
+            throw new SmartyException("{$type}filter \"{$name}\" not callable");
+        }
+        $smarty->registered_filters[$type][$name] = $callback;
+        return $obj;
+    }
+
+    /**
+     * Return internal filter name
+     *
+     * @param  callback $function_name
+     *
+     * @return string   internal filter name
+     */
+    public function _getFilterName($function_name)
+    {
+        if (is_array($function_name)) {
+            $_class_name = (is_object($function_name[0]) ? get_class($function_name[0]) : $function_name[0]);
+
+            return $_class_name . '_' . $function_name[1];
+        } elseif (is_string($function_name)) {
+            return $function_name;
+        } else {
+            return 'closure';
+        }
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[$type])) {
+            throw new SmartyException("Illegal filter type \"{$type}\"");
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_registerobject.php b/library/Smarty/libs/sysplugins/smarty_internal_method_registerobject.php
new file mode 100644
index 000000000..f27f1720b
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_registerobject.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Smarty Method RegisterObject
+ *
+ * Smarty::registerObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers object to be used in templates
+     *
+     * @api  Smarty::registerObject()
+     * @link http://www.smarty.net/docs/en/api.register.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $object_name
+     * @param  object                                                         $object                     the
+     *                                                                                                    referenced
+     *                                                                                                    PHP object to
+     *                                                                                                    register
+     * @param  array                                                          $allowed_methods_properties list of
+     *                                                                                                    allowed
+     *                                                                                                    methods
+     *                                                                                                    (empty = all)
+     * @param  bool                                                           $format                     smarty
+     *                                                                                                    argument
+     *                                                                                                    format, else
+     *                                                                                                    traditional
+     * @param  array                                                          $block_methods              list of
+     *                                                                                                    block-methods
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerObject(Smarty_Internal_TemplateBase $obj, $object_name, $object, $allowed_methods_properties = array(), $format = true, $block_methods = array())
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        // test if allowed methods callable
+        if (!empty($allowed_methods_properties)) {
+            foreach ((array) $allowed_methods_properties as $method) {
+                if (!is_callable(array($object, $method)) && !property_exists($object, $method)) {
+                    throw new SmartyException("Undefined method or property '$method' in registered object");
+                }
+            }
+        }
+        // test if block methods callable
+        if (!empty($block_methods)) {
+            foreach ((array) $block_methods as $method) {
+                if (!is_callable(array($object, $method))) {
+                    throw new SmartyException("Undefined method '$method' in registered object");
+                }
+            }
+        }
+        // register the object
+        $smarty->registered_objects[$object_name] = array($object, (array) $allowed_methods_properties,
+                                                          (boolean) $format, (array) $block_methods);
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_registerplugin.php b/library/Smarty/libs/sysplugins/smarty_internal_method_registerplugin.php
new file mode 100644
index 000000000..95814581d
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_registerplugin.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Method RegisterPlugin
+ *
+ * Smarty::registerPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterPlugin
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::registerPlugin()
+     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type       plugin type
+     * @param  string                                                         $name       name of template tag
+     * @param  callback                                                       $callback   PHP callback to register
+     * @param  bool                                                           $cacheable  if true (default) this
+     *                                                                                    function is cache able
+     * @param  mixed                                                          $cache_attr caching attributes if any
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              when the plugin tag is invalid
+     */
+    public function registerPlugin(Smarty_Internal_TemplateBase $obj, $type, $name, $callback, $cacheable = true, $cache_attr = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_plugins[$type][$name])) {
+            throw new SmartyException("Plugin tag \"{$name}\" already registered");
+        } elseif (!is_callable($callback)) {
+            throw new SmartyException("Plugin \"{$name}\" not callable");
+        } else {
+            $smarty->registered_plugins[$type][$name] = array($callback, (bool) $cacheable, (array) $cache_attr);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_registerresource.php b/library/Smarty/libs/sysplugins/smarty_internal_method_registerresource.php
new file mode 100644
index 000000000..43246ee9b
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_registerresource.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method RegisterResource
+ *
+ * Smarty::registerResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::registerResource()
+     * @link http://www.smarty.net/docs/en/api.register.resource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $name             name of resource type
+     * @param  Smarty_Resource|array                                          $resource_handler or instance of
+     *                                                                                          Smarty_Resource, or
+     *                                                                                          array of callbacks to
+     *                                                                                          handle resource
+     *                                                                                          (deprecated)
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, $resource_handler)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $smarty->registered_resources[$name] = $resource_handler instanceof
+        Smarty_Resource ? $resource_handler : array($resource_handler, false);
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php b/library/Smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php
new file mode 100644
index 000000000..b1f965cd9
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Smarty Method SetAutoloadFilters
+ *
+ * Smarty::setAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetAutoloadFilters
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * Set autoload filters
+     *
+     * @api Smarty::setAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  array                                                          $filters filters to load automatically
+     * @param  string                                                         $type    "pre", "output", … specify the
+     *                                                                                 filter type to set. Defaults to
+     *                                                                                 none treating $filters' keys as
+     *                                                                                 the appropriate types
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function setAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            $smarty->autoload_filters[$type] = (array) $filters;
+        } else {
+            foreach ((array) $filters as $type => $value) {
+                $this->_checkFilterType($type);
+            }
+            $smarty->autoload_filters = (array) $filters;
+        }
+        return $obj;
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[$type])) {
+            throw new SmartyException("Illegal filter type \"{$type}\"");
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php b/library/Smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php
new file mode 100644
index 000000000..4ff5d7f82
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method SetDebugTemplate
+ *
+ * Smarty::setDebugTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetDebugTemplate
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * set the debug template
+     *
+     * @api Smarty::setDebugTemplate()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $tpl_name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException if file is not readable
+     */
+    public function setDebugTemplate(Smarty_Internal_TemplateBase $obj, $tpl_name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (!is_readable($tpl_name)) {
+            throw new SmartyException("Unknown file '{$tpl_name}'");
+        }
+        $smarty->debug_tpl = $tpl_name;
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php b/library/Smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php
new file mode 100644
index 000000000..5a707287a
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Smarty Method SetDefaultModifiers
+ *
+ * Smarty::setDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Set default modifiers
+     *
+     * @api Smarty::setDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  array|string                                                   $modifiers modifier or list of modifiers
+     *                                                                                   to set
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function setDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $smarty->default_modifiers = (array) $modifiers;
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php b/library/Smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php
new file mode 100644
index 000000000..e3d966e1c
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method UnloadFilter
+ *
+ * Smarty::unloadFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnloadFilter extends Smarty_Internal_Method_LoadFilter
+{
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::unloadFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.unload.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type filter type
+     * @param  string                                                         $name filter name
+     *
+     * @return bool
+     */
+    public function unloadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $this->_checkFilterType($type);
+        if (isset($smarty->registered_filters[$type])) {
+            $_filter_name = "smarty_{$type}filter_{$name}";
+            if (isset($smarty->registered_filters[$type][$_filter_name])) {
+                unset ($smarty->registered_filters[$type][$_filter_name]);
+                if (empty($smarty->registered_filters[$type])) {
+                    unset($smarty->registered_filters[$type]);
+                }
+            }
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php b/library/Smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
new file mode 100644
index 000000000..80381015a
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterCacheResource
+ *
+ * Smarty::unregisterCacheResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterCacheResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::unregisterCacheResource()
+     * @link http://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type     name of cache resource type
+      *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterCacheResource(Smarty_Internal_TemplateBase $obj, $name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_cache_resources[$name])) {
+            unset($smarty->registered_cache_resources[$name]);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php b/library/Smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php
new file mode 100644
index 000000000..c80ae9a65
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method UnregisterFilter
+ *
+ * Smarty::unregisterFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterFilter extends Smarty_Internal_Method_RegisterFilter
+{
+    /**
+     * Unregisters a filter function
+     *
+     * @api  Smarty::unregisterFilter()
+     *
+     * @link http://www.smarty.net/docs/en/api.unregister.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type filter type
+     * @param  callback|string                                                $callback
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterFilter(Smarty_Internal_TemplateBase $obj, $type, $callback)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        $this->_checkFilterType($type);
+        if (isset($smarty->registered_filters[$type])) {
+            $name = is_string($callback) ? $callback : $this->_getFilterName($callback);
+            if (isset($smarty->registered_filters[$type][$name])) {
+                unset($smarty->registered_filters[$type][$name]);
+                if (empty($smarty->registered_filters[$type])) {
+                    unset($smarty->registered_filters[$type]);
+                }
+            }
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php b/library/Smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php
new file mode 100644
index 000000000..a94331683
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterObject
+ *
+ * Smarty::unregisterObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::unregisterObject()
+     * @link http://www.smarty.net/docs/en/api.unregister.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $object_name name of object
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_objects[$object_name])) {
+            unset($smarty->registered_objects[$object_name]);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php b/library/Smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php
new file mode 100644
index 000000000..06cb2d354
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method UnregisterPlugin
+ *
+ * Smarty::unregisterPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterPlugin
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::unregisterPlugin()
+     * @link http://www.smarty.net/docs/en/api.unregister.plugin.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type       plugin type
+     * @param  string                                                         $name       name of template tag
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+      */
+    public function unregisterPlugin(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_plugins[$type][$name])) {
+            unset($smarty->registered_plugins[$type][$name]);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php b/library/Smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php
new file mode 100644
index 000000000..767bd74ab
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterResource
+ *
+ * Smarty::unregisterResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::unregisterResource()
+     * @link http://www.smarty.net/docs/en/api.unregister.resource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param  string                                                         $type     name of resource type
+      *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterResource(Smarty_Internal_TemplateBase $obj, $type)
+    {
+        $smarty = isset($obj->smarty) ? $obj->smarty : $obj;
+        if (isset($smarty->registered_resources[$type])) {
+            unset($smarty->registered_resources[$type]);
+        }
+        return $obj;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_nocache_insert.php b/library/Smarty/libs/sysplugins/smarty_internal_nocache_insert.php
index 0d2facfe9..b3d5fa86a 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_nocache_insert.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_nocache_insert.php
@@ -42,10 +42,10 @@ class Smarty_Internal_Nocache_Insert
             $_output .= "echo {$_function}(" . var_export($_attr, true) . ",\$_smarty_tpl);?>";
         }
         $_tpl = $_template;
-        while ($_tpl->parent instanceof Smarty_Internal_Template) {
+        while (isset($_tpl->parent) && $_tpl->parent->_objType == 2) {
             $_tpl = $_tpl->parent;
         }
 
-        return "/*%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/";
+        return "/*%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/";
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_parsetree.php b/library/Smarty/libs/sysplugins/smarty_internal_parsetree.php
index 186671021..32c9df094 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_parsetree.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_parsetree.php
@@ -14,14 +14,9 @@
  * @subpackage Compiler
  * @ignore
  */
-abstract class _smarty_parsetree
+abstract class Smarty_Internal_ParseTree
 {
-    /**
-     * Parser object
-     *
-     * @var object
-     */
-    public $parser;
+
     /**
      * Buffer content
      *
@@ -39,323 +34,21 @@ abstract class _smarty_parsetree
     /**
      * Return buffer
      *
-     * @return string buffer content
-     */
-    abstract public function to_smarty_php();
-}
-
-/**
- * A complete smarty tag.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_tag extends _smarty_parsetree
-{
-    /**
-     * Saved block nesting level
-     *
-     * @var int
-     */
-    public $saved_block_nesting;
-
-    /**
-     * Create parse tree buffer for Smarty tag
-     *
-     * @param object $parser parser object
-     * @param string $data   content
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-        $this->saved_block_nesting = $parser->block_nesting_level;
-    }
-
-    /**
-     * Return buffer content
+     * @param \Smarty_Internal_Templateparser $parser
      *
-     * @return string content
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Return complied code that loads the evaluated output of buffer content into a temporary variable
-     *
-     * @return string template code
-     */
-    public function assign_to_var()
-    {
-        $var = sprintf('$_tmp%d', ++Smarty_Internal_Templateparser::$prefix_number);
-        $this->parser->compiler->prefix_code[] = sprintf("<?php ob_start();\n%s\n%s=ob_get_clean();?>", preg_replace(array('/^\s*<\?php\s+/','/\s*\?>\s*$/'), '', $this->data), $var);
-
-        return $var;
-    }
-}
-
-/**
- * Code fragment inside a tag.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_code extends _smarty_parsetree
-{
-    /**
-     * Create parse tree buffer for code fragment
-     *
-     * @param object $parser parser object
-     * @param string $data   content
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return buffer content in parentheses
-     *
-     * @return string content
-     */
-    public function to_smarty_php()
-    {
-        return sprintf("(%s)", $this->data);
-    }
-}
-
-/**
- * Double quoted string inside a tag.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_doublequoted extends _smarty_parsetree
-{
-    /**
-     * Create parse tree buffer for double quoted string subtrees
-     *
-     * @param object            $parser  parser object
-     * @param _smarty_parsetree $subtree parsetree buffer
-     */
-    public function __construct($parser, _smarty_parsetree $subtree)
-    {
-        $this->parser = $parser;
-        $this->subtrees[] = $subtree;
-        if ($subtree instanceof _smarty_tag) {
-            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-        }
-    }
-
-    /**
-     * Append buffer to subtree
-     *
-     * @param _smarty_parsetree $subtree parsetree buffer
-     */
-    public function append_subtree(_smarty_parsetree $subtree)
-    {
-        $last_subtree = count($this->subtrees) - 1;
-        if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof _smarty_tag && $this->subtrees[$last_subtree]->saved_block_nesting < $this->parser->block_nesting_level) {
-            if ($subtree instanceof _smarty_code) {
-                $this->subtrees[$last_subtree]->data .= '<?php echo ' . $subtree->data . ';?>';
-            } elseif ($subtree instanceof _smarty_dq_content) {
-                $this->subtrees[$last_subtree]->data .= '<?php echo "' . $subtree->data . '";?>';
-            } else {
-                $this->subtrees[$last_subtree]->data .= $subtree->data;
-            }
-        } else {
-            $this->subtrees[] = $subtree;
-        }
-        if ($subtree instanceof _smarty_tag) {
-            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-        }
-    }
-
-    /**
-     * Merge subtree buffer content together
-     *
-     * @return string compiled template code
-     */
-    public function to_smarty_php()
-    {
-        $code = '';
-        foreach ($this->subtrees as $subtree) {
-            if ($code !== "") {
-                $code .= ".";
-            }
-            if ($subtree instanceof _smarty_tag) {
-                $more_php = $subtree->assign_to_var();
-            } else {
-                $more_php = $subtree->to_smarty_php();
-            }
-
-            $code .= $more_php;
-
-            if (!$subtree instanceof _smarty_dq_content) {
-                $this->parser->compiler->has_variable_string = true;
-            }
-        }
-
-        return $code;
-    }
-}
-
-/**
- * Raw chars as part of a double quoted string.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_dq_content extends _smarty_parsetree
-{
-    /**
-     * Create parse tree buffer with string content
-     *
-     * @param object $parser parser object
-     * @param string $data   string section
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return content as double quoted string
-     *
-     * @return string doubled quoted string
-     */
-    public function to_smarty_php()
-    {
-        return '"' . $this->data . '"';
-    }
-}
-
-/**
- * Template element
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_template_buffer extends _smarty_parsetree
-{
-    /**
-     * Array of template elements
-     *
-     * @var array
-     */
-    public $subtrees = Array();
-
-    /**
-     * Create root of parse tree for template elements
-     *
-     * @param object $parser parse object
-     */
-    public function __construct($parser)
-    {
-        $this->parser = $parser;
-    }
-
-    /**
-     * Append buffer to subtree
-     *
-     * @param _smarty_parsetree $subtree
+     * @return string buffer content
      */
-    public function append_subtree(_smarty_parsetree $subtree)
-    {
-        if ($subtree->data !== '') {
-            $this->subtrees[] = $subtree;
-        }
-    }
+    abstract public function to_smarty_php(Smarty_Internal_Templateparser $parser);
 
     /**
-     * Sanitize and merge subtree buffers together
-     *
-     * @return string template code content
+     * Template data object destructor
      */
-    public function to_smarty_php()
+    public function __destruct()
     {
-        $code = '';
-        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key ++) {
-            if ($this->subtrees[$key] instanceof _smarty_text) {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                while ($key + 1 < $cnt && ($this->subtrees[$key+1] instanceof _smarty_text || $this->subtrees[$key +1]->data == '')) {
-                    $key++;
-                    if ($this->subtrees[$key]->data == '') {
-                        continue;
-                    }
-                    $subtree .= $this->subtrees[$key]->to_smarty_php();
-                }
-                if ($subtree == '') {
-                    continue;
-                }
-                $code .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<\/?script)/', "<?php echo '\$1'; ?>\n", $subtree);
-                continue;
-            }
-            if ($this->subtrees[$key] instanceof _smarty_tag) {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                while ($key + 1 < $cnt && ($this->subtrees[$key+1] instanceof _smarty_tag || $this->subtrees[$key +1]->data == '')) {
-                    $key++;
-                    if ($this->subtrees[$key]->data == '') {
-                        continue;
-                    }
-                    $newCode = $this->subtrees[$key]->to_smarty_php();
-                    if ((preg_match('/^\s*<\?php\s+/', $newCode) &&  preg_match('/\s*\?>\s*$/', $subtree))) {
-                        $subtree = preg_replace('/\s*\?>\s*$/', "\n", $subtree);
-                        $subtree .= preg_replace('/^\s*<\?php\s+/', '', $newCode);
-                    } else {
-                        $subtree .= $newCode;
-                    }
-                }
-                if ($subtree == '') {
-                    continue;
-                }
-                $code .= $subtree;
-                continue;
-            }
-            $code .= $this->subtrees[$key]->to_smarty_php();
-        }
-        return $code;
+        $this->data = null;
+        $this->subtrees = null;
     }
 
 }
 
-/**
- * template text
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_text extends _smarty_parsetree
-{
-    /**
-     * Create template text buffer
-     *
-     * @param object $parser parser object
-     * @param string $data   text
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
 
-    /**
-     * Return buffer content
-     *
-     * @return strint text
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_parsetree_code.php b/library/Smarty/libs/sysplugins/smarty_internal_parsetree_code.php
new file mode 100644
index 000000000..d0f0b3fd9
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_parsetree_code.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse trees in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Code fragment inside a tag .
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Code extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer for code fragment
+     *
+     * @param string $data content
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return buffer content in parentheses
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return sprintf("(%s)", $this->data);
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_parsetree_dq.php b/library/Smarty/libs/sysplugins/smarty_internal_parsetree_dq.php
new file mode 100644
index 000000000..607389cb5
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_parsetree_dq.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Double quoted string inside a tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+
+/**
+ * Double quoted string inside a tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Dq extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer for double quoted string subtrees
+     *
+     * @param object                    $parser  parser object
+     * @param Smarty_Internal_ParseTree $subtree parse tree buffer
+     */
+    public function __construct($parser, Smarty_Internal_ParseTree $subtree)
+    {
+        $this->subtrees[] = $subtree;
+        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
+        }
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param Smarty_Internal_ParseTree       $subtree parse tree buffer
+     */
+    public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
+    {
+        $last_subtree = count($this->subtrees) - 1;
+        if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof Smarty_Internal_ParseTree_Tag && $this->subtrees[$last_subtree]->saved_block_nesting < $parser->block_nesting_level) {
+            if ($subtree instanceof Smarty_Internal_ParseTree_Code) {
+                $this->subtrees[$last_subtree]->data = $parser->compiler->appendCode($this->subtrees[$last_subtree]->data, '<?php echo ' . $subtree->data . ';?>');
+            } elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+                $this->subtrees[$last_subtree]->data = $parser->compiler->appendCode($this->subtrees[$last_subtree]->data, '<?php echo "' . $subtree->data . '";?>');
+            } else {
+                $this->subtrees[$last_subtree]->data = $parser->compiler->appendCode($this->subtrees[$last_subtree]->data, $subtree->data);
+            }
+        } else {
+            $this->subtrees[] = $subtree;
+        }
+        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
+        }
+    }
+
+    /**
+     * Merge subtree buffer content together
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string compiled template code
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        $code = '';
+        foreach ($this->subtrees as $subtree) {
+            if ($code !== "") {
+                $code .= ".";
+            }
+            if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+                $more_php = $subtree->assign_to_var($parser);
+            } else {
+                $more_php = $subtree->to_smarty_php($parser);
+            }
+
+            $code .= $more_php;
+
+            if (!$subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+                $parser->compiler->has_variable_string = true;
+            }
+        }
+
+        return $code;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php b/library/Smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php
new file mode 100644
index 000000000..a8ca389d9
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree  in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Raw chars as part of a double quoted string.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_DqContent extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer with string content
+     *
+     * @param string $data string section
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return content as double quoted string
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string doubled quoted string
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return '"' . $this->data . '"';
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_parsetree_tag.php b/library/Smarty/libs/sysplugins/smarty_internal_parsetree_tag.php
new file mode 100644
index 000000000..575c8c9e8
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_parsetree_tag.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * A complete smarty tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
+{
+
+    /**
+     * Saved block nesting level
+     *
+     * @var int
+     */
+    public $saved_block_nesting;
+
+    /**
+     * Create parse tree buffer for Smarty tag
+     *
+     * @param \Smarty_Internal_Templateparser $parser parser object
+     * @param string                          $data   content
+     */
+    public function __construct(Smarty_Internal_Templateparser $parser, $data)
+    {
+        $this->data = $data;
+        $this->saved_block_nesting = $parser->block_nesting_level;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return $this->data;
+    }
+
+    /**
+     * Return complied code that loads the evaluated output of buffer content into a temporary variable
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string template code
+     */
+    public function assign_to_var(Smarty_Internal_Templateparser $parser)
+    {
+        $var = sprintf('$_tmp%d', ++ Smarty_Internal_Templateparser::$prefix_number);
+        $tmp = $parser->compiler->appendCode('<?php ob_start();?>', $this->data);
+        $tmp = $parser->compiler->appendCode($tmp, "<?php {$var}=ob_get_clean();?>");
+        $parser->compiler->prefix_code[] = sprintf("%s", $tmp);
+
+        return $var;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_parsetree_template.php b/library/Smarty/libs/sysplugins/smarty_internal_parsetree_template.php
new file mode 100644
index 000000000..623ae51a3
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_parsetree_template.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Template element
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
+{
+
+    /**
+     * Array of template elements
+     *
+     * @var array
+     */
+    public $subtrees = Array();
+
+    /**
+     * Create root of parse tree for template elements
+     *
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param Smarty_Internal_ParseTree       $subtree
+     */
+    public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
+    {
+        if (!empty($subtree->subtrees)) {
+            $this->subtrees = array_merge($this->subtrees, $subtree->subtrees);
+        } else {
+            if ($subtree->data !== '') {
+                $this->subtrees[] = $subtree;
+            }
+        }
+    }
+
+    /**
+     * Append array to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty_Internal_ParseTree[]    $array
+     */
+    public function append_array(Smarty_Internal_Templateparser $parser, $array = array())
+    {
+        if (!empty($array)) {
+            $this->subtrees = array_merge($this->subtrees, (array) $array);
+        }
+    }
+
+    /**
+     * Prepend array to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty_Internal_ParseTree[]    $array
+     */
+    public function prepend_array(Smarty_Internal_Templateparser $parser, $array = array())
+    {
+        if (!empty($array)) {
+            $this->subtrees = array_merge((array) $array, $this->subtrees);
+        }
+    }
+
+    /**
+     * Sanitize and merge subtree buffers together
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string template code content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        $code = '';
+        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key ++) {
+            if ($this->subtrees[$key] instanceof Smarty_Internal_ParseTree_Text) {
+                $subtree = $this->subtrees[$key]->to_smarty_php($parser);
+                while ($key + 1 < $cnt && ($this->subtrees[$key + 1] instanceof Smarty_Internal_ParseTree_Text ||
+                        $this->subtrees[$key + 1]->data == '')) {
+                    $key ++;
+                    if ($this->subtrees[$key]->data == '') {
+                        continue;
+                    }
+                    $subtree .= $this->subtrees[$key]->to_smarty_php($parser);
+                }
+                if ($subtree == '') {
+                    continue;
+                }
+                $code .= preg_replace('/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/', "<?php echo '\$1'; ?>\n",
+                                      $subtree);
+                continue;
+            }
+            if ($this->subtrees[$key] instanceof Smarty_Internal_ParseTree_Tag) {
+                $subtree = $this->subtrees[$key]->to_smarty_php($parser);
+                while ($key + 1 < $cnt && ($this->subtrees[$key + 1] instanceof Smarty_Internal_ParseTree_Tag ||
+                        $this->subtrees[$key + 1]->data == '')) {
+                    $key ++;
+                    if ($this->subtrees[$key]->data == '') {
+                        continue;
+                    }
+                    $subtree = $parser->compiler->appendCode($subtree, $this->subtrees[$key]->to_smarty_php($parser));
+                }
+                if ($subtree == '') {
+                    continue;
+                }
+                $code .= $subtree;
+                continue;
+            }
+            $code .= $this->subtrees[$key]->to_smarty_php($parser);
+        }
+        return $code;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_parsetree_text.php b/library/Smarty/libs/sysplugins/smarty_internal_parsetree_text.php
new file mode 100644
index 000000000..b3100fa09
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_parsetree_text.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ *             *
+ *             template text
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create template text buffer
+     *
+     * @param string $data text
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string text
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return $this->data;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_resource_eval.php b/library/Smarty/libs/sysplugins/smarty_internal_resource_eval.php
index 1c64b7cf5..aca710350 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_resource_eval.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_resource_eval.php
@@ -73,11 +73,11 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
      *
      * @param  Smarty  $smarty        Smarty instance
      * @param  string  $resource_name resource_name to make unique
-     * @param  boolean $is_config     flag for config resource
+     * @param  boolean $isConfig      flag for config resource
      *
      * @return string unique resource name
      */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false)
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
         return get_class($this) . '#' . $this->decode($resource_name);
     }
@@ -89,7 +89,7 @@ class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
      *
      * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return '';
     }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_resource_extends.php b/library/Smarty/libs/sysplugins/smarty_internal_resource_extends.php
index c78dba512..0c0802d62 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_resource_extends.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_resource_extends.php
@@ -39,25 +39,24 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
         $components = explode('|', $source->name);
         $exists = true;
         foreach ($components as $component) {
-            $s = Smarty_Resource::source(null, $source->smarty, $component);
-            if ($s->type == 'php') {
-                throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type");
+            /* @var \Smarty_Template_Source $_s */
+            $_s = Smarty_Template_Source::load(null, $source->smarty, $component);
+            if ($_s->type == 'php') {
+                throw new SmartyException("Resource type {$_s->type} cannot be used with the extends resource type");
             }
-            $sources[$s->uid] = $s;
-            $uid .= realpath($s->filepath);
-            if ($_template && $_template->smarty->compile_check) {
-                $exists = $exists && $s->exists;
+            $sources[$_s->uid] = $_s;
+            $uid .= $_s->filepath;
+            if ($_template) {
+                $exists = $exists && $_s->exists;
             }
         }
         $source->components = $sources;
-        $source->filepath = $s->filepath;
+        $source->filepath = $_s->filepath;
         $source->uid = sha1($uid);
-        if ($_template && $_template->smarty->compile_check) {
-            $source->timestamp = $s->timestamp;
-            $source->exists = $exists;
+        $source->exists = $exists;
+        if ($_template) {
+            $source->timestamp = $_s->timestamp;
         }
-        // need the template at getContent()
-        $source->template = $_template;
     }
 
     /**
@@ -68,10 +67,11 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
     public function populateTimestamp(Smarty_Template_Source $source)
     {
         $source->exists = true;
-        foreach ($source->components as $s) {
-            $source->exists = $source->exists && $s->exists;
+        /* @var \Smarty_Template_Source $_s */
+        foreach ($source->components as $_s) {
+            $source->exists = $source->exists && $_s->exists;
         }
-        $source->timestamp = $s->timestamp;
+        $source->timestamp = $source->exists ? $_s->getTimeStamp() : false;
     }
 
     /**
@@ -91,9 +91,10 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
         $_components = array_reverse($source->components);
 
         $_content = '';
-        foreach ($_components as $_component) {
+        /* @var \Smarty_Template_Source $_s */
+        foreach ($_components as $_s) {
             // read content
-            $_content .= $_component->content;
+            $_content .= $_s->getContent();
         }
         return $_content;
     }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_resource_file.php b/library/Smarty/libs/sysplugins/smarty_internal_resource_file.php
index 0abdc4495..b15e3cc6a 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_resource_file.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_resource_file.php
@@ -18,6 +18,97 @@
 class Smarty_Internal_Resource_File extends Smarty_Resource
 {
     /**
+     * build template filepath by traversing the template_dir array
+     *
+     * @param Smarty_Template_Source    $source    source object
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return string fully qualified filepath
+     * @throws SmartyException
+     */
+    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    {
+        $file = $source->name;
+        // absolute file ?
+        if ($file[0] == '/' || $file[1] == ':') {
+            $file = $source->smarty->_realpath($file, true);
+            return is_file($file) ? $file : false;
+        }
+        // go relative to a given template?
+        if ($file[0] == '.' && $_template && isset($_template->parent) && $_template->parent->_objType == 2 &&
+            preg_match('#^[.]{1,2}[\\\/]#', $file)
+        ) {
+            if ($_template->parent->source->type != 'file' && $_template->parent->source->type != 'extends' &&
+                !isset($_template->parent->_cache['allow_relative_path'])
+            ) {
+                throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
+            }
+            $path = dirname($_template->parent->source->filepath) . DS . $file;
+            // normalize path
+            $path = $source->smarty->_realpath($path);
+            // files relative to a template only get one shot
+            return is_file($path) ? $path : false;
+        }
+        // normalize DS
+        if (strpos($file, DS == '/' ? '\\' : '/') !== false) {
+            $file = str_replace(DS == '/' ? '\\' : '/', DS, $file);
+        }
+
+        $_directories = $source->smarty->getTemplateDir(null, $source->isConfig);
+        // template_dir index?
+        if ($file[0] == '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) {
+            $file = $fileMatch[2];
+            $_indices = explode(',', $fileMatch[1]);
+            $_index_dirs = array();
+            foreach ($_indices as $index) {
+                $index = trim($index);
+                // try string indexes
+                if (isset($_directories[$index])) {
+                    $_index_dirs[] = $_directories[$index];
+                } elseif (is_numeric($index)) {
+                    // try numeric index
+                    $index = (int) $index;
+                    if (isset($_directories[$index])) {
+                        $_index_dirs[] = $_directories[$index];
+                    } else {
+                        // try at location index
+                        $keys = array_keys($_directories);
+                        if (isset($_directories[$keys[$index]])) {
+                            $_index_dirs[] = $_directories[$keys[$index]];
+                        }
+                    }
+                }
+            }
+            if (empty($_index_dirs)) {
+                // index not found
+                return false;
+            } else {
+                $_directories = $_index_dirs;
+            }
+        }
+
+        // relative file name?
+        foreach ($_directories as $_directory) {
+            $path = $_directory . $file;
+            if (is_file($path)) {
+                return (strpos($path, '.' . DS) !== false) ? $source->smarty->_realpath($path) : $path;
+            }
+        }
+        if (!isset($_index_dirs)) {
+            // Could be relative to cwd
+            $path = $source->smarty->_realpath($file, true);
+            if (is_file($path)) {
+                return $path;
+            }
+        }
+        // Use include path ?
+        if ($source->smarty->use_include_path) {
+            return $source->smarty->ext->_getIncludePath->getIncludePath($_directories, $file, $source->smarty);
+        }
+        return false;
+    }
+
+    /**
      * populate Source Object with meta data from Resource
      *
      * @param Smarty_Template_Source   $source    source object
@@ -28,15 +119,17 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
         $source->filepath = $this->buildFilepath($source, $_template);
 
         if ($source->filepath !== false) {
-            if (is_object($source->smarty->security_policy)) {
-                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
+            if (isset($source->smarty->security_policy) && is_object($source->smarty->security_policy)) {
+                $source->smarty->security_policy->isTrustedResourceDir($source->filepath, $source->isConfig);
             }
-
-            $source->uid = sha1(realpath($source->filepath));
-            if ($source->smarty->compile_check && !isset($source->timestamp)) {
-                $source->timestamp = @filemtime($source->filepath);
-                $source->exists = !!$source->timestamp;
+            $source->exists = true;
+            $source->uid = sha1($source->filepath);
+            if ($source->smarty->compile_check == 1) {
+                $source->timestamp = filemtime($source->filepath);
             }
+        } else {
+            $source->timestamp = false;
+            $source->exists = false;
         }
     }
 
@@ -47,8 +140,12 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
      */
     public function populateTimestamp(Smarty_Template_Source $source)
     {
-        $source->timestamp = @filemtime($source->filepath);
-        $source->exists = !!$source->timestamp;
+        if (!$source->exists) {
+            $source->timestamp = $source->exists = is_file($source->filepath);
+        }
+        if ($source->exists) {
+            $source->timestamp = filemtime($source->filepath);
+        }
     }
 
     /**
@@ -61,13 +158,11 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
      */
     public function getContent(Smarty_Template_Source $source)
     {
-        if ($source->timestamp) {
+        if ($source->exists) {
             return file_get_contents($source->filepath);
         }
-        if ($source instanceof Smarty_Config_Source) {
-            throw new SmartyException("Unable to read config {$source->type} '{$source->name}'");
-        }
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+        throw new SmartyException('Unable to read ' . ($source->isConfig ? 'config' : 'template') .
+                                  " {$source->type} '{$source->name}'");
     }
 
     /**
@@ -79,11 +174,6 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
      */
     public function getBasename(Smarty_Template_Source $source)
     {
-        $_file = $source->name;
-        if (($_pos = strpos($_file, ']')) !== false) {
-            $_file = substr($_file, $_pos + 1);
-        }
-
-        return basename($_file);
+        return basename($source->filepath);
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_resource_php.php b/library/Smarty/libs/sysplugins/smarty_internal_resource_php.php
index 7463c2960..62680625c 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_resource_php.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_resource_php.php
@@ -9,9 +9,15 @@
  * @author     Uwe Tews
  * @author     Rodney Rehm
  */
-class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled
+class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File
 {
     /**
+     * Flag that it's an uncompiled resource
+     *
+     * @var bool
+     */
+    public $uncompiled = true;
+    /**
      * container for short_open_tag directive's value before executing PHP templates
      *
      * @var string
@@ -19,50 +25,20 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled
     protected $short_open_tag;
 
     /**
-     * Create a new PHP Resource
-
-     */
-    public function __construct()
-    {
-        $this->short_open_tag = ini_get('short_open_tag');
-    }
-
-    /**
-     * populate Source Object with meta data from Resource
+     * Resource does implement populateCompiledFilepath() method
      *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
+     * @var bool
      */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->filepath = $this->buildFilepath($source, $_template);
-
-        if ($source->filepath !== false) {
-            if (is_object($source->smarty->security_policy)) {
-                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
-            }
+    public $hasCompiledHandler = true;
 
-            $source->uid = sha1($source->filepath);
-            if ($source->smarty->compile_check) {
-                $source->timestamp = @filemtime($source->filepath);
-                $source->exists = !!$source->timestamp;
-            }
-        }
-    }
 
     /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return void
+     * Create a new PHP Resource
+
      */
-    public function populateTimestamp(Smarty_Template_Source $source)
+    public function __construct()
     {
-        $source->timestamp = @filemtime($source->filepath);
-        $source->exists = !!$source->timestamp;
+        $this->short_open_tag = ini_get('short_open_tag');
     }
 
     /**
@@ -75,7 +51,7 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled
      */
     public function getContent(Smarty_Template_Source $source)
     {
-        if ($source->timestamp) {
+        if ($source->exists) {
             return '';
         }
         throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
@@ -96,7 +72,7 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled
             throw new SmartyException("PHP templates are disabled");
         }
         if (!$source->exists) {
-            if ($_template->parent instanceof Smarty_Internal_Template) {
+            if (isset($_template->parent) && $_template->parent->_objType == 2) {
                 $parent_resource = " in '{$_template->parent->template_resource}'";
             } else {
                 $parent_resource = '';
@@ -116,4 +92,17 @@ class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled
         include($source->filepath);
         ini_set('short_open_tag', $this->short_open_tag);
     }
+
+    /**
+     * populate compiled object with compiled filepath
+     *
+     * @param Smarty_Template_Compiled $compiled  compiled object
+     * @param Smarty_Internal_Template $_template template object (is ignored)
+     */
+    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+    {
+        $compiled->filepath = false;
+        $compiled->timestamp = false;
+        $compiled->exists = false;
+    }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_resource_registered.php b/library/Smarty/libs/sysplugins/smarty_internal_resource_registered.php
index f12d843e1..69b396b6a 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_resource_registered.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_resource_registered.php
@@ -76,12 +76,13 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource
     public function getContent(Smarty_Template_Source $source)
     {
         // return template string
-        $t = call_user_func_array($source->smarty->registered_resources[$source->type][0][0], array($source->name, &$source->content, $source->smarty));
+        $content = null;
+        $t = call_user_func_array($source->smarty->registered_resources[$source->type][0][0], array($source->name, &$content, $source->smarty));
         if (is_bool($t) && !$t) {
             throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
         }
 
-        return $source->content;
+        return $content;
     }
 
     /**
@@ -91,7 +92,7 @@ class Smarty_Internal_Resource_Registered extends Smarty_Resource
      *
      * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return basename($source->name);
     }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_resource_stream.php b/library/Smarty/libs/sysplugins/smarty_internal_resource_stream.php
index f7d1aac31..8a902268c 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_resource_stream.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_resource_stream.php
@@ -70,11 +70,11 @@ class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled
      *
      * @param Smarty   $smarty        Smarty instance
      * @param string   $resource_name resource_name to make unique
-     * @param  boolean $is_config     flag for config resource
+     * @param  boolean $isConfig      flag for config resource
      *
      * @return string unique resource name
      */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false)
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
         return get_class($this) . '#' . $resource_name;
     }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_resource_string.php b/library/Smarty/libs/sysplugins/smarty_internal_resource_string.php
index bfa069974..75e99e6fb 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_resource_string.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_resource_string.php
@@ -73,11 +73,11 @@ class Smarty_Internal_Resource_String extends Smarty_Resource
      *
      * @param  Smarty  $smarty        Smarty instance
      * @param  string  $resource_name resource_name to make unique
-     * @param  boolean $is_config     flag for config resource
+     * @param  boolean $isConfig      flag for config resource
      *
      * @return string unique resource name
      */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false)
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
         return get_class($this) . '#' . $this->decode($resource_name);
     }
@@ -90,7 +90,7 @@ class Smarty_Internal_Resource_String extends Smarty_Resource
      *
      * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return '';
     }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php
new file mode 100644
index 000000000..4e2fb83e6
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Inline Runtime Methods render, setSourceByUid, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_CacheModify
+{
+    /**
+     * check client side cache
+     *
+     * @param Smarty_Internal_Template $_template
+     * @param  string                  $content
+     */
+    public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+        $_isCached = $_template->isCached() && !$_template->compiled->has_nocache_code;
+        $_last_modified_date =
+            @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
+        if ($_isCached && $cached->timestamp <= strtotime($_last_modified_date)) {
+            switch (PHP_SAPI) {
+                case 'cgi': // php-cgi < 5.3
+                case 'cgi-fcgi': // php-cgi >= 5.3
+                case 'fpm-fcgi': // php-fpm >= 5.3.3
+                    header('Status: 304 Not Modified');
+                    break;
+
+                case 'cli':
+                    if ( /* ^phpunit */
+                    !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+                    ) {
+                        $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
+                    }
+                    break;
+
+                default:
+                    if ( /* ^phpunit */
+                    !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+                    ) {
+                        $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
+                    } else {
+                        header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
+                    }
+                    break;
+            }
+        } else {
+            switch (PHP_SAPI) {
+                case 'cli':
+                    if ( /* ^phpunit */
+                    !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+                    ) {
+                        $_SERVER['SMARTY_PHPUNIT_HEADERS'][] =
+                            'Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT';
+                    }
+                    break;
+                default:
+                    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT');
+                    break;
+            }
+            echo $content;
+        }
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
new file mode 100644
index 000000000..21e6e5221
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Smarty Internal Extension
+ * This file contains the Smarty template extension to create a code frame
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class Smarty_Internal_Extension_CodeFrame
+ * Create code frame for compiled and cached templates
+ */
+class Smarty_Internal_Runtime_CodeFrame
+{
+    /**
+     * Create code frame for compiled and cached templates
+     *
+     * @param Smarty_Internal_Template              $_template
+     * @param string                                $content optional template content
+     * @param string                                $functions compiled template function and block code
+     * @param bool                                  $cache   flag for cache file
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     *
+     * @return string
+     */
+    public function create(Smarty_Internal_Template $_template, $content = '', $functions = '', $cache = false,
+                           Smarty_Internal_TemplateCompilerBase $compiler = null)
+    {
+        // build property code
+        $properties[ 'has_nocache_code' ] = $_template->compiled->has_nocache_code;
+        $properties[ 'version' ] = Smarty::SMARTY_VERSION;
+        $properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+        if (!$cache) {
+            $properties[ 'file_dependency' ] = $_template->compiled->file_dependency;
+            $properties[ 'includes' ] = $_template->compiled->includes;
+            if (!empty($compiler->tpl_function)) {
+                $properties[ 'tpl_function' ] = $compiler->tpl_function;
+            }
+        } else {
+            $properties[ 'file_dependency' ] = $_template->cached->file_dependency;
+            $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
+            if (!empty($_template->tpl_function)) {
+                $properties[ 'tpl_function' ] = $_template->tpl_function;
+            }
+        }
+        $output = "<?php\n";
+        $output .= "/* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") .
+            "\n  from \"" . $_template->source->filepath . "\" */\n\n";
+
+        $dec = "\$_smarty_tpl->smarty->ext->_validateCompiled->decodeProperties(\$_smarty_tpl, " .
+            var_export($properties, true) . ',' . ($cache ? 'true' : 'false') . ")";
+        $output .= "if ({$dec}) {\n";
+        $output .= "function {$properties['unifunc']} (\$_smarty_tpl) {\n";
+        // include code for plugins
+        if (!$cache) {
+            if (!empty($_template->compiled->required_plugins[ 'compiled' ])) {
+                foreach ($_template->compiled->required_plugins[ 'compiled' ] as $tmp) {
+                    foreach ($tmp as $data) {
+                        $file = addslashes($data[ 'file' ]);
+                        if (is_array($data[ 'function' ])) {
+                            $output .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n";
+                        } else {
+                            $output .= "if (!is_callable('{$data['function']}')) require_once '{$file}';\n";
+                        }
+                    }
+                }
+            }
+            if ($_template->caching && !empty($_template->compiled->required_plugins[ 'nocache' ])) {
+                $_template->compiled->has_nocache_code = true;
+                $output .= "echo '/*%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
+                foreach ($_template->compiled->required_plugins[ 'nocache' ] as $tmp) {
+                    foreach ($tmp as $data) {
+                        $file = addslashes($data[ 'file' ]);
+                        if (is_Array($data[ 'function' ])) {
+                            $output .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) require_once '{$file}';\n");
+                        } else {
+                            $output .= addslashes("if (!is_callable('{$data['function']}')) require_once '{$file}';\n");
+                        }
+                    }
+                }
+                $output .= "?>/*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%*/';\n";
+            }
+        }
+        $output .= "?>\n";
+        $output .= $content;
+        $output .= "<?php }\n?>";
+        $output .= $functions;
+        $output .= "<?php }\n";
+        // remove unneeded PHP tags
+        return preg_replace('/\s*\?>[\n]?<\?php\s*/', "\n", $output);
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_filter_handler.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php
index 4f0f3981c..9af266758 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_filter_handler.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php
@@ -14,7 +14,7 @@
  * @package    Smarty
  * @subpackage PluginsInternal
  */
-class Smarty_Internal_Filter_Handler
+class Smarty_Internal_Runtime_FilterHandler
 {
     /**
      * Run filters over content
@@ -30,38 +30,40 @@ class Smarty_Internal_Filter_Handler
      * @throws SmartyException
      * @return string                   the filtered content
      */
-    public static function runFilter($type, $content, Smarty_Internal_Template $template)
+    public function runFilter($type, $content, Smarty_Internal_Template $template)
     {
-        $output = $content;
         // loop over autoload filters of specified type
         if (!empty($template->smarty->autoload_filters[$type])) {
             foreach ((array) $template->smarty->autoload_filters[$type] as $name) {
                 $plugin_name = "Smarty_{$type}filter_{$name}";
-                if ($template->smarty->loadPlugin($plugin_name)) {
+                if (function_exists($plugin_name)) {
+                    $callback = $plugin_name;
+                } elseif (class_exists($plugin_name, false) && is_callable(array($plugin_name, 'execute'))) {
+                    $callback = array($plugin_name, 'execute');
+                } elseif ($template->smarty->loadPlugin($plugin_name, false)) {
                     if (function_exists($plugin_name)) {
                         // use loaded Smarty2 style plugin
-                        $output = $plugin_name($output, $template);
-                    } elseif (class_exists($plugin_name, false)) {
+                        $callback = $plugin_name;
+                    } elseif (class_exists($plugin_name, false) && is_callable(array($plugin_name, 'execute'))) {
                         // loaded class of filter plugin
-                        $output = call_user_func(array($plugin_name, 'execute'), $output, $template);
+                        $callback = array($plugin_name, 'execute');
+                    } else {
+                        throw new SmartyException("Auto load {$type}-filter plugin method \"{$plugin_name}::execute\" not callable");
                     }
                 } else {
                     // nothing found, throw exception
-                    throw new SmartyException("Unable to load filter {$plugin_name}");
+                    throw new SmartyException("Unable to auto load {$type}-filter plugin \"{$plugin_name}\"");
                 }
+                $content = call_user_func($callback, $content, $template);
             }
         }
-        // loop over registerd filters of specified type
+        // loop over registered filters of specified type
         if (!empty($template->smarty->registered_filters[$type])) {
             foreach ($template->smarty->registered_filters[$type] as $key => $name) {
-                if (is_array($template->smarty->registered_filters[$type][$key])) {
-                    $output = call_user_func($template->smarty->registered_filters[$type][$key], $output, $template);
-                } else {
-                    $output = $template->smarty->registered_filters[$type][$key]($output, $template);
-                }
+                $content = call_user_func($template->smarty->registered_filters[$type][$key], $content, $template);
             }
         }
         // return filtered output
-        return $output;
+        return $content;
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_runtime_foreach.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_foreach.php
new file mode 100644
index 000000000..87bb0cf4a
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_foreach.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Foreach Runtime Methods count
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_Foreach
+{
+    /**
+     * [util function] counts an array, arrayAccess/traversable or PDOStatement object
+     *
+     * @param  mixed $value
+     *
+     * @return int   the count for arrays and objects that implement countable, 1 for other objects that don't, and 0
+     *               for empty elements
+     */
+    public function count($value)
+    {
+        if (is_array($value) === true || $value instanceof Countable) {
+            return count($value);
+        } elseif ($value instanceof IteratorAggregate) {
+            // Note: getIterator() returns a Traversable, not an Iterator
+            // thus rewind() and valid() methods may not be present
+            return iterator_count($value->getIterator());
+        } elseif ($value instanceof Iterator) {
+            return iterator_count($value);
+        } elseif ($value instanceof PDOStatement) {
+            return $value->rowCount();
+        } elseif ($value instanceof Traversable) {
+            return iterator_count($value);
+        } elseif ($value instanceof ArrayAccess) {
+            if ($value->offsetExists(0)) {
+                return 1;
+            }
+        } elseif (is_object($value)) {
+            return count($value);
+        }
+        return 0;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php
new file mode 100644
index 000000000..72149cd35
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Smarty read include path plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Monte Ohrt
+ */
+
+/**
+ * Smarty Internal Read Include Path Class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_GetIncludePath
+{
+    /**
+     * include path cache
+     *
+     * @var string
+     */
+    public $_include_path = '';
+
+    /**
+     * include path directory cache
+     *
+     * @var array
+     */
+    public $_include_dirs = array();
+
+    /**
+     * include path directory cache
+     *
+     * @var array
+     */
+    public $_user_dirs = array();
+
+    /**
+     * stream cache
+     *
+     * @var string[]
+     */
+    public $isFile = array();
+
+    /**
+     * stream cache
+     *
+     * @var string[]
+     */
+    public $isPath = array();
+
+    /**
+     * stream cache
+     *
+     * @var int[]
+     */
+    public $number = array();
+
+    /**
+     * status cache
+     *
+     * @var bool
+     */
+    public $_has_stream_include = null;
+
+    /**
+     * Number for array index
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Check if include path was updated
+     *
+     * @param \Smarty $smarty
+     *
+     * @return bool
+     */
+    public function isNewIncludePath(Smarty $smarty)
+    {
+        $_i_path = get_include_path();
+        if ($this->_include_path != $_i_path) {
+            $this->_include_dirs = array();
+            $this->_include_path = $_i_path;
+            $_dirs = (array) explode(PATH_SEPARATOR, $_i_path);
+            foreach ($_dirs as $_path) {
+                if (is_dir($_path)) {
+                    $this->_include_dirs[] = $smarty->_realpath($_path . DS, true);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * return array with include path directories
+     *
+     * @param \Smarty $smarty
+     *
+     * @return array
+     */
+    public function getIncludePathDirs(Smarty $smarty)
+    {
+        $this->isNewIncludePath($smarty);
+        return $this->_include_dirs;
+    }
+
+    /**
+     * Return full file path from PHP include_path
+     *
+     * @param  string[] $dirs
+     * @param  string   $file
+     * @param \Smarty   $smarty
+     *
+     * @return bool|string full filepath or false
+     *
+     */
+    public function getIncludePath($dirs, $file, Smarty $smarty)
+    {
+        //if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = false)) {
+           if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = function_exists('stream_resolve_include_path'))) {
+                $this->isNewIncludePath($smarty);
+        }
+        // try PHP include_path
+        foreach ($dirs as $dir) {
+            $dir_n = isset($this->number[$dir]) ? $this->number[$dir] : $this->number[$dir] = $this->counter ++;
+            if (isset($this->isFile[$dir_n][$file])) {
+                if ($this->isFile[$dir_n][$file]) {
+                    return $this->isFile[$dir_n][$file];
+                } else {
+                    continue;
+                }
+            }
+            if (isset($this->_user_dirs[$dir_n])) {
+                if (false === $this->_user_dirs[$dir_n]) {
+                    continue;
+                } else {
+                    $dir = $this->_user_dirs[$dir_n];
+                }
+            } else {
+                if ($dir[0] == '/' || $dir[1] == ':') {
+                    $dir = str_ireplace(getcwd(), '.', $dir);
+                    if ($dir[0] == '/' || $dir[1] == ':') {
+                        $this->_user_dirs[$dir_n] = false;
+                        continue;
+                    }
+                }
+                $dir = substr($dir, 2);
+                $this->_user_dirs[$dir_n] = $dir;
+            }
+            if ($this->_has_stream_include) {
+                $path = stream_resolve_include_path($dir . (isset($file) ? $file : ''));
+                if ($path) {
+                    return $this->isFile[$dir_n][$file] = $path;
+                }
+            } else {
+                foreach ($this->_include_dirs as $key => $_i_path) {
+                    $path = isset($this->isPath[$key][$dir_n]) ? $this->isPath[$key][$dir_n] : $this->isPath[$key][$dir_n] = is_dir($_dir_path = $_i_path .
+                        $dir) ? $_dir_path : false;
+                    if ($path === false) {
+                        continue;
+                    }
+                    if (isset($file)) {
+                        $_file = $this->isFile[$dir_n][$file] = (is_file($path . $file)) ? $path . $file : false;
+                        if ($_file) {
+                            return $_file;
+                        }
+                    } else {
+                        // no file was given return directory path
+                        return $path;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_runtime_hhvm.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_hhvm.php
new file mode 100644
index 000000000..117cd8166
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_hhvm.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Runtime Extension Hhvm
+ *
+ * include patch for modified compiled or cached templates
+ * HHVM does not check if file was modified when including same file multiple times
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Runtime_Hhvm
+{
+    /**
+     * @param \Smarty_Internal_Template $_template
+     * @param string                    $file file name
+     *
+     * @return mixed
+     */
+    static function includeHhvm(Smarty_Internal_Template $_template, $file)
+    {
+        $_smarty_tpl = $_template;
+        $tmp_file = $file . preg_replace('![^\w]+!', '_', uniqid(rand(), true)) . '.php';
+        file_put_contents($tmp_file, file_get_contents($file));
+        $result = @include $tmp_file;
+        @unlink($tmp_file);
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php
new file mode 100644
index 000000000..ed21281d0
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php
@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * Inheritance Runtime Methods processBlock, endChild, init
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_Inheritance
+{
+
+    /**
+     * State machine
+     * - 0 idle next extends will create a new inheritance tree
+     * - 1 processing child template
+     * - 2 wait for next inheritance template
+     * - 3 assume parent template, if child will loaded goto state 1
+     *     a call to a sub template resets the state to 0
+     *
+     * @var int
+     */
+    public $state = 0;
+
+    /**
+     * Array of block parameter of known {block} tags
+     *
+     * @var array
+     */
+    public $blockParameter = array();
+
+    /**
+     * inheritance template nesting level
+     *
+     * @var int
+     */
+    public $inheritanceLevel = 0;
+
+    /**
+     * inheritance template index
+     *
+     * @var int
+     */
+    public $tplIndex = - 1;
+
+    /**
+     * Array of compiled template file path
+     * - key template index
+     * only used when caching is enabled
+     *
+     * @var []string
+     */
+    public $compiledFilePath = array();
+
+    /**
+     * Current {block} nesting level
+     *
+     * @var int
+     */
+    public $blockNesting = 0;
+
+    /**
+     * Initialize inheritance
+     *
+     * @param \Smarty_Internal_Template $tpl        template object of caller
+     * @param bool                      $initChild  if true init for child template
+     * @param array                     $blockNames outer level block name
+     *
+     */
+    public function init(Smarty_Internal_Template $tpl, $initChild, $blockNames = array())
+    {
+        // if template was from an inner block or template is a parent template create new inheritance root
+        if ($initChild && ($this->blockNesting || $this->state == 3)) {
+            $tpl->ext->_inheritance = new Smarty_Internal_Runtime_Inheritance();
+            $tpl->ext->_inheritance->init($tpl, $initChild, $blockNames);
+            return;
+        }
+        // start of child sub template(s)
+        if ($initChild) {
+            $this->state = 1;
+            if (!$this->inheritanceLevel) {
+                //grab any output of child templates
+                ob_start();
+            }
+            $this->inheritanceLevel ++;
+        }
+        // in parent state {include} will not increment template index
+        if ($this->state != 3) {
+            $this->tplIndex ++;
+        }
+        // if state was waiting for parent change state to parent
+        if ($this->state == 2) {
+            $this->state = 3;
+        }
+    }
+
+    /**
+     * End of child template(s)
+     * - if outer level is reached flush output buffer and switch to wait for parent template state
+     *
+     * @param \Smarty_Internal_Template $tpl template object of caller
+     */
+    public function endChild(Smarty_Internal_Template $tpl)
+    {
+        $this->inheritanceLevel --;
+        if (!$this->inheritanceLevel) {
+            ob_end_clean();
+            $this->state = 2;
+        }
+    }
+
+    /**
+     * Process inheritance {block} tag
+     *
+     * $type 0 = {block}:
+     *  - search in inheritance template hierarchy for child blocks
+     *    if found call it, otherwise call current block
+     *  - ignored for outer level blocks in child templates
+     *
+     * $type 1 = {block}:
+     *  - nested {block}
+     *  - search in inheritance template hierarchy for child blocks
+     *    if found call it, otherwise call current block
+     *
+     * $type 2 = {$smarty.block.child}:
+     *  - search in inheritance template hierarchy for child blocks
+     *    if found call it, otherwise ignore
+     *
+     * $type 3 = {$smarty.block.parent}:
+     *  - get block id from parent stack and call parent block
+     *
+     * @param \Smarty_Internal_Template $tpl       template object of caller
+     * @param int                       $type      call type see above
+     * @param string                    $name      block name
+     * @param array                     $block     block parameter
+     * @param array                     $callStack call stack with block parameters
+     *
+     * @throws \SmartyException
+     */
+    public function processBlock(Smarty_Internal_Template $tpl, $type = 0, $name, $block, $callStack = array())
+    {
+        if (!isset($this->blockParameter[$name])) {
+            $this->blockParameter[$name] = array();
+        }
+        if ($this->state == 1) {
+            $block[2] = count($this->blockParameter[$name]);
+            $block[3] = $this->tplIndex;
+            $this->blockParameter[$name][] = $block;
+            return;
+        }
+        if ($type == 3) {
+            if (!empty($callStack)) {
+                array_shift($callStack);
+                if (empty($callStack)) {
+                    throw new SmartyException("inheritance: tag {\$smarty.block.parent} used in parent template block '{$name}'");
+                }
+                $block = array_shift($callStack);
+            } else {
+                return;
+            }
+        } else {
+            $blockParameter = &$this->blockParameter[$name];
+            if ($type == 0) {
+                $index = $block[2] = count($blockParameter);
+                $block[3] = $this->tplIndex;
+                $callStack = array(&$block);
+            } elseif ($type == 1) {
+                $block[3] = $callStack[0][3];
+                $index = 0;
+                for ($i = 0; $i < count($blockParameter); $i ++) {
+                    if ($blockParameter[$i][3] <= $block[3]) {
+                        $index = $blockParameter[$i][2];
+                    }
+                }
+                $block[2] = $index;
+                $callStack = array(&$block);
+            } else {
+                $index = $callStack[0][2];
+                if ($index == 0) {
+                    return;
+                }
+                $callStack = $block = array(1 => false);
+            }
+            $index --;
+            // find lowest level child block
+            while ($index >= 0 && ($type || !$block[1])) {
+                $block = &$blockParameter[$index];
+                array_unshift($callStack, $block);
+                if ($block[1]) {
+                    break;
+                }
+                $index --;
+            }
+            if (isset($block['hide']) && $index <= 0) {
+                return;
+            }
+        }
+        $this->blockNesting ++;
+        if (isset($block['append'])) {
+            $this->processBlock($tpl, 3, $name, null, $callStack);
+        }
+        if (isset($block[6])) {
+            $block[6]($tpl, $callStack);
+        } else {
+            $block[0]($tpl, $callStack);
+        }
+        if (isset($block['prepend'])) {
+            $this->processBlock($tpl, 3, $name, null, $callStack);
+        }
+        $this->blockNesting --;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php
new file mode 100644
index 000000000..2c7623f93
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_subtemplate.php
@@ -0,0 +1,203 @@
+<?php
+
+/**
+ * Sub Template Runtime Methods render, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_SubTemplate
+{
+
+    /**
+     * Subtemplate template object cache
+     *
+     * @var Smarty_Internal_Template[]
+     */
+    public $tplObjects = array();
+
+    /**
+     * Subtemplate call count
+     *
+     * @var int[]
+     */
+    public $subTplInfo = array();
+
+    /**
+     * Runtime function to render subtemplate
+     *
+     * @param \Smarty_Internal_Template $parent
+     * @param string                    $template       template name
+     * @param mixed                     $cache_id       cache id
+     * @param mixed                     $compile_id     compile id
+     * @param integer                   $caching        cache mode
+     * @param integer                   $cache_lifetime life time of cache data
+     * @param array                     $data           passed parameter template variables
+     * @param int                       $scope          scope in which {include} should execute
+     * @param bool                      $forceTplCache  cache template object
+     * @param string                    $uid            file dependency uid
+     * @param string                    $content_func   function name
+     *
+     */
+    public function render(Smarty_Internal_Template $parent, $template, $cache_id, $compile_id, $caching,
+                           $cache_lifetime, $data, $scope, $forceTplCache, $uid = null, $content_func = null)
+    {
+        // if there are cached template objects calculate $templateID
+        $_templateId =
+            !empty($this->tplObjects) ? $parent->smarty->_getTemplateId($template, $cache_id, $compile_id, $caching) :
+                null;
+        // already in template cache?
+        /* @var Smarty_Internal_Template $tpl */
+        if (isset($_templateId) && isset($this->tplObjects[$_templateId])) {
+            // clone cached template object because of possible recursive call
+            $tpl = clone $this->tplObjects[$_templateId];
+            $tpl->parent = $parent;
+            // if $caching mode changed the compiled resource is invalid
+            if ((bool) $tpl->caching !== (bool) $caching) {
+                unset($tpl->compiled);
+            }
+            // get variables from calling scope
+            $tpl->tpl_vars = $parent->tpl_vars;
+            $tpl->config_vars = $parent->config_vars;
+            // get template functions
+            $tpl->tpl_function = $parent->tpl_function;
+            // copy inheritance object?
+            if (isset($parent->ext->_inheritance)) {
+                $tpl->ext->_inheritance = $parent->ext->_inheritance;
+            } else {
+                unset($tpl->ext->_inheritance);
+            }
+        } else {
+            $tpl = clone $parent;
+            $tpl->parent = $parent;
+            if (!isset($tpl->templateId) || $tpl->templateId !== $_templateId) {
+                $tpl->templateId = $_templateId;
+                $tpl->template_resource = $template;
+                $tpl->cache_id = $cache_id;
+                $tpl->compile_id = $compile_id;
+                if (isset($uid)) {
+                    // for inline templates we can get all resource information from file dependency
+                    if (isset($tpl->compiled->file_dependency[$uid])) {
+                        list($filepath, $timestamp, $resource) = $tpl->compiled->file_dependency[$uid];
+                        $tpl->source =
+                            new Smarty_Template_Source(isset($tpl->smarty->_cache['resource_handlers'][$resource]) ?
+                                                           $tpl->smarty->_cache['resource_handlers'][$resource] :
+                                                           Smarty_Resource::load($tpl->smarty, $resource), $tpl->smarty,
+                                                       $filepath, $resource, $filepath);
+                        $tpl->source->filepath = $filepath;
+                        $tpl->source->timestamp = $timestamp;
+                        $tpl->source->exists = true;
+                        $tpl->source->uid = $uid;
+                    } else {
+                        $tpl->source = null;
+                    }
+                } else {
+                    $tpl->source = null;
+                }
+                if (!isset($tpl->source)) {
+                    $tpl->source = Smarty_Template_Source::load($tpl);
+                    unset($tpl->compiled);
+                }
+                unset($tpl->cached);
+            }
+        }
+        $tpl->caching = $caching;
+        $tpl->cache_lifetime = $cache_lifetime;
+        if ($caching == 9999) {
+            $tpl->cached = $parent->cached;
+        }
+        // set template scope
+        $tpl->scope = $scope;
+        $scopePtr = false;
+        if ($scope & ~Smarty::SCOPE_BUBBLE_UP) {
+            if ($scope == Smarty::SCOPE_GLOBAL) {
+                $tpl->tpl_vars = Smarty::$global_tpl_vars;
+                $tpl->config_vars = $tpl->smarty->config_vars;
+                $scopePtr = true;
+            } else {
+                if ($scope == Smarty::SCOPE_PARENT) {
+                    $scopePtr = $parent;
+                } elseif ($scope == Smarty::SCOPE_SMARTY) {
+                    $scopePtr = $tpl->smarty;
+                } else {
+                    $scopePtr = $tpl;
+                    while (isset($scopePtr->parent)) {
+                        if ($scopePtr->parent->_objType != 2 && $scope & Smarty::SCOPE_TPL_ROOT) {
+                            break;
+                        }
+                        $scopePtr = $scopePtr->parent;
+                    }
+                }
+                $tpl->tpl_vars = $scopePtr->tpl_vars;
+                $tpl->config_vars = $scopePtr->config_vars;
+            }
+        }
+
+        if (!isset($this->tplObjects[$tpl->_getTemplateId()]) && !$tpl->source->handler->recompiled) {
+            // if template is called multiple times set flag to to cache template objects
+            $forceTplCache = $forceTplCache ||
+                (isset($this->subTplInfo[$tpl->template_resource]) && $this->subTplInfo[$tpl->template_resource] > 1);
+            // check if template object should be cached
+            if ($tpl->parent->_objType == 2 && isset($this->tplObjects[$tpl->parent->templateId]) ||
+                ($forceTplCache && $tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_AUTOMATIC) ||
+                ($tpl->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
+            ) {
+                $this->tplObjects[$tpl->_getTemplateId()] = $tpl;
+            }
+        }
+
+        if (!empty($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[$_key] = new Smarty_Variable($_val);
+            }
+        }
+        if (isset($uid)) {
+            if ($parent->smarty->debugging) {
+                $parent->smarty->_debug->start_template($tpl);
+                $parent->smarty->_debug->start_render($tpl);
+            }
+            $tpl->compiled->getRenderedTemplateCode($tpl, $content_func);
+            if ($parent->smarty->debugging) {
+                $parent->smarty->_debug->end_template($tpl);
+                $parent->smarty->_debug->end_render($tpl);
+            }
+            if ($tpl->caching == 9999 && $tpl->compiled->has_nocache_code) {
+                $parent->cached->hashes[$tpl->compiled->nocache_hash] = true;
+            }
+        } else {
+            if (isset($tpl->compiled)) {
+                $tpl->compiled->render($tpl);
+            } else {
+                $tpl->render();
+            }
+        }
+        if ($scopePtr) {
+            if ($scope == Smarty::SCOPE_GLOBAL) {
+                Smarty::$global_tpl_vars = $tpl->tpl_vars;
+                $tpl->smarty->config_vars = $tpl->config_vars;
+            } else {
+                $scopePtr->tpl_vars = $tpl->tpl_vars;
+                $scopePtr->config_vars = $tpl->config_vars;
+            }
+        }
+    }
+
+    /**
+     * Get called subtemplates from compiled template and save call count
+     *
+     * @param \Smarty_Internal_Template $tpl
+     */
+    public function registerSubTemplates(Smarty_Internal_Template $tpl)
+    {
+        foreach ($tpl->compiled->includes as $name => $count) {
+            if (isset($this->subTplInfo[$name])) {
+                $this->subTplInfo[$name] += $count;
+            } else {
+                $this->subTplInfo[$name] = $count;
+            }
+        }
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php
new file mode 100644
index 000000000..cc529c633
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * Tplfunc Runtime Methods callTemplateFunction
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_TplFunction
+{
+    /**
+     * Call template function
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string                    $name    template function name
+     * @param array                     $params  parameter array
+     * @param bool                      $nocache true if called nocache
+     *
+     * @throws \SmartyException
+     */
+    public function callTemplateFunction(\Smarty_Internal_Template $tpl, $name, $params, $nocache)
+    {
+        if (isset($tpl->tpl_function[$name])) {
+            if (!$tpl->caching || ($tpl->caching && $nocache)) {
+                $function = $tpl->tpl_function[$name]['call_name'];
+            } else {
+                if (isset($tpl->tpl_function[$name]['call_name_caching'])) {
+                    $function = $tpl->tpl_function[$name]['call_name_caching'];
+                } else {
+                    $function = $tpl->tpl_function[$name]['call_name'];
+                }
+            }
+            if (function_exists($function)) {
+                $function ($tpl, $params);
+                return;
+            }
+            // try to load template function dynamically
+            if ($this->addTplFuncToCache($tpl, $name, $function)) {
+                $function ($tpl, $params);
+                return;
+            }
+        }
+        throw new SmartyException("Unable to find template function '{$name}'");
+    }
+
+    /**
+     *
+     * Add template function to cache file for nocache calls
+     *
+     * @param Smarty_Internal_Template $tpl
+     * @param string                   $_name     template function name
+     * @param string                   $_function PHP function name
+     *
+     * @return bool
+     */
+    public function addTplFuncToCache(Smarty_Internal_Template $tpl, $_name, $_function)
+    {
+        $funcParam = $tpl->tpl_function[$_name];
+        if (is_file($funcParam['compiled_filepath'])) {
+            // read compiled file
+            $code = file_get_contents($funcParam['compiled_filepath']);
+            // grab template function
+            if (preg_match("/\/\* {$_function} \*\/([\S\s]*?)\/\*\/ {$_function} \*\//", $code, $match)) {
+                // grab source info from file dependency
+                preg_match("/\s*'{$funcParam['uid']}'([\S\s]*?)\),/", $code, $match1);
+                unset($code);
+                // make PHP function known
+                eval($match[0]);
+                if (function_exists($_function)) {
+                    // search cache file template
+                    $tplPtr = $tpl;
+                    while (!isset($tplPtr->cached) && isset($tplPtr->parent)) {
+                        $tplPtr = $tplPtr->parent;
+                    }
+                    // add template function code to cache file
+                    if (isset($tplPtr->cached)) {
+                        $cache = $tplPtr->cached;
+                        $content = $cache->read($tplPtr);
+                        if ($content) {
+                            // check if we must update file dependency
+                            if (!preg_match("/'{$funcParam['uid']}'(.*?)'nocache_hash'/", $content, $match2)) {
+                                $content = preg_replace("/('file_dependency'(.*?)\()/", "\\1{$match1[0]}", $content);
+                            }
+                            $tplPtr->smarty->ext->_updateCache->write($cache, $tplPtr, preg_replace('/\s*\?>\s*$/', "\n", $content) . "\n" .
+                                                 preg_replace(array('/^\s*<\?php\s+/', '/\s*\?>\s*$/'), "\n",
+                                                              $match[0]));
+                        }
+                    }
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php
new file mode 100644
index 000000000..73de954f3
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php
@@ -0,0 +1,184 @@
+<?php
+
+/**
+ * Inline Runtime Methods render, setSourceByUid, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_UpdateCache
+{
+    /**
+     * check client side cache
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param  string                  $content
+     */
+    public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+    }
+
+    /**
+     * Sanitize content and write it to cache resource
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param bool                     $no_output_filter
+     *
+     * @throws \SmartyException
+     */
+    public function removeNoCacheHash(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template,
+                                      $no_output_filter)
+    {
+        $content = ob_get_clean();
+        unset($cached->hashes[$_template->compiled->nocache_hash]);
+        if (!empty($cached->hashes)) {
+            $hash_array = array();
+            foreach ($cached->hashes as $hash => $foo) {
+                $hash_array[] = "/{$hash}/";
+            }
+            $content = preg_replace($hash_array, $_template->compiled->nocache_hash, $content);
+        }
+        $_template->cached->has_nocache_code = false;
+        // get text between non-cached items
+        $cache_split =
+            preg_split("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s",
+                       $content);
+        // get non-cached items
+        preg_match_all("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s",
+                       $content, $cache_parts);
+        $content = '';
+        // loop over items, stitch back together
+        foreach ($cache_split as $curr_idx => $curr_split) {
+            // escape PHP tags in template content
+            $content .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/',
+                                     "<?php echo '\$1'; ?>\n", $curr_split);
+            if (isset($cache_parts[0][$curr_idx])) {
+                $_template->cached->has_nocache_code = true;
+                $content .= $cache_parts[1][$curr_idx];
+            }
+        }
+        if (!$no_output_filter && !$_template->compiled->has_nocache_code &&
+            (isset($_template->smarty->autoload_filters['output']) ||
+                isset($_template->smarty->registered_filters['output']))
+        ) {
+            $content = $_template->smarty->ext->_filterHandler->runFilter('output', $content, $_template);
+        }
+        // write cache file content
+        $this->writeCachedContent($cached, $_template, $content);
+    }
+
+    /**
+     * Cache was invalid , so render from compiled and write to cache
+     * 
+     * @param \Smarty_Template_Cached   $cached
+     * @param \Smarty_Internal_Template $_template
+     * @param                           $no_output_filter
+     *
+     * @throws \Exception
+     */
+    public function updateCache(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $no_output_filter)
+    {
+        if ($_template->source->handler->uncompiled) {
+            ob_start();
+            $_template->source->render($_template);
+        } else {
+            ob_start();
+            if (!isset($_template->compiled)) {
+                $_template->loadCompiled();
+            }
+            $_template->compiled->render($_template);
+        }
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->start_cache($_template);
+        }
+        $this->removeNoCacheHash($cached, $_template, $no_output_filter);
+        $compile_check = $_template->smarty->compile_check;
+        $_template->smarty->compile_check = false;
+        if (isset($_template->parent) && $_template->parent->_objType == 2) {
+            $_template->compiled->unifunc = $_template->parent->compiled->unifunc;
+        }
+        if (!$_template->cached->processed) {
+            $_template->cached->process($_template, true);
+        }
+        $_template->smarty->compile_check = $compile_check;
+        $cached->getRenderedTemplateCode($_template);
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->end_cache($_template);
+        }
+    }
+
+    /**
+     * Writes the content to cache resource
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param string                   $content
+     *
+     * @return bool
+     */
+    public function writeCachedContent(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+        if ($_template->source->handler->recompiled || !($_template->caching == Smarty::CACHING_LIFETIME_CURRENT ||
+                $_template->caching == Smarty::CACHING_LIFETIME_SAVED)
+        ) {
+            // don't write cache file
+            return false;
+        }
+        $content = $_template->smarty->ext->_codeFrame->create($_template, $content, '', true);
+        if (!empty($_template->cached->tpl_function)) {
+            foreach ($_template->cached->tpl_function as $funcParam) {
+                if (is_file($funcParam['compiled_filepath'])) {
+                    // read compiled file
+                    $code = file_get_contents($funcParam['compiled_filepath']);
+                    // grab template function
+                    if (preg_match("/\/\* {$funcParam['call_name']} \*\/([\S\s]*?)\/\*\/ {$funcParam['call_name']} \*\//",
+                                   $code, $match)) {
+                        unset($code);
+                        $content .= "<?php " . $match[0] . "?>\n";
+                    }
+                }
+            }
+        }
+        return $this->write($cached, $_template, $content);
+    }
+
+    /**
+     * Write this cache object to handler
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return bool success
+     */
+    public function write(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+        if (!$_template->source->handler->recompiled) {
+            if ($cached->handler->writeCachedContent($_template, $content)) {
+                $cached->content = null;
+                $cached->timestamp = time();
+                $cached->exists = true;
+                $cached->valid = true;
+                $cached->cache_lifetime = $_template->cache_lifetime;
+                $cached->processed = false;
+                if ($_template->smarty->cache_locking) {
+                    $cached->handler->releaseLock($_template->smarty, $cached);
+                }
+
+                return true;
+            }
+            $cached->content = null;
+            $cached->timestamp = false;
+            $cached->exists = false;
+            $cached->valid = false;
+            $cached->processed = false;
+        }
+
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php
new file mode 100644
index 000000000..3d80c859a
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Runtime Methods updateScope
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_UpdateScope
+{
+    /**
+     * Update new assigned template variable in other effected scopes
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string $varName variable name
+     * @param int    $scope   scope to which bubble up variable value
+     */
+    public function updateScope(\Smarty_Internal_Template $tpl, $varName, $scope = Smarty::SCOPE_LOCAL)
+    {
+        if (!$scope && !$tpl->scope) {
+            return;
+        }
+        foreach (array($scope, $tpl->scope) as $s) {
+            $s = ($bubble_up = $s >= Smarty::SCOPE_BUBBLE_UP) ? $s - Smarty::SCOPE_BUBBLE_UP : $s;
+            if ($bubble_up && $s) {
+                $ptr = $tpl->parent;
+                if (isset($ptr)) {
+                    $ptr->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                    $ptr = $ptr->parent;
+                }
+                if ($s == Smarty::SCOPE_PARENT) {
+                    continue;
+                }
+                while (isset($ptr) && $ptr->_objType == 2) {
+                    $ptr->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                    $ptr = $ptr->parent;
+                }
+                if ($s == Smarty::SCOPE_TPL_ROOT) {
+                    continue;
+                } elseif ($s == Smarty::SCOPE_SMARTY) {
+                    $tpl->smarty->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                } elseif ($s == Smarty::SCOPE_GLOBAL) {
+                    Smarty::$global_tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                } elseif ($s == Smarty::SCOPE_ROOT) {
+                    while (isset($ptr->parent)) {
+                        $ptr = $ptr->parent;
+                    }
+                    $ptr->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
+                }
+            }
+        }
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php
new file mode 100644
index 000000000..6624eb0bf
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_validatecompiled.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * Runtime Methods decodeProperties
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_ValidateCompiled
+{
+    /**
+     * This function is executed automatically when a compiled or cached template file is included
+     * - Decode saved properties from compiled template and cache files
+     * - Check if compiled or cache file is valid
+     *
+     * @param  array $properties special template properties
+     * @param  bool  $cache      flag if called from cache file
+     *
+     * @return bool  flag if compiled or cache file is valid
+     */
+    public function decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
+    {
+        $is_valid = true;
+        if (Smarty::SMARTY_VERSION != $properties['version']) {
+            // new version must rebuild
+            $is_valid = false;
+        } elseif ($is_valid && !empty($properties['file_dependency']) &&
+            ((!$cache && $tpl->smarty->compile_check) || $tpl->smarty->compile_check == 1)
+        ) {
+            // check file dependencies at compiled code
+            foreach ($properties['file_dependency'] as $_file_to_check) {
+                if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'extends' || $_file_to_check[2] == 'php') {
+                    if ($tpl->source->filepath == $_file_to_check[0]) {
+                        // do not recheck current template
+                        continue;
+                        //$mtime = $tpl->source->getTimeStamp();
+                    } else {
+                        // file and php types can be checked without loading the respective resource handlers
+                        $mtime = is_file($_file_to_check[0]) ? filemtime($_file_to_check[0]) : false;
+                    }
+                } elseif ($_file_to_check[2] == 'string') {
+                    continue;
+                } else {
+                    $source = Smarty_Template_Source::load(null, $tpl->smarty, $_file_to_check[0]);
+                    $mtime = $source->getTimeStamp();
+                }
+                if (!$mtime || $mtime > $_file_to_check[1]) {
+                    $is_valid = false;
+                    break;
+                }
+            }
+        }
+        if ($cache) {
+            // CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
+            if ($tpl->caching === Smarty::CACHING_LIFETIME_SAVED && $properties['cache_lifetime'] >= 0 &&
+                (time() > ($tpl->cached->timestamp + $properties['cache_lifetime']))
+            ) {
+                $is_valid = false;
+            }
+            $tpl->cached->cache_lifetime = $properties['cache_lifetime'];
+            $tpl->cached->valid = $is_valid;
+            $resource = $tpl->cached;
+        } else {
+            $tpl->mustCompile = !$is_valid;
+            $resource = $tpl->compiled;
+            $resource->includes = isset($properties['includes']) ? $properties['includes'] : array();
+        }
+        if ($is_valid) {
+            $resource->unifunc = $properties['unifunc'];
+            $resource->has_nocache_code = $properties['has_nocache_code'];
+            //            $tpl->compiled->nocache_hash = $properties['nocache_hash'];
+            $resource->file_dependency = $properties['file_dependency'];
+            if (isset($properties['tpl_function'])) {
+                $tpl->tpl_function = $properties['tpl_function'];
+            }
+        }
+        return $is_valid && !function_exists($properties['unifunc']);
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_runtime_var.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_var.php
new file mode 100644
index 000000000..fe4f94d91
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_var.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Runtime Methods createLocalArrayVariable
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ **/
+class Smarty_Internal_Runtime_Var
+{
+    /**
+     * Template code runtime function to create a local Smarty variable for array assignments
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string                    $varName template variable name
+     * @param bool                      $nocache cache mode of variable
+     */
+    public function createLocalArrayVariable(\Smarty_Internal_Template $tpl, $varName, $nocache = false)
+    {
+        if (!isset($tpl->tpl_vars[$varName])) {
+            $tpl->tpl_vars[$varName] = new Smarty_Variable(array(), $nocache);
+        } else {
+            $tpl->tpl_vars[$varName] = clone $tpl->tpl_vars[$varName];
+            if (!(is_array($tpl->tpl_vars[$varName]->value) ||
+                $tpl->tpl_vars[$varName]->value instanceof ArrayAccess)
+            ) {
+                settype($tpl->tpl_vars[$varName]->value, 'array');
+            }
+        }
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_write_file.php b/library/Smarty/libs/sysplugins/smarty_internal_runtime_writefile.php
index f46fe2b6c..05c973783 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_write_file.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_runtime_writefile.php
@@ -13,7 +13,7 @@
  * @package    Smarty
  * @subpackage PluginsInternal
  */
-class Smarty_Internal_Write_File
+class Smarty_Internal_Runtime_WriteFile
 {
     /**
      * Writes file in a safe way to disk
@@ -25,18 +25,20 @@ class Smarty_Internal_Write_File
      * @throws SmartyException
      * @return boolean true
      */
-    public static function writeFile($_filepath, $_contents, Smarty $smarty)
+    public function writeFile($_filepath, $_contents, Smarty $smarty)
     {
         $_error_reporting = error_reporting();
         error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
-        if ($smarty->_file_perms !== null) {
+        $_file_perms = property_exists($smarty, '_file_perms') ? $smarty->_file_perms : 0644;
+        $_dir_perms = property_exists($smarty, '_dir_perms') ? (isset($smarty->_dir_perms) ? $smarty->_dir_perms : 0777)  : 0771;
+        if ($_file_perms !== null) {
             $old_umask = umask(0);
         }
 
         $_dirpath = dirname($_filepath);
         // if subdirs, create dir structure
         if ($_dirpath !== '.' && !file_exists($_dirpath)) {
-            mkdir($_dirpath, $smarty->_dir_perms === null ? 0777 : $smarty->_dir_perms, true);
+            mkdir($_dirpath, $_dir_perms, true);
         }
 
         // write to tmp file, then move to overt file lock race condition
@@ -55,7 +57,9 @@ class Smarty_Internal_Write_File
          */
         if (Smarty::$_IS_WINDOWS) {
             // remove original file
-            @unlink($_filepath);
+            if (is_file($_filepath)) {
+                @unlink($_filepath);
+            }
             // rename tmp file
             $success = @rename($_tmp_file, $_filepath);
         } else {
@@ -63,20 +67,20 @@ class Smarty_Internal_Write_File
             $success = @rename($_tmp_file, $_filepath);
             if (!$success) {
                 // remove original file
-                @unlink($_filepath);
+                if (is_file($_filepath)) {
+                    @unlink($_filepath);
+                }
                 // rename tmp file
                 $success = @rename($_tmp_file, $_filepath);
             }
         }
-
         if (!$success) {
             error_reporting($_error_reporting);
             throw new SmartyException("unable to write file {$_filepath}");
         }
-
-        if ($smarty->_file_perms !== null) {
+        if ($_file_perms !== null) {
             // set file permissions
-            chmod($_filepath, $smarty->_file_perms);
+            chmod($_filepath, $_file_perms);
             umask($old_umask);
         }
         error_reporting($_error_reporting);
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/library/Smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
index 50bd16ef2..116bbea7b 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
@@ -9,11 +9,6 @@
  */
 
 /**
- * @ignore
- */
-include 'smarty_internal_parsetree.php';
-
-/**
  * Class SmartyTemplateCompiler
  *
  * @package    Smarty
@@ -36,32 +31,32 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
     public $parser_class;
 
     /**
-     * Lexer object
+     * array of vars which can be compiled in local scope
      *
-     * @var object
+     * @var array
      */
-    public $lex;
+    public $local_var = array();
 
     /**
-     * Parser object
+     * array of callbacks called when the normal compile process of template is finished
      *
-     * @var object
+     * @var array
      */
-    public $parser;
+    public $postCompileCallbacks = array();
 
     /**
-     * Smarty object
+     * prefix code
      *
-     * @var object
+     * @var string
      */
-    public $smarty;
+    public $prefixCompiledCode = '';
 
     /**
-     * array of vars which can be compiled in local scope
+     * postfix code
      *
-     * @var array
+     * @var string
      */
-    public $local_var = array();
+    public $postfixCompiledCode = '';
 
     /**
      * Initialize compiler
@@ -70,10 +65,9 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
      * @param string $parser_class class name
      * @param Smarty $smarty       global instance
      */
-    public function __construct($lexer_class, $parser_class, $smarty)
+    public function __construct($lexer_class, $parser_class, Smarty $smarty)
     {
-        $this->smarty = $smarty;
-        parent::__construct();
+        parent::__construct($smarty);
         // get required plugins
         $this->lexer_class = $lexer_class;
         $this->parser_class = $parser_class;
@@ -83,20 +77,22 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
      * method to compile a Smarty template
      *
      * @param  mixed $_content template source
+     * @param bool   $isTemplateSource
      *
-     * @return bool  true if compiling succeeded, false if it failed
+     * @return bool true if compiling succeeded, false if it failed
+     * @throws \SmartyCompilerException
      */
-    protected function doCompile($_content)
+    protected function doCompile($_content, $isTemplateSource = false)
     {
         /* here is where the compiling takes place. Smarty
           tags in the templates are replaces with PHP code,
           then written to compiled files. */
         // init the lexer/parser to compile the template
-        $this->lex = new $this->lexer_class($_content, $this);
-        $this->parser = new $this->parser_class($this->lex, $this);
-        if ($this->inheritance_child) {
-            // start state on child templates
-            $this->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
+        $this->parser =
+            new $this->parser_class(new $this->lexer_class(str_replace(array("\r\n", "\r"), "\n", $_content), $this),
+                                    $this);
+        if ($isTemplateSource && $this->template->caching) {
+            $this->parser->insertPhpCode("<?php\n\$_smarty_tpl->compiled->nocache_hash = '{$this->nocache_hash}';\n?>\n");
         }
         if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
             $mbEncoding = mb_internal_encoding();
@@ -107,21 +103,17 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
 
         if ($this->smarty->_parserdebug) {
             $this->parser->PrintTrace();
-            $this->lex->PrintTrace();
+            $this->parser->lex->PrintTrace();
         }
         // get tokens from lexer and parse them
-        while ($this->lex->yylex() && !$this->abort_and_recompile) {
+        while ($this->parser->lex->yylex()) {
             if ($this->smarty->_parserdebug) {
-                echo "<pre>Line {$this->lex->line} Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token " .
-                    htmlentities($this->lex->value) . "</pre>";
+                echo "<pre>Line {$this->parser->lex->line} Parsing  {$this->parser->yyTokenName[$this->parser->lex->token]} Token " .
+                    htmlentities($this->parser->lex->value) . "</pre>";
             }
-            $this->parser->doParse($this->lex->token, $this->lex->value);
+            $this->parser->doParse($this->parser->lex->token, $this->parser->lex->value);
         }
 
-        if ($this->abort_and_recompile) {
-            // exit here on abort
-            return false;
-        }
         // finish parsing process
         $this->parser->doParse(0, 0);
         if ($mbEncoding) {
@@ -131,10 +123,47 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
         if (count($this->_tag_stack) > 0) {
             // get stacked info
             list($openTag, $_data) = array_pop($this->_tag_stack);
-            $this->trigger_template_error("unclosed {$this->smarty->left_delimiter}" . $openTag . "{$this->smarty->right_delimiter} tag");
+            $this->trigger_template_error("unclosed {$this->smarty->left_delimiter}" . $openTag .
+                                          "{$this->smarty->right_delimiter} tag");
+        }
+        // call post compile callbacks
+        foreach ($this->postCompileCallbacks as $cb) {
+            $parameter = $cb;
+            $parameter[0] = $this;
+            call_user_func_array($cb[0], $parameter);
         }
         // return compiled code
-        // return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue);
-        return $this->parser->retvalue;
+        return $this->prefixCompiledCode . $this->parser->retvalue . $this->postfixCompiledCode;
+    }
+
+    /**
+     * Register a post compile callback
+     * - when the callback is called after template compiling the compiler object will be inserted as first parameter
+     *
+     * @param callback $callback
+     * @param array    $parameter optional parameter array
+     * @param string   $key       optional key for callback
+     * @param bool     $replace   if true replace existing keyed callback
+     */
+    public function registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
+    {
+        array_unshift($parameter, $callback);
+        if (isset($key)) {
+            if ($replace || !isset($this->postCompileCallbacks[$key])) {
+                $this->postCompileCallbacks[$key] = $parameter;
+            }
+        } else {
+            $this->postCompileCallbacks[] = $parameter;
+        }
+    }
+
+    /**
+     * Remove a post compile callback
+     *
+     * @param string $key callback key
+     */
+    public function unregisterPostCompileCallback($key)
+    {
+        unset($this->postCompileCallbacks[$key]);
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_template.php b/library/Smarty/libs/sysplugins/smarty_internal_template.php
index f1a73a4ae..7c16a53db 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_template.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_template.php
@@ -13,120 +13,90 @@
  *
  * @package    Smarty
  * @subpackage Template
- * @property Smarty_Template_Source   $source
- * @property Smarty_Template_Compiled $compiled
- * @property Smarty_Template_Cached   $cached
+ *
+ * @property Smarty_Template_Source|Smarty_Template_Config $source
+ * @property Smarty_Template_Compiled                      $compiled
+ * @property Smarty_Template_Cached                        $cached
+ * @method bool mustCompile()
  */
 class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
 {
     /**
-     * cache_id
+     * This object type (Smarty = 1, template = 2, data = 4)
      *
-     * @var string
+     * @var int
      */
-    public $cache_id = null;
-    /**
-     * $compile_id
-     * @var string
-     */
-    public $compile_id = null;
+    public $_objType = 2;
+
     /**
-     * caching enabled
+     * Global smarty instance
      *
-     * @var boolean
+     * @var Smarty
      */
-    public $caching = null;
+    public $smarty = null;
+
     /**
-     * cache lifetime in seconds
+     * Source instance
      *
-     * @var integer
+     * @var Smarty_Template_Source|Smarty_Template_Config
      */
-    public $cache_lifetime = null;
+    public $source = null;
+
     /**
      * Template resource
      *
      * @var string
      */
     public $template_resource = null;
+
     /**
      * flag if compiled template is invalid and must be (re)compiled
      *
      * @var bool
      */
     public $mustCompile = null;
+
     /**
-     * flag if template does contain nocache code sections
-     *
-     * @var bool
-     */
-    public $has_nocache_code = false;
-    /**
-     * special compiled and cached template properties
-     *
-     * @var array
-     */
-    public $properties = array('file_dependency' => array(),
-                               'nocache_hash'    => '',
-                               'function'        => array());
-    /**
-     * required plugins
-     *
-     * @var array
-     */
-    public $required_plugins = array('compiled' => array(), 'nocache' => array());
-    /**
-     * Global smarty instance
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-    /**
-     * blocks for template inheritance
-     *
-     * @var array
-     */
-    public $block_data = array();
-    /**
-     * variable filters
+     * Template Id
      *
-     * @var array
+     * @var null|string
      */
-    public $variable_filters = array();
+    public $templateId = null;
+
     /**
-     * optional log of tag/attributes
+     * Known template functions
      *
      * @var array
      */
-    public $used_tags = array();
-    /**
-     * internal flag to allow relative path in child template blocks
-     *
-     * @var bool
-     */
-    public $allow_relative_path = false;
+    public $tpl_function = array();
+
     /**
-     * internal capture runtime stack
+     * Scope in which template is rendered
      *
-     * @var array
+     * @var int
      */
-    public $_capture_stack = array(0 => array());
+    public $scope = 0;
 
     /**
      * Create template data object
      * Some of the global Smarty settings copied to template scope
-     * It load the required template resources and cacher plugins
+     * It load the required template resources and caching plugins
+     *
+     * @param string                                                  $template_resource template resource string
+     * @param Smarty                                                  $smarty            Smarty instance
+     * @param \Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $_parent           back pointer to parent object
+     *                                                                                   with variables or null
+     * @param mixed                                                   $_cache_id         cache   id or null
+     * @param mixed                                                   $_compile_id       compile id or null
+     * @param bool                                                    $_caching          use caching?
+     * @param int                                                     $_cache_lifetime   cache life-time in seconds
      *
-     * @param string                   $template_resource template resource string
-     * @param Smarty                   $smarty            Smarty instance
-     * @param Smarty_Internal_Template $_parent           back pointer to parent object with variables or null
-     * @param mixed                    $_cache_id         cache   id or null
-     * @param mixed                    $_compile_id       compile id or null
-     * @param bool                     $_caching          use caching?
-     * @param int                      $_cache_lifetime   cache life-time in seconds
+     * @throws \SmartyException
      */
-    public function __construct($template_resource, $smarty, $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
+    public function __construct($template_resource, Smarty $smarty, Smarty_Internal_Data $_parent = null,
+                                $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
     {
-        $this->smarty = & $smarty;
+        $this->smarty = &$smarty;
         // Smarty parameter
         $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
         $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
@@ -138,499 +108,203 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
         $this->parent = $_parent;
         // Template resource
         $this->template_resource = $template_resource;
-        // copy block data of template inheritance
-        if ($this->parent instanceof Smarty_Internal_Template) {
-            $this->block_data = $this->parent->block_data;
-        }
+        $this->source = Smarty_Template_Source::load($this);
+        parent::__construct();
     }
 
     /**
-     * Returns if the current template must be compiled by the Smarty compiler
-     * It does compare the timestamps of template source and the compiled templates and checks the force compile configuration
+     * render template
      *
+     * @param  bool $merge_tpl_vars   if true parent template variables merged in to local scope
+     * @param  bool $no_output_filter if true do not run output filter
+     * @param  bool $display          true: display, false: fetch null: subtemplate
+     *
+     * @throws Exception
      * @throws SmartyException
-     * @return boolean true if the template must be compiled
+     * @return string rendered template output
      */
-    public function mustCompile()
+    public function render($no_output_filter = true, $display = null)
     {
+        $parentIsTpl = isset($this->parent) && $this->parent->_objType == 2;
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->start_template($this, $display);
+        }
+        // checks if template exists
         if (!$this->source->exists) {
-            if ($this->parent instanceof Smarty_Internal_Template) {
-                $parent_resource = " in '$this->parent->template_resource}'";
+            if ($parentIsTpl) {
+                $parent_resource = " in '{$this->parent->template_resource}'";
             } else {
                 $parent_resource = '';
             }
             throw new SmartyException("Unable to load template {$this->source->type} '{$this->source->name}'{$parent_resource}");
         }
-        if ($this->mustCompile === null) {
-            $this->mustCompile = (!$this->source->uncompiled && ($this->smarty->force_compile || $this->source->recompiled || $this->compiled->timestamp === false ||
-                    ($this->smarty->compile_check && $this->compiled->timestamp < $this->source->timestamp)));
+        // disable caching for evaluated code
+        if ($this->source->handler->recompiled) {
+            $this->caching = false;
+        }
+        // read from cache or render
+        $isCacheTpl =
+            $this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED;
+        if ($isCacheTpl) {
+            if (!isset($this->cached)) {
+                $this->loadCached();
+            }
+            $this->cached->render($this, $no_output_filter);
+        } elseif ($this->source->handler->uncompiled) {
+            $this->source->render($this);
+        } else {
+            if (!isset($this->compiled)) {
+                $this->loadCompiled();
+            }
+            $this->compiled->render($this);
         }
 
-        return $this->mustCompile;
-    }
-
-    /**
-     * Compiles the template
-     * If the template is not evaluated the compiled template is saved on disk
-     */
-    public function compileTemplateSource()
-    {
-        if (!$this->source->recompiled) {
-            $this->properties['file_dependency'] = array();
-            if ($this->source->components) {
-                // for the extends resource the compiler will fill it
-                // uses real resource for file dependency
-                // $source = end($this->source->components);
-                // $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $source->type);
+        // display or fetch
+        if ($display) {
+            if ($this->caching && $this->smarty->cache_modified_check) {
+                $this->smarty->ext->_cachemodify->cacheModifiedCheck($this->cached, $this,
+                                                                     isset($content) ? $content : ob_get_clean());
             } else {
-                $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $this->source->type);
+                if ((!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled) &&
+                    !$no_output_filter && (isset($this->smarty->autoload_filters['output']) ||
+                        isset($this->smarty->registered_filters['output']))
+                ) {
+                    echo $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
+                } else {
+                    ob_end_flush();
+                    flush();
+                }
             }
-        }
-        // compile locking
-        if ($this->smarty->compile_locking && !$this->source->recompiled) {
-            if ($saved_timestamp = $this->compiled->timestamp) {
-                touch($this->compiled->filepath);
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_template($this);
+                // debug output
+                $this->smarty->_debug->display_debug($this, true);
             }
-        }
-        // call compiler
-        try {
-            $code = $this->compiler->compileTemplate($this);
-        }
-        catch (Exception $e) {
-            // restore old timestamp in case of error
-            if ($this->smarty->compile_locking && !$this->source->recompiled && $saved_timestamp) {
-                touch($this->compiled->filepath, $saved_timestamp);
+            return '';
+        } else {
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_template($this);
+                if ($this->smarty->debugging === 2 && $display === false) {
+                    $this->smarty->_debug->display_debug($this, true);
+                }
             }
-            throw $e;
-        }
-        // compiling succeded
-        if (!$this->source->recompiled && $this->compiler->write_compiled_code) {
-            // write compiled template
-            $_filepath = $this->compiled->filepath;
-            if ($_filepath === false) {
-                throw new SmartyException('getCompiledFilepath() did not return a destination to save the compiled template to');
+            if ($parentIsTpl) {
+                if (!empty($this->tpl_function)) {
+                    $this->parent->tpl_function = array_merge($this->parent->tpl_function, $this->tpl_function);
+                }
+                foreach ($this->compiled->required_plugins as $code => $tmp1) {
+                    foreach ($tmp1 as $name => $tmp) {
+                        foreach ($tmp as $type => $data) {
+                            $this->parent->compiled->required_plugins[$code][$name][$type] = $data;
+                        }
+                    }
+                }
             }
-            Smarty_Internal_Write_File::writeFile($_filepath, $code, $this->smarty);
-            $this->compiled->exists = true;
-            $this->compiled->isCompiled = true;
-        }
-        // release compiler object to free memory
-        unset($this->compiler);
-    }
-
-    /**
-     * Writes the cached template output
-     *
-     * @param string $content
-     *
-     * @return bool
-     */
-    public function writeCachedContent($content)
-    {
-        if ($this->source->recompiled || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) {
-            // don't write cache file
-            return false;
+            if (!$no_output_filter &&
+                (!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled) &&
+                (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))
+            ) {
+                return $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
+            }
+            // return cache content
+            return null;
         }
-        $this->cached->timestamp = time();
-        $this->properties['cache_lifetime'] = $this->cache_lifetime;
-        $this->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-        $content = $this->createTemplateCodeFrame($content, true);
-        /** @var Smarty_Internal_Template $_smarty_tpl
-         * used in evaluated code
-         */
-        $_smarty_tpl = $this;
-        eval("?>" . $content);
-        $this->cached->valid = true;
-        $this->cached->processed = true;
-
-        return $this->cached->write($this, $content);
     }
 
     /**
-     * Template code runtime function to get subtemplate content
-     *
-     * @param string  $template       the resource handle of the template file
-     * @param mixed   $cache_id       cache id to be used with this template
-     * @param mixed   $compile_id     compile id to be used with this template
-     * @param integer $caching        cache mode
-     * @param integer $cache_lifetime life time of cache data
-     * @param         $data
-     * @param int     $parent_scope   scope in which {include} should execute
-     *
-     * @returns string template content
+     * Compiles the template
+     * If the template is not evaluated the compiled template is saved on disk
      */
-    public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope)
+    public function compileTemplateSource()
     {
-        // already in template cache?
-        if ($this->smarty->allow_ambiguous_resources) {
-            $_templateId = Smarty_Resource::getUniqueTemplateName($this, $template) . $cache_id . $compile_id;
-        } else {
-            $_templateId = $this->smarty->joined_template_dir . '#' . $template . $cache_id . $compile_id;
-        }
-
-        if (isset($_templateId[150])) {
-            $_templateId = sha1($_templateId);
-        }
-        if (isset($this->smarty->template_objects[$_templateId])) {
-            // clone cached template object because of possible recursive call
-            $tpl = clone $this->smarty->template_objects[$_templateId];
-            $tpl->parent = $this;
-            $tpl->caching = $caching;
-            $tpl->cache_lifetime = $cache_lifetime;
-        } else {
-            $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
-        }
-        // get variables from calling scope
-        if ($parent_scope == Smarty::SCOPE_LOCAL) {
-            $tpl->tpl_vars = $this->tpl_vars;
-            $tpl->tpl_vars['smarty'] = clone $this->tpl_vars['smarty'];
-        } elseif ($parent_scope == Smarty::SCOPE_PARENT) {
-            $tpl->tpl_vars = & $this->tpl_vars;
-        } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
-            $tpl->tpl_vars = & Smarty::$global_tpl_vars;
-        } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
-            $tpl->tpl_vars = & $this->tpl_vars;
-        } else {
-            $tpl->tpl_vars = & $scope_ptr->tpl_vars;
-        }
-        $tpl->config_vars = $this->config_vars;
-        if (!empty($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        }
-
-        return $tpl->fetch(null, null, null, null, false, false, true);
+        return $this->compiled->compileTemplateSource($this);
     }
 
     /**
-     * Template code runtime function to set up an inline subtemplate
+     * Writes the content to cache resource
      *
-     * @param string  $template       the resource handle of the template file
-     * @param mixed   $cache_id       cache id to be used with this template
-     * @param mixed   $compile_id     compile id to be used with this template
-     * @param integer $caching        cache mode
-     * @param integer $cache_lifetime life time of cache data
-     * @param         $data
-     * @param int     $parent_scope   scope in which {include} should execute
-     * @param string  $hash           nocache hash code
+     * @param string $content
      *
-     * @returns string template content
+     * @return bool
      */
-    public function setupInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash)
+    public function writeCachedContent($content)
     {
-        $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
-        $tpl->properties['nocache_hash'] = $hash;
-        // get variables from calling scope
-        if ($parent_scope == Smarty::SCOPE_LOCAL) {
-            $tpl->tpl_vars = $this->tpl_vars;
-            $tpl->tpl_vars['smarty'] = clone $this->tpl_vars['smarty'];
-        } elseif ($parent_scope == Smarty::SCOPE_PARENT) {
-            $tpl->tpl_vars = & $this->tpl_vars;
-        } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
-            $tpl->tpl_vars = & Smarty::$global_tpl_vars;
-        } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
-            $tpl->tpl_vars = & $this->tpl_vars;
-        } else {
-            $tpl->tpl_vars = & $scope_ptr->tpl_vars;
-        }
-        $tpl->config_vars = $this->config_vars;
-        if (!empty($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        }
-
-        return $tpl;
+        return $this->smarty->ext->_updateCache->writeCachedContent($this->cached, $this, $content);
     }
 
     /**
-     * Create code frame for compiled and cached templates
-     *
-     * @param  string $content optional template content
-     * @param  bool   $cache   flag for cache file
+     * Get unique template id
      *
      * @return string
      */
-    public function createTemplateCodeFrame($content = '', $cache = false)
+    public function _getTemplateId()
     {
-        $plugins_string = '';
-        // include code for plugins
-        if (!$cache) {
-            if (!empty($this->required_plugins['compiled'])) {
-                $plugins_string = '<?php ';
-                foreach ($this->required_plugins['compiled'] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $file = addslashes($data['file']);
-                        if (is_Array($data['function'])) {
-                            $plugins_string .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) include '{$file}';\n";
-                        } else {
-                            $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$file}';\n";
-                        }
-                    }
-                }
-                $plugins_string .= '?>';
-            }
-            if (!empty($this->required_plugins['nocache'])) {
-                $this->has_nocache_code = true;
-                $plugins_string .= "<?php echo '/*%%SmartyNocache:{$this->properties['nocache_hash']}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
-                foreach ($this->required_plugins['nocache'] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $file = addslashes($data['file']);
-                        if (is_Array($data['function'])) {
-                            $plugins_string .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) include '{$file}';\n");
-                        } else {
-                            $plugins_string .= addslashes("if (!is_callable('{$data['function']}')) include '{$file}';\n");
-                        }
-                    }
-                }
-                $plugins_string .= "?>/*/%%SmartyNocache:{$this->properties['nocache_hash']}%%*/';?>\n";
-            }
-        }
-        // build property code
-        $this->properties['has_nocache_code'] = $this->has_nocache_code;
-        $output = '';
-        if (!$this->source->recompiled) {
-            $output = "<?php /*%%SmartyHeaderCode:{$this->properties['nocache_hash']}%%*/";
-            if ($this->smarty->direct_access_security) {
-                $output .= "if(!defined('SMARTY_DIR')) exit('no direct access allowed');\n";
-            }
-        }
-        if ($cache) {
-            // remove compiled code of{function} definition
-            unset($this->properties['function']);
-            if (!empty($this->smarty->template_functions)) {
-                // copy code of {function} tags called in nocache mode
-                foreach ($this->smarty->template_functions as $name => $function_data) {
-                    if (isset($function_data['called_nocache'])) {
-                        foreach ($function_data['called_functions'] as $func_name) {
-                            $this->smarty->template_functions[$func_name]['called_nocache'] = true;
-                        }
-                    }
-                }
-                foreach ($this->smarty->template_functions as $name => $function_data) {
-                    if (isset($function_data['called_nocache'])) {
-                        unset($function_data['called_nocache'], $function_data['called_functions'], $this->smarty->template_functions[$name]['called_nocache']);
-                        $this->properties['function'][$name] = $function_data;
-                    }
-                }
-            }
-        }
-        $this->properties['version'] = Smarty::SMARTY_VERSION;
-        if (!isset($this->properties['unifunc'])) {
-            $this->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-        }
-        if (!$this->source->recompiled) {
-            $output .= "\$_valid = \$_smarty_tpl->decodeProperties(" . var_export($this->properties, true) . ',' . ($cache ? 'true' : 'false') . "); /*/%%SmartyHeaderCode%%*/?>\n";
-            $output .= '<?php if ($_valid && !is_callable(\'' . $this->properties['unifunc'] . '\')) {function ' . $this->properties['unifunc'] . '($_smarty_tpl) {?>';
-        }
-        $output .= $plugins_string;
-        $output .= $content;
-        if (!$this->source->recompiled) {
-            $output .= "<?php }} ?>\n";
-        }
-
-        return $output;
+        return isset($this->templateId) ? $this->templateId : $this->templateId =
+            $this->smarty->_getTemplateId($this->template_resource, $this->cache_id, $this->compile_id);
     }
 
     /**
-     * This function is executed automatically when a compiled or cached template file is included
-     * - Decode saved properties from compiled template and cache files
-     * - Check if compiled or cache file is valid
-     *
-     * @param  array $properties special template properties
-     * @param  bool  $cache      flag if called from cache file
-     *
-     * @return bool  flag if compiled or cache file is valid
+     * runtime error not matching capture tags
      */
-    public function decodeProperties($properties, $cache = false)
+    public function capture_error()
     {
-        $this->has_nocache_code = $properties['has_nocache_code'];
-        $this->properties['nocache_hash'] = $properties['nocache_hash'];
-        if (isset($properties['cache_lifetime'])) {
-            $this->properties['cache_lifetime'] = $properties['cache_lifetime'];
-        }
-        if (isset($properties['file_dependency'])) {
-            $this->properties['file_dependency'] = array_merge($this->properties['file_dependency'], $properties['file_dependency']);
-        }
-        if (!empty($properties['function'])) {
-            $this->properties['function'] = array_merge($this->properties['function'], $properties['function']);
-            $this->smarty->template_functions = array_merge($this->smarty->template_functions, $properties['function']);
-        }
-        $this->properties['version'] = (isset($properties['version'])) ? $properties['version'] : '';
-        $this->properties['unifunc'] = $properties['unifunc'];
-        // check file dependencies at compiled code
-        $is_valid = true;
-        if ($this->properties['version'] != Smarty::SMARTY_VERSION) {
-            $is_valid = false;
-        } elseif (((!$cache && $this->smarty->compile_check && empty($this->compiled->_properties) && !$this->compiled->isCompiled) || $cache && ($this->smarty->compile_check === true || $this->smarty->compile_check === Smarty::COMPILECHECK_ON)) && !empty($this->properties['file_dependency'])) {
-            foreach ($this->properties['file_dependency'] as $_file_to_check) {
-                if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'php') {
-                    if ($this->source->filepath == $_file_to_check[0] && isset($this->source->timestamp)) {
-                        // do not recheck current template
-                        $mtime = $this->source->timestamp;
-                    } else {
-                        // file and php types can be checked without loading the respective resource handlers
-                        $mtime = @filemtime($_file_to_check[0]);
-                    }
-                } elseif ($_file_to_check[2] == 'string') {
-                    continue;
-                } else {
-                    $source = Smarty_Resource::source(null, $this->smarty, $_file_to_check[0]);
-                    $mtime = $source->timestamp;
-                }
-                if (!$mtime || $mtime > $_file_to_check[1]) {
-                    $is_valid = false;
-                    break;
-                }
-            }
-        }
-        if ($cache) {
-            // CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
-            if ($this->caching === Smarty::CACHING_LIFETIME_SAVED &&
-                $this->properties['cache_lifetime'] >= 0 &&
-                (time() > ($this->cached->timestamp + $this->properties['cache_lifetime']))
-            ) {
-                $is_valid = false;
-            }
-            $this->cached->valid = $is_valid;
-        } else {
-            $this->mustCompile = !$is_valid;
-        }
-        // store data in reusable Smarty_Template_Compiled
-        if (!$cache) {
-            $this->compiled->_properties = $properties;
-        }
-
-        return $is_valid;
+        throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\"");
     }
 
     /**
-     * Template code runtime function to create a local Smarty variable for array assignments
+     * Load compiled object
      *
-     * @param string $tpl_var tempate variable name
-     * @param bool   $nocache cache mode of variable
-     * @param int    $scope   scope of variable
      */
-    public function createLocalArrayVariable($tpl_var, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
+    public function loadCompiled()
     {
-        if (!isset($this->tpl_vars[$tpl_var])) {
-            $this->tpl_vars[$tpl_var] = new Smarty_variable(array(), $nocache, $scope);
-        } else {
-            $this->tpl_vars[$tpl_var] = clone $this->tpl_vars[$tpl_var];
-            if ($scope != Smarty::SCOPE_LOCAL) {
-                $this->tpl_vars[$tpl_var]->scope = $scope;
-            }
-            if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-                settype($this->tpl_vars[$tpl_var]->value, 'array');
-            }
+        if (!isset($this->compiled)) {
+            $this->compiled = Smarty_Template_Compiled::load($this);
         }
     }
 
     /**
-     * Template code runtime function to get pointer to template variable array of requested scope
+     * Load cached object
      *
-     * @param  int $scope requested variable scope
-     *
-     * @return array array of template variables
      */
-    public function &getScope($scope)
+    public function loadCached()
     {
-        if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
-            return $this->parent->tpl_vars;
-        } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
-            $ptr = $this->parent;
-            while (!empty($ptr->parent)) {
-                $ptr = $ptr->parent;
-            }
-
-            return $ptr->tpl_vars;
-        } elseif ($scope == Smarty::SCOPE_GLOBAL) {
-            return Smarty::$global_tpl_vars;
+        if (!isset($this->cached)) {
+            $this->cached = Smarty_Template_Cached::load($this);
         }
-        $null = null;
-
-        return $null;
     }
 
     /**
-     * Get parent or root of template parent chain
-     *
-     * @param  int $scope pqrent or root scope
+     * Load compiler object
      *
-     * @return mixed object
+     * @throws \SmartyException
      */
-    public function getScopePointer($scope)
+    public function loadCompiler()
     {
-        if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
-            return $this->parent;
-        } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
-            $ptr = $this->parent;
-            while (!empty($ptr->parent)) {
-                $ptr = $ptr->parent;
-            }
-
-            return $ptr;
+        if (!class_exists($this->source->handler->compiler_class)) {
+            $this->smarty->loadPlugin($this->source->handler->compiler_class);
         }
-
-        return null;
+        $this->compiler = new $this->source->handler->compiler_class($this->source->handler->template_lexer_class,
+                                                                     $this->source->handler->template_parser_class,
+                                                                     $this->smarty);
     }
 
     /**
-     * [util function] counts an array, arrayaccess/traversable or PDOStatement object
+     * Handle unknown class methods
      *
-     * @param  mixed $value
+     * @param string $name unknown method-name
+     * @param array  $args argument array
      *
-     * @return int   the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 for empty elements
+     * @return mixed
+     * @throws SmartyException
      */
-    public function _count($value)
+    public function __call($name, $args)
     {
-        if (is_array($value) === true || $value instanceof Countable) {
-            return count($value);
-        } elseif ($value instanceof IteratorAggregate) {
-            // Note: getIterator() returns a Traversable, not an Iterator
-            // thus rewind() and valid() methods may not be present
-            return iterator_count($value->getIterator());
-        } elseif ($value instanceof Iterator) {
-            return iterator_count($value);
-        } elseif ($value instanceof PDOStatement) {
-            return $value->rowCount();
-        } elseif ($value instanceof Traversable) {
-            return iterator_count($value);
-        } elseif ($value instanceof ArrayAccess) {
-            if ($value->offsetExists(0)) {
-                return 1;
-            }
-        } elseif (is_object($value)) {
-            return count($value);
+        // method of Smarty object?
+        if (method_exists($this->smarty, $name)) {
+            return call_user_func_array(array($this->smarty, $name), $args);
         }
-
-        return 0;
-    }
-
-    /**
-     * runtime error not matching capture tags
-
-     */
-    public function capture_error()
-    {
-        throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\"");
-    }
-
-    /**
-     * Empty cache for this template
-     *
-     * @param integer $exp_time expiration time
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearCache($exp_time = null)
-    {
-        Smarty_CacheResource::invalidLoadedCache($this->smarty);
-
-        return $this->cached->handler->clear($this->smarty, $this->template_name, $this->cache_id, $this->compile_id, $exp_time);
+        // parent
+        return parent::__call($name, $args);
     }
 
     /**
@@ -644,23 +318,18 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
     public function __set($property_name, $value)
     {
         switch ($property_name) {
-            case 'source':
             case 'compiled':
             case 'cached':
             case 'compiler':
                 $this->$property_name = $value;
-
                 return;
-
-            // FIXME: routing of template -> smarty attributes
             default:
+                // Smarty property ?
                 if (property_exists($this->smarty, $property_name)) {
                     $this->smarty->$property_name = $value;
-
                     return;
                 }
         }
-
         throw new SmartyException("invalid template property '$property_name'.");
     }
 
@@ -669,65 +338,34 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
      *
      * @param string $property_name property name
      *
+     * @return mixed|Smarty_Template_Cached
      * @throws SmartyException
      */
     public function __get($property_name)
     {
         switch ($property_name) {
-            case 'source':
-                if (strlen($this->template_resource) == 0) {
-                    throw new SmartyException('Missing template name');
-                }
-                $this->source = Smarty_Resource::source($this);
-                // cache template object under a unique ID
-                // do not cache eval resources
-                if ($this->source->type != 'eval') {
-                    if ($this->smarty->allow_ambiguous_resources) {
-                        $_templateId = $this->source->unique_resource . $this->cache_id . $this->compile_id;
-                    } else {
-                        $_templateId = $this->smarty->joined_template_dir . '#' . $this->template_resource . $this->cache_id . $this->compile_id;
-                    }
-
-                    if (isset($_templateId[150])) {
-                        $_templateId = sha1($_templateId);
-                    }
-                    $this->smarty->template_objects[$_templateId] = $this;
-                }
-
-                return $this->source;
-
             case 'compiled':
-                $this->compiled = $this->source->getCompiled($this);
-
+                $this->loadCompiled();
                 return $this->compiled;
 
             case 'cached':
-                if (!class_exists('Smarty_Template_Cached')) {
-                    include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
-                }
-                $this->cached = new Smarty_Template_Cached($this);
-
+                $this->loadCached();
                 return $this->cached;
 
             case 'compiler':
-                $this->smarty->loadPlugin($this->source->compiler_class);
-                $this->compiler = new $this->source->compiler_class($this->source->template_lexer_class, $this->source->template_parser_class, $this->smarty);
-
+                $this->loadCompiler();
                 return $this->compiler;
-
-            // FIXME: routing of template -> smarty attributes
             default:
+                // Smarty property ?
                 if (property_exists($this->smarty, $property_name)) {
                     return $this->smarty->$property_name;
                 }
         }
-
         throw new SmartyException("template property '$property_name' does not exist.");
     }
 
     /**
      * Template data object destructor
-
      */
     public function __destruct()
     {
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_templatebase.php b/library/Smarty/libs/sysplugins/smarty_internal_templatebase.php
index f8f1c9e1e..9b4953dee 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_templatebase.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_templatebase.php
@@ -1,860 +1,316 @@
-<?php

-/**

- * Smarty Internal Plugin Smarty Template  Base

- * This file contains the basic shared methods for template handling

- *

- * @package    Smarty

- * @subpackage Template

- * @author     Uwe Tews

- */

-

-/**

- * Class with shared template methods

- *

- * @package    Smarty

- * @subpackage Template

- */

-abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data

-{

-    /**

-     * fetches a rendered Smarty template

-     *

-     * @param  string $template         the resource handle of the template file or template object

-     * @param  mixed  $cache_id         cache id to be used with this template

-     * @param  mixed  $compile_id       compile id to be used with this template

-     * @param  object $parent           next higher level of Smarty variables

-     * @param  bool   $display          true: display, false: fetch

-     * @param  bool   $merge_tpl_vars   if true parent template variables merged in to local scope

-     * @param  bool   $no_output_filter if true do not run output filter

-     *

-     * @throws Exception

-     * @throws SmartyException

-     * @return string rendered template output

-     */

-    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false)

-    {

-        if ($template === null && $this instanceof $this->template_class) {

-            $template = $this;

-        }

-        if ($cache_id !== null && is_object($cache_id)) {

-            $parent = $cache_id;

-            $cache_id = null;

-        }

-        if ($parent === null && ($this instanceof Smarty || is_string($template))) {

-            $parent = $this;

-        }

-        // create template object if necessary

-        $_template = ($template instanceof $this->template_class)

-            ? $template

-            : $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);

-        // if called by Smarty object make sure we use current caching status

-        if ($this instanceof Smarty) {

-            $_template->caching = $this->caching;

-        }

-        // merge all variable scopes into template

-        if ($merge_tpl_vars) {

-            // save local variables

-            $save_tpl_vars = $_template->tpl_vars;

-            $save_config_vars = $_template->config_vars;

-            $ptr_array = array($_template);

-            $ptr = $_template;

-            while (isset($ptr->parent)) {

-                $ptr_array[] = $ptr = $ptr->parent;

-            }

-            $ptr_array = array_reverse($ptr_array);

-            $parent_ptr = reset($ptr_array);

-            $tpl_vars = $parent_ptr->tpl_vars;

-            $config_vars = $parent_ptr->config_vars;

-            while ($parent_ptr = next($ptr_array)) {

-                if (!empty($parent_ptr->tpl_vars)) {

-                    $tpl_vars = array_merge($tpl_vars, $parent_ptr->tpl_vars);

-                }

-                if (!empty($parent_ptr->config_vars)) {

-                    $config_vars = array_merge($config_vars, $parent_ptr->config_vars);

-                }

-            }

-            if (!empty(Smarty::$global_tpl_vars)) {

-                $tpl_vars = array_merge(Smarty::$global_tpl_vars, $tpl_vars);

-            }

-            $_template->tpl_vars = $tpl_vars;

-            $_template->config_vars = $config_vars;

-        }

-        // dummy local smarty variable

-        if (!isset($_template->tpl_vars['smarty'])) {

-            $_template->tpl_vars['smarty'] = new Smarty_Variable;

-        }

-        if (isset($this->smarty->error_reporting)) {

-            $_smarty_old_error_level = error_reporting($this->smarty->error_reporting);

-        }

-        // check URL debugging control

-        if (!$this->smarty->debugging && $this->smarty->debugging_ctrl == 'URL') {

-            if (isset($_SERVER['QUERY_STRING'])) {

-                $_query_string = $_SERVER['QUERY_STRING'];

-            } else {

-                $_query_string = '';

-            }

-            if (false !== strpos($_query_string, $this->smarty->smarty_debug_id)) {

-                if (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=on')) {

-                    // enable debugging for this browser session

-                    setcookie('SMARTY_DEBUG', true);

-                    $this->smarty->debugging = true;

-                } elseif (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=off')) {

-                    // disable debugging for this browser session

-                    setcookie('SMARTY_DEBUG', false);

-                    $this->smarty->debugging = false;

-                } else {

-                    // enable debugging for this page

-                    $this->smarty->debugging = true;

-                }

-            } else {

-                if (isset($_COOKIE['SMARTY_DEBUG'])) {

-                    $this->smarty->debugging = true;

-                }

-            }

-        }

-        // must reset merge template date

-        $_template->smarty->merged_templates_func = array();

-        // get rendered template

-        // disable caching for evaluated code

-        if ($_template->source->recompiled) {

-            $_template->caching = false;

-        }

-        // checks if template exists

-        if (!$_template->source->exists) {

-            if ($_template->parent instanceof Smarty_Internal_Template) {

-                $parent_resource = " in '{$_template->parent->template_resource}'";

-            } else {

-                $parent_resource = '';

-            }

-            throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");

-        }

-        // read from cache or render

-        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || !$_template->cached->valid) {

-            // render template (not loaded and not in cache)

-            if (!$_template->source->uncompiled) {

-                /** @var Smarty_Internal_Template $_smarty_tpl

-                 * used in evaluated code

-                 */

-                $_smarty_tpl = $_template;

-                if ($_template->source->recompiled) {

-                    $code = $_template->compiler->compileTemplate($_template);

-                    if ($this->smarty->debugging) {

-                        Smarty_Internal_Debug::start_render($_template);

-                    }

-                    try {

-                        ob_start();

-                        eval("?>" . $code);

-                        unset($code);

-                    }

-                    catch (Exception $e) {

-                        ob_get_clean();

-                        throw $e;

-                    }

-                } else {

-                    if (!$_template->compiled->exists || ($_template->smarty->force_compile && !$_template->compiled->isCompiled)) {

-                        $_template->compileTemplateSource();

-                        $code = file_get_contents($_template->compiled->filepath);

-                        eval("?>" . $code);

-                        unset($code);

-                        $_template->compiled->loaded = true;

-                        $_template->compiled->isCompiled = true;

-                    }

-                    if ($this->smarty->debugging) {

-                        Smarty_Internal_Debug::start_render($_template);

-                    }

-                    if (!$_template->compiled->loaded) {

-                        include($_template->compiled->filepath);

-                        if ($_template->mustCompile) {

-                            // recompile and load again

-                            $_template->compileTemplateSource();

-                            $code = file_get_contents($_template->compiled->filepath);

-                            eval("?>" . $code);

-                            unset($code);

-                            $_template->compiled->isCompiled = true;

-                        }

-                        $_template->compiled->loaded = true;

-                    } else {

-                        $_template->decodeProperties($_template->compiled->_properties, false);

-                    }

-                    try {

-                        ob_start();

-                        if (empty($_template->properties['unifunc']) || !is_callable($_template->properties['unifunc'])) {

-                            throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");

-                        }

-                        array_unshift($_template->_capture_stack, array());

-                        //

-                        // render compiled template

-                        //

-                        $_template->properties['unifunc']($_template);

-                        // any unclosed {capture} tags ?

-                        if (isset($_template->_capture_stack[0][0])) {

-                            $_template->capture_error();

-                        }

-                        array_shift($_template->_capture_stack);

-                    }

-                    catch (Exception $e) {

-                        ob_get_clean();

-                        throw $e;

-                    }

-                }

-            } else {

-                if ($_template->source->uncompiled) {

-                    if ($this->smarty->debugging) {

-                        Smarty_Internal_Debug::start_render($_template);

-                    }

-                    try {

-                        ob_start();

-                        $_template->source->renderUncompiled($_template);

-                    }

-                    catch (Exception $e) {

-                        ob_get_clean();

-                        throw $e;

-                    }

-                } else {

-                    throw new SmartyException("Resource '$_template->source->type' must have 'renderUncompiled' method");

-                }

-            }

-            $_output = ob_get_clean();

-            if (!$_template->source->recompiled && empty($_template->properties['file_dependency'][$_template->source->uid])) {

-                $_template->properties['file_dependency'][$_template->source->uid] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type);

-            }

-            if ($_template->parent instanceof Smarty_Internal_Template) {

-                $_template->parent->properties['file_dependency'] = array_merge($_template->parent->properties['file_dependency'], $_template->properties['file_dependency']);

-                foreach ($_template->required_plugins as $code => $tmp1) {

-                    foreach ($tmp1 as $name => $tmp) {

-                        foreach ($tmp as $type => $data) {

-                            $_template->parent->required_plugins[$code][$name][$type] = $data;

-                        }

-                    }

-                }

-            }

-            if ($this->smarty->debugging) {

-                Smarty_Internal_Debug::end_render($_template);

-            }

-            // write to cache when nessecary

-            if (!$_template->source->recompiled && ($_template->caching == Smarty::CACHING_LIFETIME_SAVED || $_template->caching == Smarty::CACHING_LIFETIME_CURRENT)) {

-                if ($this->smarty->debugging) {

-                    Smarty_Internal_Debug::start_cache($_template);

-                }

-                $_template->properties['has_nocache_code'] = false;

-                // get text between non-cached items

-                $cache_split = preg_split("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output);

-                // get non-cached items

-                preg_match_all("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output, $cache_parts);

-                $output = '';

-                // loop over items, stitch back together

-                foreach ($cache_split as $curr_idx => $curr_split) {

-                    // escape PHP tags in template content

-                    $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/', "<?php echo '\$1'; ?>\n", $curr_split);

-                    if (isset($cache_parts[0][$curr_idx])) {

-                        $_template->properties['has_nocache_code'] = true;

-                        // remove nocache tags from cache output

-                        $output .= preg_replace("!/\*/?%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]);

-                    }

-                }

-                if (!$no_output_filter && !$_template->has_nocache_code && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {

-                    $output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $_template);

-                }

-                // rendering (must be done before writing cache file because of {function} nocache handling)

-                /** @var Smarty_Internal_Template $_smarty_tpl

-                 * used in evaluated code

-                 */

-                $_smarty_tpl = $_template;

-                try {

-                    ob_start();

-                    eval("?>" . $output);

-                    $_output = ob_get_clean();

-                }

-                catch (Exception $e) {

-                    ob_get_clean();

-                    throw $e;

-                }

-                // write cache file content

-                $_template->writeCachedContent($output);

-                if ($this->smarty->debugging) {

-                    Smarty_Internal_Debug::end_cache($_template);

-                }

-            } else {

-                // var_dump('renderTemplate', $_template->has_nocache_code, $_template->template_resource, $_template->properties['nocache_hash'], $_template->parent->properties['nocache_hash'], $_output);

-                if (!empty($_template->properties['nocache_hash']) && !empty($_template->parent->properties['nocache_hash'])) {

-                    // replace nocache_hash

-                    $_output = str_replace("{$_template->properties['nocache_hash']}", $_template->parent->properties['nocache_hash'], $_output);

-                    $_template->parent->has_nocache_code = $_template->parent->has_nocache_code || $_template->has_nocache_code;

-                }

-            }

-        } else {

-            if ($this->smarty->debugging) {

-                Smarty_Internal_Debug::start_cache($_template);

-            }

-            try {

-                ob_start();

-                array_unshift($_template->_capture_stack, array());

-                //

-                // render cached template

-                //

-                $_template->properties['unifunc']($_template);

-                // any unclosed {capture} tags ?

-                if (isset($_template->_capture_stack[0][0])) {

-                    $_template->capture_error();

-                }

-                array_shift($_template->_capture_stack);

-                $_output = ob_get_clean();

-            }

-            catch (Exception $e) {

-                ob_get_clean();

-                throw $e;

-            }

-            if ($this->smarty->debugging) {

-                Smarty_Internal_Debug::end_cache($_template);

-            }

-        }

-        if ((!$this->caching || $_template->has_nocache_code || $_template->source->recompiled) && !$no_output_filter && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {

-            $_output = Smarty_Internal_Filter_Handler::runFilter('output', $_output, $_template);

-        }

-        if (isset($this->error_reporting)) {

-            error_reporting($_smarty_old_error_level);

-        }

-        // display or fetch

-        if ($display) {

-            if ($this->caching && $this->cache_modified_check) {

-                $_isCached = $_template->isCached() && !$_template->has_nocache_code;

-                $_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);

-                if ($_isCached && $_template->cached->timestamp <= strtotime($_last_modified_date)) {

-                    switch (PHP_SAPI) {

-                        case 'cgi': // php-cgi < 5.3

-                        case 'cgi-fcgi': // php-cgi >= 5.3

-                        case 'fpm-fcgi': // php-fpm >= 5.3.3

-                            header('Status: 304 Not Modified');

-                            break;

-

-                        case 'cli':

-                            if ( /* ^phpunit */

-                            !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */

-                            ) {

-                                $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';

-                            }

-                            break;

-

-                        default:

-                            header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');

-                            break;

-                    }

-                } else {

-                    switch (PHP_SAPI) {

-                        case 'cli':

-                            if ( /* ^phpunit */

-                            !empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */

-                            ) {

-                                $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = 'Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT';

-                            }

-                            break;

-

-                        default:

-                            header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT');

-                            break;

-                    }

-                    echo $_output;

-                }

-            } else {

-                echo $_output;

-            }

-            // debug output

-            if ($this->smarty->debugging) {

-                Smarty_Internal_Debug::display_debug($_template);

-            }

-            if ($merge_tpl_vars) {

-                // restore local variables

-                $_template->tpl_vars = $save_tpl_vars;

-                $_template->config_vars = $save_config_vars;

-            }

-

-            return;

-        } else {

-            if ($merge_tpl_vars) {

-                // restore local variables

-                $_template->tpl_vars = $save_tpl_vars;

-                $_template->config_vars = $save_config_vars;

-            }

-            // return fetched content

-            return $_output;

-        }

-    }

-

-    /**

-     * displays a Smarty template

-     *

-     * @param string $template   the resource handle of the template file or template object

-     * @param mixed  $cache_id   cache id to be used with this template

-     * @param mixed  $compile_id compile id to be used with this template

-     * @param object $parent     next higher level of Smarty variables

-     */

-    public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)

-    {

-        // display template

-        $this->fetch($template, $cache_id, $compile_id, $parent, true);

-    }

-

-    /**

-     * test if cache is valid

-     *

-     * @param  string|object $template   the resource handle of the template file or template object

-     * @param  mixed         $cache_id   cache id to be used with this template

-     * @param  mixed         $compile_id compile id to be used with this template

-     * @param  object        $parent     next higher level of Smarty variables

-     *

-     * @return boolean       cache status

-     */

-    public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)

-    {

-        if ($template === null && $this instanceof $this->template_class) {

-            return $this->cached->valid;

-        }

-        if (!($template instanceof $this->template_class)) {

-            if ($parent === null) {

-                $parent = $this;

-            }

-            $template = $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);

-        }

-        // return cache status of template

-        return $template->cached->valid;

-    }

-

-    /**

-     * creates a data object

-     *

-     * @param object $parent next higher level of Smarty variables

-     *

-     * @returns Smarty_Data data object

-     */

-    public function createData($parent = null)

-    {

-        return new Smarty_Data($parent, $this);

-    }

-

-    /**

-     * Registers plugin to be used in templates

-     *

-     * @param  string   $type       plugin type

-     * @param  string   $tag        name of template tag

-     * @param  callback $callback   PHP callback to register

-     * @param  boolean  $cacheable  if true (default) this fuction is cachable

-     * @param  array    $cache_attr caching attributes if any

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     * @throws SmartyException              when the plugin tag is invalid

-     */

-    public function registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = null)

-    {

-        if (isset($this->smarty->registered_plugins[$type][$tag])) {

-            throw new SmartyException("Plugin tag \"{$tag}\" already registered");

-        } elseif (!is_callable($callback)) {

-            throw new SmartyException("Plugin \"{$tag}\" not callable");

-        } else {

-            $this->smarty->registered_plugins[$type][$tag] = array($callback, (bool) $cacheable, (array) $cache_attr);

-        }

-

-        return $this;

-    }

-

-    /**

-     * Unregister Plugin

-     *

-     * @param  string $type of plugin

-     * @param  string $tag  name of plugin

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     */

-    public function unregisterPlugin($type, $tag)

-    {

-        if (isset($this->smarty->registered_plugins[$type][$tag])) {

-            unset($this->smarty->registered_plugins[$type][$tag]);

-        }

-

-        return $this;

-    }

-

-    /**

-     * Registers a resource to fetch a template

-     *

-     * @param  string                $type     name of resource type

-     * @param  Smarty_Resource|array $callback or instance of Smarty_Resource, or array of callbacks to handle resource (deprecated)

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     */

-    public function registerResource($type, $callback)

-    {

-        $this->smarty->registered_resources[$type] = $callback instanceof Smarty_Resource ? $callback : array($callback, false);

-

-        return $this;

-    }

-

-    /**

-     * Unregisters a resource

-     *

-     * @param  string $type name of resource type

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     */

-    public function unregisterResource($type)

-    {

-        if (isset($this->smarty->registered_resources[$type])) {

-            unset($this->smarty->registered_resources[$type]);

-        }

-

-        return $this;

-    }

-

-    /**

-     * Registers a cache resource to cache a template's output

-     *

-     * @param  string               $type     name of cache resource type

-     * @param  Smarty_CacheResource $callback instance of Smarty_CacheResource to handle output caching

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     */

-    public function registerCacheResource($type, Smarty_CacheResource $callback)

-    {

-        $this->smarty->registered_cache_resources[$type] = $callback;

-

-        return $this;

-    }

-

-    /**

-     * Unregisters a cache resource

-     *

-     * @param  string $type name of cache resource type

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     */

-    public function unregisterCacheResource($type)

-    {

-        if (isset($this->smarty->registered_cache_resources[$type])) {

-            unset($this->smarty->registered_cache_resources[$type]);

-        }

-

-        return $this;

-    }

-

-    /**

-     * Registers object to be used in templates

-     *

-     * @param          $object_name

-     * @param  object  $object_impl   the referenced PHP object to register

-     * @param  array   $allowed       list of allowed methods (empty = all)

-     * @param  boolean $smarty_args   smarty argument format, else traditional

-     * @param  array   $block_methods list of block-methods

-     *

-     * @throws SmartyException

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     */

-    public function registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())

-    {

-        // test if allowed methods callable

-        if (!empty($allowed)) {

-            foreach ((array) $allowed as $method) {

-                if (!is_callable(array($object_impl, $method)) && !property_exists($object_impl, $method)) {

-                    throw new SmartyException("Undefined method or property '$method' in registered object");

-                }

-            }

-        }

-        // test if block methods callable

-        if (!empty($block_methods)) {

-            foreach ((array) $block_methods as $method) {

-                if (!is_callable(array($object_impl, $method))) {

-                    throw new SmartyException("Undefined method '$method' in registered object");

-                }

-            }

-        }

-        // register the object

-        $this->smarty->registered_objects[$object_name] =

-            array($object_impl, (array) $allowed, (boolean) $smarty_args, (array) $block_methods);

-

-        return $this;

-    }

-

-    /**

-     * return a reference to a registered object

-     *

-     * @param  string $name object name

-     *

-     * @return object

-     * @throws SmartyException if no such object is found

-     */

-    public function getRegisteredObject($name)

-    {

-        if (!isset($this->smarty->registered_objects[$name])) {

-            throw new SmartyException("'$name' is not a registered object");

-        }

-        if (!is_object($this->smarty->registered_objects[$name][0])) {

-            throw new SmartyException("registered '$name' is not an object");

-        }

-

-        return $this->smarty->registered_objects[$name][0];

-    }

-

-    /**

-     * unregister an object

-     *

-     * @param  string $name object name

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     */

-    public function unregisterObject($name)

-    {

-        if (isset($this->smarty->registered_objects[$name])) {

-            unset($this->smarty->registered_objects[$name]);

-        }

-

-        return $this;

-    }

-

-    /**

-     * Registers static classes to be used in templates

-     *

-     * @param         $class_name

-     * @param  string $class_impl the referenced PHP class to register

-     *

-     * @throws SmartyException

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     */

-    public function registerClass($class_name, $class_impl)

-    {

-        // test if exists

-        if (!class_exists($class_impl)) {

-            throw new SmartyException("Undefined class '$class_impl' in register template class");

-        }

-        // register the class

-        $this->smarty->registered_classes[$class_name] = $class_impl;

-

-        return $this;

-    }

-

-    /**

-     * Registers a default plugin handler

-     *

-     * @param  callable $callback class/method name

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     * @throws SmartyException              if $callback is not callable

-     */

-    public function registerDefaultPluginHandler($callback)

-    {

-        if (is_callable($callback)) {

-            $this->smarty->default_plugin_handler_func = $callback;

-        } else {

-            throw new SmartyException("Default plugin handler '$callback' not callable");

-        }

-

-        return $this;

-    }

-

-    /**

-     * Registers a default template handler

-     *

-     * @param  callable $callback class/method name

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     * @throws SmartyException              if $callback is not callable

-     */

-    public function registerDefaultTemplateHandler($callback)

-    {

-        if (is_callable($callback)) {

-            $this->smarty->default_template_handler_func = $callback;

-        } else {

-            throw new SmartyException("Default template handler '$callback' not callable");

-        }

-

-        return $this;

-    }

-

-    /**

-     * Registers a default template handler

-     *

-     * @param  callable $callback class/method name

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     * @throws SmartyException              if $callback is not callable

-     */

-    public function registerDefaultConfigHandler($callback)

-    {

-        if (is_callable($callback)) {

-            $this->smarty->default_config_handler_func = $callback;

-        } else {

-            throw new SmartyException("Default config handler '$callback' not callable");

-        }

-

-        return $this;

-    }

-

-    /**

-     * Registers a filter function

-     *

-     * @param  string   $type filter type

-     * @param  callback $callback

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     */

-    public function registerFilter($type, $callback)

-    {

-        $this->smarty->registered_filters[$type][$this->_get_filter_name($callback)] = $callback;

-

-        return $this;

-    }

-

-    /**

-     * Unregisters a filter function

-     *

-     * @param  string   $type filter type

-     * @param  callback $callback

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     */

-    public function unregisterFilter($type, $callback)

-    {

-        $name = $this->_get_filter_name($callback);

-        if (isset($this->smarty->registered_filters[$type][$name])) {

-            unset($this->smarty->registered_filters[$type][$name]);

-        }

-

-        return $this;

-    }

-

-    /**

-     * Return internal filter name

-     *

-     * @param  callback $function_name

-     *

-     * @return string   internal filter name

-     */

-    public function _get_filter_name($function_name)

-    {

-        if (is_array($function_name)) {

-            $_class_name = (is_object($function_name[0]) ?

-                get_class($function_name[0]) : $function_name[0]);

-

-            return $_class_name . '_' . $function_name[1];

-        } else {

-            return $function_name;

-        }

-    }

-

-    /**

-     * load a filter of specified type and name

-     *

-     * @param  string $type filter type

-     * @param  string $name filter name

-     *

-     * @throws SmartyException if filter could not be loaded

-     */

-    public function loadFilter($type, $name)

-    {

-        $_plugin = "smarty_{$type}filter_{$name}";

-        $_filter_name = $_plugin;

-        if ($this->smarty->loadPlugin($_plugin)) {

-            if (class_exists($_plugin, false)) {

-                $_plugin = array($_plugin, 'execute');

-            }

-            if (is_callable($_plugin)) {

-                $this->smarty->registered_filters[$type][$_filter_name] = $_plugin;

-

-                return true;

-            }

-        }

-        throw new SmartyException("{$type}filter \"{$name}\" not callable");

-    }

-

-    /**

-     * unload a filter of specified type and name

-     *

-     * @param  string $type filter type

-     * @param  string $name filter name

-     *

-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining

-     */

-    public function unloadFilter($type, $name)

-    {

-        $_filter_name = "smarty_{$type}filter_{$name}";

-        if (isset($this->smarty->registered_filters[$type][$_filter_name])) {

-            unset ($this->smarty->registered_filters[$type][$_filter_name]);

-        }

-

-        return $this;

-    }

-

-    /**

-     * preg_replace callback to convert camelcase getter/setter to underscore property names

-     *

-     * @param  string $match match string

-     *

-     * @return string replacemant

-     */

-    private function replaceCamelcase($match)

-    {

-        return "_" . strtolower($match[1]);

-    }

-

-    /**

-     * Handle unknown class methods

-     *

-     * @param string $name unknown method-name

-     * @param array  $args argument array

-     *

-     * @throws SmartyException

-     */

-    public function __call($name, $args)

-    {

-        static $_prefixes = array('set' => true, 'get' => true);

-        static $_resolved_property_name = array();

-        static $_resolved_property_source = array();

-

-        // method of Smarty object?

-        if (method_exists($this->smarty, $name)) {

-            return call_user_func_array(array($this->smarty, $name), $args);

-        }

-        // see if this is a set/get for a property

-        $first3 = strtolower(substr($name, 0, 3));

-        if (isset($_prefixes[$first3]) && isset($name[3]) && $name[3] !== '_') {

-            if (isset($_resolved_property_name[$name])) {

-                $property_name = $_resolved_property_name[$name];

-            } else {

-                // try to keep case correct for future PHP 6.0 case-sensitive class methods

-                // lcfirst() not available < PHP 5.3.0, so improvise

-                $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4);

-                // convert camel case to underscored name

-                $property_name = preg_replace_callback('/([A-Z])/', array($this, 'replaceCamelcase'), $property_name);

-                $_resolved_property_name[$name] = $property_name;

-            }

-            if (isset($_resolved_property_source[$property_name])) {

-                $_is_this = $_resolved_property_source[$property_name];

-            } else {

-                $_is_this = null;

-                if (property_exists($this, $property_name)) {

-                    $_is_this = true;

-                } elseif (property_exists($this->smarty, $property_name)) {

-                    $_is_this = false;

-                }

-                $_resolved_property_source[$property_name] = $_is_this;

-            }

-            if ($_is_this) {

-                if ($first3 == 'get') {

-                    return $this->$property_name;

-                } else {

-                    return $this->$property_name = $args[0];

-                }

-            } elseif ($_is_this === false) {

-                if ($first3 == 'get') {

-                    return $this->smarty->$property_name;

-                } else {

-                    return $this->smarty->$property_name = $args[0];

-                }

-            } else {

-                throw new SmartyException("property '$property_name' does not exist.");

-           }

-        }

-        if ($name == 'Smarty') {

-            throw new SmartyException("PHP5 requires you to call __construct() instead of Smarty()");

-        }

-        // must be unknown

-        throw new SmartyException("Call of unknown method '$name'.");

-    }

-}

+<?php
+/**
+ * Smarty Internal Plugin Smarty Template  Base
+ * This file contains the basic shared methods for template handling
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class with shared template methods
+ *
+ * @package      Smarty
+ * @subpackage   Template
+ *
+ * @property Smarty $smarty
+ * @method Smarty_Internal_TemplateBase setAutoloadFilters(mixed $filters, string $type = null)
+ * @method Smarty_Internal_TemplateBase addAutoloadFilters(mixed $filters, string $type = null)
+ * @method array getAutoloadFilters(string $type = null)
+ * @local_method Smarty_Internal_TemplateBase registerFilter(string $type, callback $callback, string $name = null)
+ * @method Smarty_Internal_TemplateBase unregisterFilter(string $type, mixed $callback)
+ * @method Smarty_Internal_TemplateBase unloadFilter(string $type, string $name)
+ * @method string getDebugTemplate()
+ * @method Smarty_Internal_TemplateBase setDebugTemplate(string $tpl_name)
+ * @method Smarty_Internal_TemplateBase setDefaultModifier(mixed $modifiers)
+ * @method Smarty_Internal_TemplateBase addDefaultModifier(mixed $modifiers)
+ * @method array getDefaultModifier()
+ * @method Smarty_Internal_TemplateBase registerDefaultPluginHandler(callback $callback)
+ * @method Smarty_Internal_TemplateBase registerResource(string $name, Smarty_Resource $resource_handler)
+ * @method Smarty_Internal_TemplateBase unregisterResource(string $name)
+ * @method Smarty_Internal_TemplateBase registerCacheResource(string $name, Smarty_CacheResource $resource_handler)
+ * @method Smarty_Internal_TemplateBase unregisterCacheResource(string $name)
+ * @method Smarty_Internal_TemplateBase unregisterPlugin(string $type, string $name)
+ * @method Smarty_Internal_TemplateBase unregisterObject(string $object_name)
+ * @method object getRegisteredObject(string $object_name)
+ * @method Smarty_Internal_TemplateBase registerClass(string $class_name, string $class_impl)
+ * @method Smarty_Internal_TemplateBase createData(Smarty_Internal_Data $parent = null, string $name = null)
+ * @method array getTags(mixed $template = null)
+ */
+abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
+{
+    /**
+     * Set this if you want different sets of cache files for the same
+     * templates.
+     *
+     * @var string
+     */
+    public $cache_id = null;
+
+    /**
+     * Set this if you want different sets of compiled files for the same
+     * templates.
+     *
+     * @var string
+     */
+    public $compile_id = null;
+
+    /**
+     * caching enabled
+     *
+     * @var boolean
+     */
+    public $caching = false;
+
+    /**
+     * cache lifetime in seconds
+     *
+     * @var integer
+     */
+    public $cache_lifetime = 3600;
+
+    /**
+     * universal cache
+     *
+     * @var array()
+     */
+    public $_cache = array();
+
+    /**
+     * fetches a rendered Smarty template
+     *
+     * @param  string $template         the resource handle of the template file or template object
+     * @param  mixed  $cache_id         cache id to be used with this template
+     * @param  mixed  $compile_id       compile id to be used with this template
+     * @param  object $parent           next higher level of Smarty variables
+     *
+     * @throws Exception
+     * @throws SmartyException
+     * @return string rendered template output
+     */
+    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+        $result = $this->_execute($template, $cache_id, $compile_id, $parent, 0);
+        return $result === null ? ob_get_clean() : $result;
+    }
+
+    /**
+     * displays a Smarty template
+     *
+     * @param string $template   the resource handle of the template file or template object
+     * @param mixed  $cache_id   cache id to be used with this template
+     * @param mixed  $compile_id compile id to be used with this template
+     * @param object $parent     next higher level of Smarty variables
+     */
+    public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+        // display template
+        $this->_execute($template, $cache_id, $compile_id, $parent, 1);
+    }
+
+    /**
+     * test if cache is valid
+     *
+     * @api  Smarty::isCached()
+     * @link http://www.smarty.net/docs/en/api.is.cached.tpl
+     *
+     * @param  null|string|\Smarty_Internal_Template $template   the resource handle of the template file or template object
+     * @param  mixed                                 $cache_id   cache id to be used with this template
+     * @param  mixed                                 $compile_id compile id to be used with this template
+     * @param  object                                $parent     next higher level of Smarty variables
+     *
+     * @return boolean       cache status
+     */
+    public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+        return $this->_execute($template, $cache_id, $compile_id, $parent, 2);
+    }
+
+    /**
+     * fetches a rendered Smarty template
+     *
+     * @param  string $template   the resource handle of the template file or template object
+     * @param  mixed  $cache_id   cache id to be used with this template
+     * @param  mixed  $compile_id compile id to be used with this template
+     * @param  object $parent     next higher level of Smarty variables
+     * @param  string $function  function type 0 = fetch,  1 = display, 2 = isCache
+     *
+     * @return mixed
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    private function _execute($template, $cache_id, $compile_id, $parent, $function)
+    {
+        $smarty = $this->_objType == 1 ? $this : $this->smarty;
+        if ($template === null) {
+            if ($this->_objType != 2) {
+                throw new SmartyException($function . '():Missing \'$template\' parameter');
+            } else {
+                $template = clone $this;
+            }
+        } elseif (is_object($template)) {
+            if (!isset($template->_objType) || $template->_objType != 2) {
+                throw new SmartyException($function . '():Template object expected');
+            } else {
+                /* @var Smarty_Internal_Template $template */
+                $template = clone $template;
+            }
+        } else {
+            // get template object
+            /* @var Smarty_Internal_Template $template */
+            $template = $smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
+            if ($this->_objType == 1) {
+                // set caching in template object
+                $template->caching = $this->caching;
+            }
+        }
+        // fetch template content
+        $level = ob_get_level();
+        try {
+            $_smarty_old_error_level =
+                ($this->_objType == 1 && isset($smarty->error_reporting)) ? error_reporting($smarty->error_reporting) :
+                    null;
+            if ($function == 2) {
+                if ($template->caching) {
+                    // return cache status of template
+                    if (!isset($template->cached)) {
+                        $template->loadCached();
+                    }
+                    $result = $template->cached->isCached($template);
+                    $template->smarty->_cache['isCached'][$template->_getTemplateId()] = $template;
+                } else {
+                    return false;
+                }
+            } else {
+                ob_start();
+                $template->_mergeVars();
+                if (!empty(Smarty::$global_tpl_vars)) {
+                    $template->tpl_vars = array_merge(Smarty::$global_tpl_vars, $template->tpl_vars);
+                }
+                $result = $template->render(false, $function);
+            }
+            if (isset($_smarty_old_error_level)) {
+                error_reporting($_smarty_old_error_level);
+            }
+            return $result;
+        }
+        catch (Exception $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::registerPlugin()
+     * @link http://www.smarty.net/docs/en/api.register.plugin.tpl
+     *
+     * @param  string   $type       plugin type
+     * @param  string   $name       name of template tag
+     * @param  callback $callback   PHP callback to register
+     * @param  bool     $cacheable  if true (default) this function is cache able
+     * @param  mixed    $cache_attr caching attributes if any
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              when the plugin tag is invalid
+     */
+    public function registerPlugin($type, $name, $callback, $cacheable = true, $cache_attr = null)
+    {
+        return $this->ext->registerPlugin->registerPlugin($this, $type, $name, $callback, $cacheable, $cache_attr);
+    }
+
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::loadFilter()
+     * @link http://www.smarty.net/docs/en/api.load.filter.tpl
+     *
+     * @param  string $type filter type
+     * @param  string $name filter name
+     *
+     * @return bool
+     * @throws SmartyException if filter could not be loaded
+     */
+    public function loadFilter($type, $name)
+    {
+        return $this->ext->loadFilter->loadFilter($this, $type, $name);
+    }
+
+    /**
+     * Registers a filter function
+     *
+     * @api  Smarty::registerFilter()
+     * @link http://www.smarty.net/docs/en/api.register.filter.tpl
+     *
+     * @param  string      $type filter type
+     * @param  callback    $callback
+     * @param  string|null $name optional filter name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerFilter($type, $callback, $name = null)
+    {
+        return $this->ext->registerFilter->registerFilter($this, $type, $callback, $name);
+    }
+
+    /**
+     * Registers object to be used in templates
+     *
+     * @api  Smarty::registerObject()
+     * @link http://www.smarty.net/docs/en/api.register.object.tpl
+     *
+     * @param  string $object_name
+     * @param  object $object                     the referenced PHP object to register
+     * @param  array  $allowed_methods_properties list of allowed methods (empty = all)
+     * @param  bool   $format                     smarty argument format, else traditional
+     * @param  array  $block_methods              list of block-methods
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerObject($object_name, $object, $allowed_methods_properties = array(), $format = true,
+                                   $block_methods = array())
+    {
+        return $this->ext->registerObject->registerObject($this, $object_name, $object, $allowed_methods_properties,
+                                                          $format, $block_methods);
+    }
+
+    /**
+     * @param boolean $caching
+     */
+    public function setCaching($caching)
+    {
+        $this->caching = $caching;
+    }
+
+    /**
+     * @param int $cache_lifetime
+     */
+    public function setCacheLifetime($cache_lifetime)
+    {
+        $this->cache_lifetime = $cache_lifetime;
+    }
+
+    /**
+     * @param string $compile_id
+     */
+    public function setCompileId($compile_id)
+    {
+        $this->compile_id = $compile_id;
+    }
+
+    /**
+     * @param string $cache_id
+     */
+    public function setCacheId($cache_id)
+    {
+        $this->cache_id = $cache_id;
+    }
+
+}
+
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/library/Smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
index d00bfb8f4..04584a40f 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
@@ -14,36 +14,49 @@
  *
  * @package    Smarty
  * @subpackage Compiler
+ *
+ * @property Smarty_Internal_SmartyTemplateCompiler $prefixCompiledCode  = ''
+ * @property Smarty_Internal_SmartyTemplateCompiler $postfixCompiledCode = ''
+ * @method Smarty_Internal_SmartyTemplateCompiler registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
+ * @method Smarty_Internal_SmartyTemplateCompiler unregisterPostCompileCallback($key)
  */
 abstract class Smarty_Internal_TemplateCompilerBase
 {
+
     /**
-     * hash for nocache sections
+     * Smarty object
      *
-     * @var mixed
+     * @var Smarty
      */
-    private $nocache_hash = null;
+    public $smarty = null;
 
     /**
-     * suppress generation of nocache code
+     * Parser object
      *
-     * @var bool
+     * @var Smarty_Internal_Templateparser
      */
-    public $suppressNocacheProcessing = false;
+    public $parser = null;
 
     /**
-     * suppress generation of merged template code
+     * hash for nocache sections
+     *
+     * @var mixed
+     */
+    public $nocache_hash = null;
+
+    /**
+     * suppress generation of nocache code
      *
      * @var bool
      */
-    public $suppressMergedTemplates = false;
+    public $suppressNocacheProcessing = false;
 
     /**
-     * compile tag objects
+     * compile tag objects cache
      *
      * @var array
      */
-    public static $_tag_objects = array();
+    public $_tag_objects = array();
 
     /**
      * tag stack
@@ -60,39 +73,25 @@ abstract class Smarty_Internal_TemplateCompilerBase
     public $template = null;
 
     /**
-     * merged templates
+     * merged included sub template data
      *
      * @var array
      */
-    public $merged_templates = array();
+    public $mergedSubTemplatesData = array();
 
     /**
-     * sources which must be compiled
+     * merged sub template code
      *
      * @var array
      */
-    public $sources = array();
+    public $mergedSubTemplatesCode = array();
 
     /**
-     * flag that we are inside {block}
-     *
-     * @var bool
-     */
-    public $inheritance = false;
-
-    /**
-     * flag when compiling inheritance child template
-     *
-     * @var bool
-     */
-    public $inheritance_child = false;
-
-    /**
-     * uid of templates called by {extends} for recursion check
+     * collected template properties during compilation
      *
      * @var array
      */
-    public $extends_uid = array();
+    public $templateProperties = array();
 
     /**
      * source line offset for error messages
@@ -114,6 +113,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
      * @var string
      */
     public $trace_filepath = '';
+
     /**
      * stack for tracing file and line of nested {block} tags
      *
@@ -143,183 +143,322 @@ abstract class Smarty_Internal_TemplateCompilerBase
     public $forceNocache = false;
 
     /**
-     * suppress Smarty header code in compiled template
+     * flag if compiled template file shall we written
      *
      * @var bool
      */
-    public $suppressHeader = false;
+    public $write_compiled_code = true;
 
     /**
-     * suppress template property header code in compiled template
+     * Template functions
+     *
+     * @var array
+     */
+    public $tpl_function = array();
+
+    /**
+     * called sub functions from template function
+     *
+     * @var array
+     */
+    public $called_functions = array();
+
+    /**
+     * compiled template or block function code
+     *
+     * @var string
+     */
+    public $blockOrFunctionCode = '';
+
+    /**
+     * php_handling setting either from Smarty or security
+     *
+     * @var int
+     */
+    public $php_handling = 0;
+
+    /**
+     * flags for used modifier plugins
+     *
+     * @var array
+     */
+    public $modifier_plugins = array();
+
+    /**
+     * type of already compiled modifier
+     *
+     * @var array
+     */
+    public $known_modifier_type = array();
+
+    /**
+     * parent compiler object for merged subtemplates and template functions
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $parent_compiler = null;
+
+    /**
+     * Flag true when compiling nocache section
      *
      * @var bool
      */
-    public $suppressTemplatePropertyHeader = false;
+    public $nocache = false;
 
     /**
-     * suppress pre and post filter
+     * Flag true when tag is compiled as nocache
      *
      * @var bool
      */
-    public $suppressFilter = false;
+    public $tag_nocache = false;
 
     /**
-     * flag if compiled template file shall we written
+     * Compiled tag prefix code
+     *
+     * @var array
+     */
+    public $prefix_code = array();
+
+    /**
+     * Prefix code  stack
+     *
+     * @var array
+     */
+    public $prefixCodeStack = array();
+
+    /**
+     * Tag has compiled code
      *
      * @var bool
      */
-    public $write_compiled_code = true;
+    public $has_code = false;
+
+    /**
+     * A variable string was compiled
+     *
+     * @var bool
+     */
+    public $has_variable_string = false;
 
     /**
-     * flag if currently a template function is compiled
+     * Tag creates output
      *
      * @var bool
      */
-    public $compiles_template_function = false;
+    public $has_output = false;
 
     /**
-     * called subfuntions from template function
+     * Stack for {setfilter} {/setfilter}
      *
      * @var array
      */
-    public $called_functions = array();
+    public $variable_filter_stack = array();
 
     /**
-     * flags for used modifier plugins
+     * variable filters for {setfilter} {/setfilter}
      *
      * @var array
      */
-    public $modifier_plugins = array();
+    public $variable_filters = array();
 
     /**
-     * type of already compiled modifier
+     * Nesting count of looping tags like {foreach}, {for}, {section}, {while}
+     *
+     * @var int
+     */
+    public $loopNesting = 0;
+
+    /**
+     * Strip preg pattern
+     *
+     * @var string
+     */
+    public $stripRegEx = '![\t ]*[\r\n]+[\t ]*!';
+
+    /**
+     * plugin search order
      *
      * @var array
      */
-    public $known_modifier_type = array();
+    public $plugin_search_order = array('function', 'block', 'compiler', 'class');
+
+    /**
+     * General storage area for tag compiler plugins
+     *
+     * @var array
+     */
+    public $_cache = array();
 
     /**
      * method to compile a Smarty template
      *
-     * @param  mixed $_content template source
+     * @param mixed $_content template source
+     * @param bool  $isTemplateSource
      *
-     * @return bool  true if compiling succeeded, false if it failed
+     * @return bool true if compiling succeeded, false if it failed
      */
-    abstract protected function doCompile($_content);
+    abstract protected function doCompile($_content, $isTemplateSource = false);
 
     /**
      * Initialize compiler
+     *
+     * @param Smarty $smarty global instance
      */
-    public function __construct()
+    public function __construct(Smarty $smarty)
     {
-        $this->nocache_hash = str_replace(array('.', ','), '-', uniqid(rand(), true));
+        $this->smarty = $smarty;
+        $this->nocache_hash = str_replace(array('.', ','), '_', uniqid(rand(), true));
     }
 
     /**
      * Method to compile a Smarty template
      *
-     * @param  Smarty_Internal_Template $template template object to compile
-     * @param  bool                     $nocache  true is shall be compiled in nocache mode
+     * @param  Smarty_Internal_Template                 $template template object to compile
+     * @param  bool                                     $nocache  true is shall be compiled in nocache mode
+     * @param null|Smarty_Internal_TemplateCompilerBase $parent_compiler
      *
-     * @return bool             true if compiling succeeded, false if it failed
+     * @return bool true if compiling succeeded, false if it failed
+     * @throws \Exception
      */
-    public function compileTemplate(Smarty_Internal_Template $template, $nocache = false)
+    public function compileTemplate(Smarty_Internal_Template $template, $nocache = null,
+                                    Smarty_Internal_TemplateCompilerBase $parent_compiler = null)
     {
-        if (empty($template->properties['nocache_hash'])) {
-            $template->properties['nocache_hash'] = $this->nocache_hash;
-        } else {
-            $this->nocache_hash = $template->properties['nocache_hash'];
-        }
-        // flag for nochache sections
-        $this->nocache = $nocache;
-        $this->tag_nocache = false;
-        // save template object in compiler class
-        $this->template = $template;
-        // reset has nocache code flag
-        $this->template->has_nocache_code = false;
-        $save_source = $this->template->source;
-        // template header code
-        $template_header = '';
-        if (!$this->suppressHeader) {
-            $template_header .= "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") . "\n";
-            $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
-        }
+        // get code frame of compiled template
+        $_compiled_code = $template->smarty->ext->_codeFrame->create($template,
+                                                                     $this->compileTemplateSource($template, $nocache,
+                                                                                                  $parent_compiler),
+                                                                     $this->postFilter($this->blockOrFunctionCode) .
+                                                                     join('', $this->mergedSubTemplatesCode), false, $this);
+        return $_compiled_code;
+    }
 
-        if (empty($this->template->source->components)) {
-            $this->sources = array($template->source);
-        } else {
-            // we have array of inheritance templates by extends: resource
-            $this->sources = array_reverse($template->source->components);
-        }
-        $loop = 0;
-        // the $this->sources array can get additional elements while compiling by the {extends} tag
-        while ($this->template->source = array_shift($this->sources)) {
-            $this->smarty->_current_file = $this->template->source->filepath;
+    /**
+     * Compile template source and run optional post filter
+     *
+     * @param \Smarty_Internal_Template             $template
+     * @param null|bool                             $nocache flag if template must be compiled in nocache mode
+     * @param \Smarty_Internal_TemplateCompilerBase $parent_compiler
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function compileTemplateSource(Smarty_Internal_Template $template, $nocache = null,
+                                          Smarty_Internal_TemplateCompilerBase $parent_compiler = null)
+    {
+        try {
+            // save template object in compiler class
+            $this->template = $template;
+            if (property_exists($this->template->smarty, 'plugin_search_order')) {
+                $this->plugin_search_order = $this->template->smarty->plugin_search_order;
+            }
             if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::start_compile($this->template);
+                $this->smarty->_debug->start_compile($this->template);
             }
-            $no_sources = count($this->sources);
-            if ($loop || $no_sources) {
-                $this->template->properties['file_dependency'][$this->template->source->uid] = array($this->template->source->filepath, $this->template->source->timestamp, $this->template->source->type);
+            if (isset($this->template->smarty->security_policy)) {
+                $this->php_handling = $this->template->smarty->security_policy->php_handling;
+            } else {
+                $this->php_handling = $this->template->smarty->php_handling;
             }
-            $loop ++;
-            if ($no_sources) {
-                $this->inheritance_child = true;
+            $this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
+            $nocache = isset($nocache) ? $nocache : false;
+            if (empty($template->compiled->nocache_hash)) {
+                $template->compiled->nocache_hash = $this->nocache_hash;
             } else {
-                $this->inheritance_child = false;
+                $this->nocache_hash = $template->compiled->nocache_hash;
             }
-            do {
-                $_compiled_code = '';
-                // flag for aborting current and start recompile
-                $this->abort_and_recompile = false;
+            // flag for nocache sections
+            $this->nocache = $nocache;
+            $this->tag_nocache = false;
+            // reset has nocache code flag
+            $this->template->compiled->has_nocache_code = false;
+            $this->has_variable_string = false;
+            $this->prefix_code = array();
+            // add file dependency
+            $this->parent_compiler->template->compiled->file_dependency[$this->template->source->uid] =
+                array($this->template->source->filepath, $this->template->source->getTimeStamp(),
+                      $this->template->source->type);
+            $this->smarty->_current_file = $this->template->source->filepath;
+            // get template source
+            if (!empty($this->template->source->components)) {
+                // we have array of inheritance templates by extends: resource
+                // generate corresponding source code sequence
+                $_content =
+                    Smarty_Internal_Compile_Extends::extendsSourceArrayCode($this->template->source->components);
+            } else {
                 // get template source
-                $_content = $this->template->source->content;
-                if ($_content != '') {
-                    // run prefilter if required
-                    if ((isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) && !$this->suppressFilter) {
-                        $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template);
-                    }
-                    // call compiler
-                    $_compiled_code = $this->doCompile($_content);
-                }
-            } while ($this->abort_and_recompile);
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_compile($this->template);
+                $_content = $this->template->source->getContent();
             }
+            $_compiled_code = $this->postFilter($this->doCompile($this->preFilter($_content), true));
         }
-        // restore source
-        $this->template->source = $save_source;
-        unset($save_source);
-        $this->smarty->_current_file = $this->template->source->filepath;
-        // free memory
-        unset($this->parser->root_buffer, $this->parser->current_buffer, $this->parser, $this->lex, $this->template);
-        self::$_tag_objects = array();
-        // return compiled code to template object
-        $merged_code = '';
-        if (!$this->suppressMergedTemplates && !empty($this->merged_templates)) {
-            foreach ($this->merged_templates as $code) {
-                $merged_code .= $code;
+        catch (Exception $e) {
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_compile($this->template);
             }
+            $this->_tag_stack = array();
+            $this->_tag_objects = array();
+            // free memory
+            $this->parent_compiler = null;
+            $this->template = null;
+            $this->parser = null;
+            throw $e;
         }
-        // run postfilter if required on compiled template code
-        if ((isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) && !$this->suppressFilter && $_compiled_code != '') {
-            $_compiled_code = Smarty_Internal_Filter_Handler::runFilter('post', $_compiled_code, $template);
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->end_compile($this->template);
         }
-        if ($this->suppressTemplatePropertyHeader) {
-            $code = $_compiled_code . $merged_code;
+        $this->parent_compiler = null;
+        $this->template = null;
+        $this->parser = null;
+        return $_compiled_code;
+    }
+
+    /**
+     * Optionally process compiled code by post filter
+     *
+     * @param string $code compiled code
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function postFilter($code)
+    {
+        // run post filter if on code
+        if (!empty($code) &&
+            (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post']))
+        ) {
+            return $this->smarty->ext->_filterHandler->runFilter('post', $code, $this->template);
         } else {
-            $code = $template_header . $template->createTemplateCodeFrame($_compiled_code) . $merged_code;
+            return $code;
         }
-        // unset content because template inheritance could have replace source with parent code
-        unset ($template->source->content);
+    }
 
-        return $code;
+    /**
+     * Run optional prefilter
+     *
+     * @param string $_content template source
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function preFilter($_content)
+    {
+        // run pre filter if required
+        if ($_content != '' &&
+            ((isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])))
+        ) {
+            return $this->smarty->ext->_filterHandler->runFilter('pre', $_content, $this->template);
+        } else {
+            return $_content;
+        }
     }
 
     /**
      * Compile Tag
      * This is a call back from the lexer/parser
-     * It executes the required compile plugin for the Smarty tag
+     *
+     * Save current prefix code
+     * Compile tag
+     * Merge tag prefix code with saved one
+     * (required nested tags in attributes)
      *
      * @param  string $tag       tag name
      * @param  array  $args      array with tag attributes
@@ -331,23 +470,44 @@ abstract class Smarty_Internal_TemplateCompilerBase
      */
     public function compileTag($tag, $args, $parameter = array())
     {
+        $this->prefixCodeStack[] = $this->prefix_code;
+        $this->prefix_code = array();
+        $result = $this->compileTag2($tag, $args, $parameter);
+        $this->prefix_code = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+        return $result;
+    }
+
+    /**
+     * Compile Tag
+     *
+     * @param  string $tag       tag name
+     * @param  array  $args      array with tag attributes
+     * @param  array  $parameter array with compilation parameter
+     *
+     * @throws SmartyCompilerException
+     * @throws SmartyException
+     * @return string compiled code
+     */
+    private function compileTag2($tag, $args, $parameter)
+    {
+        $plugin_type = '';
         // $args contains the attributes parsed and compiled by the lexer/parser
         // assume that tag does compile into code, but creates no HTML output
         $this->has_code = true;
         $this->has_output = false;
         // log tag/attributes
-        if (isset($this->smarty->get_used_tags) && $this->smarty->get_used_tags) {
-            $this->template->used_tags[] = array($tag, $args);
+        if (isset($this->smarty->_cache['get_used_tags'])) {
+            $this->template->_cache['used_tags'][] = array($tag, $args);
         }
         // check nocache option flag
-        if (in_array("'nocache'", $args) || in_array(array('nocache' => 'true'), $args)
-            || in_array(array('nocache' => '"true"'), $args) || in_array(array('nocache' => "'true'"), $args)
+        if (in_array("'nocache'", $args) || in_array(array('nocache' => 'true'), $args) ||
+            in_array(array('nocache' => '"true"'), $args) || in_array(array('nocache' => "'true'"), $args)
         ) {
             $this->tag_nocache = true;
         }
-        // compile the smarty tag (required compile classes to compile the tag are autoloaded)
+        // compile the smarty tag (required compile classes to compile the tag are auto loaded)
         if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
-            if (isset($this->smarty->template_functions[$tag])) {
+            if (isset($this->parent_compiler->template->tpl_function[$tag])) {
                 // template defined by {template} tag
                 $args['_attr']['name'] = "'" . $tag . "'";
                 $_output = $this->callTagCompiler('call', $args, $parameter);
@@ -382,18 +542,22 @@ abstract class Smarty_Internal_TemplateCompilerBase
                 if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_method'])) {
                     $method = $parameter['object_method'];
                     if (!in_array($method, $this->smarty->registered_objects[$tag][3]) &&
-                        (empty($this->smarty->registered_objects[$tag][1]) || in_array($method, $this->smarty->registered_objects[$tag][1]))
+                        (empty($this->smarty->registered_objects[$tag][1]) ||
+                            in_array($method, $this->smarty->registered_objects[$tag][1]))
                     ) {
                         return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
                     } elseif (in_array($method, $this->smarty->registered_objects[$tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $method);
+                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
+                                                      $method);
                     } else {
                         // throw exception
-                        $this->trigger_template_error('not allowed method "' . $method . '" in registered object "' . $tag . '"', $this->lex->taglineno);
+                        $this->trigger_template_error('not allowed method "' . $method . '" in registered object "' .
+                                                      $tag . '"', null, true);
                     }
                 }
                 // check if tag is registered
-                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $plugin_type) {
+                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $plugin_type)
+                {
                     if (isset($this->smarty->registered_plugins[$plugin_type][$tag])) {
                         // if compiler function plugin call it now
                         if ($plugin_type == Smarty::PLUGIN_COMPILER) {
@@ -412,20 +576,26 @@ abstract class Smarty_Internal_TemplateCompilerBase
                             if (!is_array($function)) {
                                 return $function($new_args, $this);
                             } elseif (is_object($function[0])) {
-                                return $this->smarty->registered_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
+                                return $this->smarty->registered_plugins[$plugin_type][$tag][0][0]->{$function[1]}($new_args,
+                                                                                                                   $this);
                             } else {
                                 return call_user_func_array($function, array($new_args, $this));
                             }
                         }
                         // compile registered function or block function
                         if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
+                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
+                                                          $tag);
                         }
                     }
                 }
                 // check plugins from plugins folder
-                foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                    if ($plugin_type == Smarty::PLUGIN_COMPILER && $this->smarty->loadPlugin('smarty_compiler_' . $tag) && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))) {
+                foreach ($this->plugin_search_order as $plugin_type) {
+                    if ($plugin_type == Smarty::PLUGIN_COMPILER &&
+                        $this->smarty->loadPlugin('smarty_compiler_' . $tag) &&
+                        (!isset($this->smarty->security_policy) ||
+                            $this->smarty->security_policy->isTrustedTag($tag, $this))
+                    ) {
                         $plugin = 'smarty_compiler_' . $tag;
                         if (is_callable($plugin)) {
                             // convert arguments format for old compiler plugins
@@ -449,8 +619,11 @@ abstract class Smarty_Internal_TemplateCompilerBase
                         throw new SmartyException("Plugin \"{$tag}\" not callable");
                     } else {
                         if ($function = $this->getPlugin($tag, $plugin_type)) {
-                            if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-                                return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, $tag, $function);
+                            if (!isset($this->smarty->security_policy) ||
+                                $this->smarty->security_policy->isTrustedTag($tag, $this)
+                            ) {
+                                return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter,
+                                                              $tag, $function);
                             }
                         }
                     }
@@ -458,7 +631,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
                 if (is_callable($this->smarty->default_plugin_handler_func)) {
                     $found = false;
                     // look for already resolved tags
-                    foreach ($this->smarty->plugin_search_order as $plugin_type) {
+                    foreach ($this->plugin_search_order as $plugin_type) {
                         if (isset($this->default_handler_plugins[$plugin_type][$tag])) {
                             $found = true;
                             break;
@@ -466,7 +639,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
                     }
                     if (!$found) {
                         // call default handler
-                        foreach ($this->smarty->plugin_search_order as $plugin_type) {
+                        foreach ($this->plugin_search_order as $plugin_type) {
                             if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
                                 $found = true;
                                 break;
@@ -484,12 +657,14 @@ abstract class Smarty_Internal_TemplateCompilerBase
                             if (!is_array($function)) {
                                 return $function($new_args, $this);
                             } elseif (is_object($function[0])) {
-                                return $this->default_handler_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
+                                return $this->default_handler_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args,
+                                                                                                              $this);
                             } else {
                                 return call_user_func_array($function, array($new_args, $this));
                             }
                         } else {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
+                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter,
+                                                          $tag);
                         }
                     }
                 }
@@ -500,20 +675,36 @@ abstract class Smarty_Internal_TemplateCompilerBase
                 if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_method'])) {
                     $method = $parameter['object_method'];
                     if (in_array($method, $this->smarty->registered_objects[$base_tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $method);
+                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag,
+                                                      $method);
                     } else {
                         // throw exception
-                        $this->trigger_template_error('not allowed closing tag method "' . $method . '" in registered object "' . $base_tag . '"', $this->lex->taglineno);
+                        $this->trigger_template_error('not allowed closing tag method "' . $method .
+                                                      '" in registered object "' . $base_tag . '"', null, true);
                     }
                 }
                 // registered block tag ?
-                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag]) || isset($this->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
+                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag]) ||
+                    isset($this->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag])
+                ) {
                     return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
                 }
+                // registered function tag ?
+                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) {
+                    return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag);
+                }
                 // block plugin?
                 if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
                     return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
                 }
+                // function plugin?
+                if ($function = $this->getPlugin($tag, Smarty::PLUGIN_FUNCTION)) {
+                    if (!isset($this->smarty->security_policy) ||
+                        $this->smarty->security_policy->isTrustedTag($tag, $this)
+                    ) {
+                        return $this->callTagCompiler('private_function_plugin', $args, $parameter, $tag, $function);
+                    }
+                }
                 // registered compiler plugin ?
                 if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag])) {
                     // if compiler function plugin call it now
@@ -525,7 +716,8 @@ abstract class Smarty_Internal_TemplateCompilerBase
                     if (!is_array($function)) {
                         return $function($args, $this);
                     } elseif (is_object($function[0])) {
-                        return $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0][0]->$function[1]($args, $this);
+                        return $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0][0]->$function[1]($args,
+                                                                                                                    $this);
                     } else {
                         return call_user_func_array($function, array($args, $this));
                     }
@@ -544,15 +736,111 @@ abstract class Smarty_Internal_TemplateCompilerBase
                     throw new SmartyException("Plugin \"{$tag}\" not callable");
                 }
             }
-            $this->trigger_template_error("unknown tag \"" . $tag . "\"", $this->lex->taglineno);
+            $this->trigger_template_error("unknown tag \"" . $tag . "\"", null, true);
+        }
+    }
+
+    /**
+     * compile variable
+     *
+     * @param string $variable
+     *
+     * @return string
+     */
+    public function compileVariable($variable)
+    {
+        if (strpos($variable, '(') == 0) {
+            // not a variable variable
+            $var = trim($variable, '\'');
+            $this->tag_nocache = $this->tag_nocache |
+                $this->template->ext->getTemplateVars->_getVariable($this->template, $var, null, true, false)->nocache;
+            // todo $this->template->compiled->properties['variables'][$var] = $this->tag_nocache | $this->nocache;
         }
+        return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
+    }
+
+    /**
+     * compile config variable
+     *
+     * @param string $variable
+     *
+     * @return string
+     */
+    public function compileConfigVariable($variable)
+    {
+        // return '$_smarty_tpl->config_vars[' . $variable . ']';
+        return '$_smarty_tpl->smarty->ext->configLoad->_getConfigVariable($_smarty_tpl, ' . $variable . ')';
     }
 
     /**
+     * This method is called from parser to process a text content section
+     * - remove text from inheritance child templates as they may generate output
+     * - strip text if strip is enabled
+     *
+     * @param string $text
+     *
+     * @return null|\Smarty_Internal_ParseTree_Text
+     */
+    public function processText($text)
+    {
+        $store = array();
+        $_store = 0;
+        $_offset = 0;
+        if ($this->parser->strip) {
+            if (strpos($text, '<') !== false) {
+                // capture html elements not to be messed with
+                $_offset = 0;
+                if (preg_match_all('#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+                                   $text, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+                    foreach ($matches as $match) {
+                        $store[] = $match[ 0 ][ 0 ];
+                        $_length = strlen($match[ 0 ][ 0 ]);
+                        $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+                        $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+
+                        $_offset += $_length - strlen($replace);
+                        $_store ++;
+                    }
+                }
+
+                $expressions = array(// replace multiple spaces between tags by a single space
+                                     // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
+                                     '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s'                                    => '\1 \2',
+                                     // remove spaces between attributes (but not in attribute values!)
+                                     '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+                                     '#^\s+<#Ss'                                                               => '<',
+                                     '#>\s+$#Ss'                                                               => '>',
+                                     $this->stripRegEx                                                         => ''
+                );
+
+                $text = preg_replace(array_keys($expressions), array_values($expressions), $text);
+                $_offset = 0;
+                if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $text, $matches,
+                                   PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+                    foreach ($matches as $match) {
+                        $_length = strlen($match[ 0 ][ 0 ]);
+                        $replace = $store[ $match[ 1 ][ 0 ] ];
+                        $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+
+                        $_offset += strlen($replace) - $_length;
+                        $_store ++;
+                    }
+                }
+            } else {
+                $text = preg_replace($this->stripRegEx, '', $text);
+            }
+        }
+        if ($text) {
+            return new Smarty_Internal_ParseTree_Text($text);
+        }
+        return null;
+     }
+
+    /**
      * lazy loads internal compile plugin for tag and calls the compile method
      * compile objects cached for reuse.
      * class name format:  Smarty_Internal_Compile_TagName
-     * plugin filename format: Smarty_Internal_Tagname.php
+     * plugin filename format: Smarty_Internal_TagName.php
      *
      * @param  string $tag    tag name
      * @param  array  $args   list of tag attributes
@@ -565,23 +853,23 @@ abstract class Smarty_Internal_TemplateCompilerBase
     public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
     {
         // re-use object if already exists
-        if (isset(self::$_tag_objects[$tag])) {
-            // compile this tag
-            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
-        }
-        // lazy load internal compiler plugin
-        $class_name = 'Smarty_Internal_Compile_' . $tag;
-        if ($this->smarty->loadPlugin($class_name)) {
-            // check if tag allowed by security
-            if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-                // use plugin if found
-                self::$_tag_objects[$tag] = new $class_name;
-                // compile this tag
-                return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
+        if (!isset($this->_tag_objects[$tag])) {
+            // lazy load internal compiler plugin
+            $_tag = explode('_', $tag);
+            $_tag = array_map('ucfirst', $_tag);
+            $class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag);
+            if (class_exists($class_name) &&
+                (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
+            ) {
+                $this->_tag_objects[$tag] = new $class_name;
+            } else {
+                $this->_tag_objects[$tag] = false;
+                return false;
             }
         }
-        // no internal compile plugin for this tag
-        return false;
+        // compile this tag
+        return $this->_tag_objects[$tag] === false ? false :
+            $this->_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
     }
 
     /**
@@ -596,18 +884,24 @@ abstract class Smarty_Internal_TemplateCompilerBase
     {
         $function = null;
         if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-            if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
-            } elseif (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type] = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type];
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
+            if (isset($this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type])) {
+                $function =
+                    $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
+            } elseif (isset($this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type])) {
+                $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type] =
+                    $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type];
+                $function =
+                    $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
             }
         } else {
-            if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
-            } elseif (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type] = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type];
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
+            if (isset($this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type])) {
+                $function =
+                    $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
+            } elseif (isset($this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type])) {
+                $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type] =
+                    $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type];
+                $function =
+                    $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
             }
         }
         if (isset($function)) {
@@ -623,11 +917,15 @@ abstract class Smarty_Internal_TemplateCompilerBase
 
         if (is_string($file)) {
             if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['file'] = $file;
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'] = $function;
+                $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type]['file'] =
+                    $file;
+                $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name][$plugin_type]['function'] =
+                    $function;
             } else {
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['file'] = $file;
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'] = $function;
+                $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type]['file'] =
+                    $file;
+                $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name][$plugin_type]['function'] =
+                    $function;
             }
             if ($plugin_type == 'modifier') {
                 $this->modifier_plugins[$plugin_name] = true;
@@ -656,21 +954,24 @@ abstract class Smarty_Internal_TemplateCompilerBase
         $callback = null;
         $script = null;
         $cacheable = true;
-        $result = call_user_func_array(
-            $this->smarty->default_plugin_handler_func, array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable)
-        );
+        $result = call_user_func_array($this->smarty->default_plugin_handler_func,
+                                       array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable));
         if ($result) {
             $this->tag_nocache = $this->tag_nocache || !$cacheable;
             if ($script !== null) {
                 if (is_file($script)) {
                     if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['file'] = $script;
-                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['function'] = $callback;
+                        $this->parent_compiler->template->compiled->required_plugins['nocache'][$tag][$plugin_type]['file'] =
+                            $script;
+                        $this->parent_compiler->template->compiled->required_plugins['nocache'][$tag][$plugin_type]['function'] =
+                            $callback;
                     } else {
-                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['file'] = $script;
-                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['function'] = $callback;
+                        $this->parent_compiler->template->compiled->required_plugins['compiled'][$tag][$plugin_type]['file'] =
+                            $script;
+                        $this->parent_compiler->template->compiled->required_plugins['compiled'][$tag][$plugin_type]['function'] =
+                            $callback;
                     }
-                    include_once $script;
+                    require_once $script;
                 } else {
                     $this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found");
                 }
@@ -691,6 +992,25 @@ abstract class Smarty_Internal_TemplateCompilerBase
     }
 
     /**
+     * Append code segments and remove unneeded ?> <?php transitions
+     *
+     * @param string $left
+     * @param string $right
+     *
+     * @return string
+     */
+    public function appendCode($left, $right)
+    {
+        if (preg_match('/\s*\?>\s*$/', $left) && preg_match('/^\s*<\?php\s+/', $right)) {
+            $left = preg_replace('/\s*\?>\s*$/', "\n", $left);
+            $left .= preg_replace('/^\s*<\?php\s+/', '', $right);
+        } else {
+            $left .= $right;
+        }
+        return $left;
+    }
+
+    /**
      * Inject inline code for nocache template sections
      * This method gets the content of each template element from the parser.
      * If the content is compiled code and it should be not cached the code is injected
@@ -706,17 +1026,19 @@ abstract class Smarty_Internal_TemplateCompilerBase
         // If the template is not evaluated and we have a nocache section and or a nocache tag
         if ($is_code && !empty($content)) {
             // generate replacement code
-            if ((!($this->template->source->recompiled) || $this->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing &&
-                ($this->nocache || $this->tag_nocache)
+            if ((!($this->template->source->handler->recompiled) || $this->forceNocache) && $this->template->caching &&
+                !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache)
             ) {
-                $this->template->has_nocache_code = true;
+                $this->template->compiled->has_nocache_code = true;
                 $_output = addcslashes($content, '\'\\');
                 $_output = str_replace("^#^", "'", $_output);
-                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
+                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output .
+                    "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
                 // make sure we include modifier plugins for nocache code
                 foreach ($this->modifier_plugins as $plugin_name => $dummy) {
-                    if (isset($this->template->required_plugins['compiled'][$plugin_name]['modifier'])) {
-                        $this->template->required_plugins['nocache'][$plugin_name]['modifier'] = $this->template->required_plugins['compiled'][$plugin_name]['modifier'];
+                    if (isset($this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name]['modifier'])) {
+                        $this->parent_compiler->template->compiled->required_plugins['nocache'][$plugin_name]['modifier'] =
+                            $this->parent_compiler->template->compiled->required_plugins['compiled'][$plugin_name]['modifier'];
                     }
                 }
             } else {
@@ -733,44 +1055,46 @@ abstract class Smarty_Internal_TemplateCompilerBase
     }
 
     /**
-     *  push current file and line offset on stack for tracing {block} source lines
+     * Get Id
      *
-     * @param string      $file  new filename
-     * @param string      $uid   uid of file
-     * @param int         $line  line offset to source
-     * @param bool $debug false debug end_compile shall not be called
+     * @param string $input
+     *
+     * @return bool|string
      */
-    public function pushTrace($file, $uid, $line, $debug = true)
+    public function getId($input)
     {
-        if ($this->smarty->debugging && $debug) {
-            Smarty_Internal_Debug::end_compile($this->template);
-        }
-        array_push($this->trace_stack, array($this->smarty->_current_file, $this->trace_filepath, $this->trace_uid, $this->trace_line_offset));
-        $this->trace_filepath = $this->smarty->_current_file = $file;
-        $this->trace_uid = $uid;
-        $this->trace_line_offset = $line;
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_compile($this->template);
+        if (preg_match('~^[\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*$~', $input, $match)) {
+            return $match[1];
         }
+        return false;
     }
 
     /**
-     *  restore file and line offset
-
+     * Get variable name from string
+     *
+     * @param string $input
+     *
+     * @return bool|string
      */
-    public function popTrace()
+    public function getVariableName($input)
     {
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::end_compile($this->template);
-        }
-        $r = array_pop($this->trace_stack);
-        $this->smarty->_current_file = $r[0];
-        $this->trace_filepath = $r[1];
-        $this->trace_uid = $r[2];
-        $this->trace_line_offset = $r[3];
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_compile($this->template);
+        if (preg_match('~^[$]_smarty_tpl->tpl_vars\[[\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*\]->value$~', $input, $match)) {
+            return $match[1];
         }
+        return false;
+    }
+
+    /**
+     * Generate nocache code string
+     *
+     * @param string $code PHP code
+     *
+     * @return string
+     */
+    public function makeNocacheCode($code)
+    {
+        return "echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/<?php " .
+        str_replace("^#^", "'", addcslashes($code, '\'\\')) . "?>/*/%%SmartyNocache:{$this->nocache_hash}%%*/';\n";
     }
 
     /**
@@ -779,32 +1103,53 @@ abstract class Smarty_Internal_TemplateCompilerBase
      * In this case the parser is called to obtain information about expected tokens.
      * If parameter $args contains a string this is used as error message
      *
-     * @param  string $args individual error message or null
-     * @param  string $line line-number
+     * @param  string   $args    individual error message or null
+     * @param  string   $line    line-number
+     * @param null|bool $tagline if true the line number of last tag
      *
-     * @throws SmartyCompilerException when an unexpected token is found
+     * @throws \SmartyCompilerException when an unexpected token is found
      */
-    public function trigger_template_error($args = null, $line = null)
+    public function trigger_template_error($args = null, $line = null, $tagline = null)
     {
-        // get template source line which has error
-        if (!isset($line)) {
-            $line = $this->lex->line;
+        $lex = $this->parser->lex;
+        if ($tagline === true) {
+            // get line number of Tag
+            $line = $lex->taglineno;
+        } elseif (!isset($line)) {
+            // get template source line which has error
+            $line = $lex->line;
+        } else {
+            $line = (int) $line;
         }
+
+        if (in_array($this->template->source->type, array('eval', 'string'))) {
+            $templateName = $this->template->source->type . ':' . trim(preg_replace('![\t\r\n]+!', ' ',
+                                                                                    strlen($lex->data) > 40 ?
+                                                                                        substr($lex->data, 0, 40) .
+                                                                                        '...' : $lex->data));
+        } else {
+            $templateName = $this->template->source->type . ':' . $this->template->source->filepath;
+        }
+
         //        $line += $this->trace_line_offset;
-        $match = preg_split("/\n/", $this->lex->data);
-        $error_text = 'Syntax error in template "' . (empty($this->trace_filepath) ? $this->template->source->filepath : $this->trace_filepath) . '"  on line ' . ($line + $this->trace_line_offset) . ' "' . trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1])) . '" ';
+        $match = preg_split("/\n/", $lex->data);
+        $error_text =
+            'Syntax error in template "' . (empty($this->trace_filepath) ? $templateName : $this->trace_filepath) .
+            '"  on line ' . ($line + $this->trace_line_offset) . ' "' .
+            trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1])) . '" ';
         if (isset($args)) {
             // individual error message
             $error_text .= $args;
         } else {
+            $expect = array();
             // expected token from parser
-            $error_text .= ' - Unexpected "' . $this->lex->value . '"';
+            $error_text .= ' - Unexpected "' . $lex->value . '"';
             if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
                 foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
                     $exp_token = $this->parser->yyTokenName[$token];
-                    if (isset($this->lex->smarty_token_names[$exp_token])) {
+                    if (isset($lex->smarty_token_names[$exp_token])) {
                         // token type from lexer
-                        $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
+                        $expect[] = '"' . $lex->smarty_token_names[$exp_token] . '"';
                     } else {
                         // otherwise internal token name
                         $expect[] = $this->parser->yyTokenName[$token];
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_templatelexer.php b/library/Smarty/libs/sysplugins/smarty_internal_templatelexer.php
index 4de8a9c06..993b7be62 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_templatelexer.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_templatelexer.php
@@ -1,102 +1,221 @@
 <?php
-/**
- * Smarty Internal Plugin Templatelexer
- * This is the lexer to break the template source into tokens
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
  *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
- * Smarty Internal Plugin Templatelexer
+ * Smarty_Internal_Templatelexer
+ * This is the template file lexer.
+ * It is generated from the smarty_internal_templatelexer.plex file
+ *
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
  */
 class Smarty_Internal_Templatelexer
 {
+    /**
+     * Source
+     *
+     * @var string
+     */
     public $data;
+
+    /**
+     * byte counter
+     *
+     * @var int
+     */
     public $counter;
+
+    /**
+     * token number
+     *
+     * @var int
+     */
     public $token;
+
+    /**
+     * token value
+     *
+     * @var string
+     */
     public $value;
-    public $node;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
     public $line;
+
+    /**
+     * tag start line
+     *
+     * @var
+     */
     public $taglineno;
-    public $is_phpScript = false;
+
+    /**
+     * php code type
+     *
+     * @var string
+     */
+    public $phpType = '';
+
+    /**
+     * escaped left delimiter
+     *
+     * @var string
+     */
+    public $ldel = '';
+
+    /**
+     * escaped left delimiter length
+     *
+     * @var int
+     */
+    public $ldel_length = 0;
+
+    /**
+     * escaped right delimiter
+     *
+     * @var string
+     */
+    public $rdel = '';
+
+    /**
+     * escaped right delimiter length
+     *
+     * @var int
+     */
+    public $rdel_length = 0;
+
+    /**
+     * state number
+     *
+     * @var int
+     */
     public $state = 1;
-    public $smarty;
-    public $literal_cnt = 0;
-    private $heredoc_id_stack = Array();
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * literal tag nesting level
+     *
+     * @var int
+     */
+    private $literal_cnt = 0;
+
+    /**
+     * PHP start tag string
+     *
+     * @var string
+     */
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
     public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
     public $yyTracePrompt;
-    public $state_name = array(1 => 'TEXT', 2 => 'SMARTY', 3 => 'LITERAL', 4 => 'DOUBLEQUOTEDSTRING', 5 => 'CHILDBODY');
+
+    /**
+     * XML flag true while processing xml
+     *
+     * @var bool
+     */
+    public $is_xml = false;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+
+    private $yy_global_pattern2 = null;
+
+    private $yy_global_pattern3 = null;
+
+    private $yy_global_pattern4 = null;
+
+    private $yy_global_pattern5 = null;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
     public $smarty_token_names = array(        // Text for parser error messages
-                                               'IDENTITY'        => '===',
-                                               'NONEIDENTITY'    => '!==',
-                                               'EQUALS'          => '==',
-                                               'NOTEQUALS'       => '!=',
-                                               'GREATEREQUAL'    => '(>=,ge)',
-                                               'LESSEQUAL'       => '(<=,le)',
-                                               'GREATERTHAN'     => '(>,gt)',
-                                               'LESSTHAN'        => '(<,lt)',
-                                               'MOD'             => '(%,mod)',
-                                               'NOT'             => '(!,not)',
-                                               'LAND'            => '(&&,and)',
-                                               'LOR'             => '(||,or)',
-                                               'LXOR'            => 'xor',
-                                               'OPENP'           => '(',
-                                               'CLOSEP'          => ')',
-                                               'OPENB'           => '[',
-                                               'CLOSEB'          => ']',
-                                               'PTR'             => '->',
-                                               'APTR'            => '=>',
-                                               'EQUAL'           => '=',
-                                               'NUMBER'          => 'number',
-                                               'UNIMATH'         => '+" , "-',
-                                               'MATH'            => '*" , "/" , "%',
-                                               'INCDEC'          => '++" , "--',
-                                               'SPACE'           => ' ',
-                                               'DOLLAR'          => '$',
-                                               'SEMICOLON'       => ';',
-                                               'COLON'           => ':',
-                                               'DOUBLECOLON'     => '::',
-                                               'AT'              => '@',
-                                               'HATCH'           => '#',
-                                               'QUOTE'           => '"',
-                                               'BACKTICK'        => '`',
-                                               'VERT'            => '|',
-                                               'DOT'             => '.',
-                                               'COMMA'           => '","',
-                                               'ANDSYM'          => '"&"',
-                                               'QMARK'           => '"?"',
-                                               'ID'              => 'identifier',
-                                               'TEXT'            => 'text',
-                                               'FAKEPHPSTARTTAG' => 'Fake PHP start tag',
-                                               'PHPSTARTTAG'     => 'PHP start tag',
-                                               'PHPENDTAG'       => 'PHP end tag',
-                                               'LITERALSTART'    => 'Literal start',
-                                               'LITERALEND'      => 'Literal end',
-                                               'LDELSLASH'       => 'closing tag',
-                                               'COMMENT'         => 'comment',
-                                               'AS'              => 'as',
-                                               'TO'              => 'to',
-    );
-
-    function __construct($data, $compiler)
-    {
-        //        $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data);
+                                               'NOT'         => '(!,not)', 'OPENP' => '(', 'CLOSEP' => ')',
+                                               'OPENB'       => '[', 'CLOSEB' => ']', 'PTR' => '->', 'APTR' => '=>',
+                                               'EQUAL'       => '=', 'NUMBER' => 'number', 'UNIMATH' => '+" , "-',
+                                               'MATH'        => '*" , "/" , "%', 'INCDEC' => '++" , "--',
+                                               'SPACE'       => ' ', 'DOLLAR' => '$', 'SEMICOLON' => ';',
+                                               'COLON'       => ':', 'DOUBLECOLON' => '::', 'AT' => '@', 'HATCH' => '#',
+                                               'QUOTE'       => '"', 'BACKTICK' => '`', 'VERT' => '"|" modifier',
+                                               'DOT'         => '.', 'COMMA' => '","', 'QMARK' => '"?"',
+                                               'ID'          => 'id, name', 'TEXT' => 'text',
+                                               'LDELSLASH'   => '{/..} closing tag', 'LDEL' => '{...} Smarty tag',
+                                               'COMMENT'     => 'comment', 'AS' => 'as', 'TO' => 'to',
+                                               'PHP'         => '"<?php", "<%", "{php}" tag',
+                                               'LOGOP'       => '"<", "==" ... logical operator',
+                                               'TLOGOP'      => '"lt", "eq" ... logical operator; "is div by" ... if condition',
+                                               'SCOND'       => '"is even" ... if condition',);
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    function __construct($data, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
         $this->data = $data;
         $this->counter = 0;
-        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
-            $this->counter += strlen($match[0]);
+        if (preg_match('~^\xEF\xBB\xBF~i', $this->data, $match)) {
+            $this->counter += strlen($match[ 0 ]);
         }
         $this->line = 1;
         $this->smarty = $compiler->smarty;
         $this->compiler = $compiler;
-        $this->ldel = preg_quote($this->smarty->left_delimiter, '/');
+        $this->ldel = preg_quote($this->smarty->left_delimiter, '~');
         $this->ldel_length = strlen($this->smarty->left_delimiter);
-        $this->rdel = preg_quote($this->smarty->right_delimiter, '/');
+        $this->rdel = preg_quote($this->smarty->right_delimiter, '~');
         $this->rdel_length = strlen($this->smarty->right_delimiter);
-        $this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter;
-        $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter;
+        $this->smarty_token_names[ 'LDEL' ] = $this->smarty->left_delimiter;
+        $this->smarty_token_names[ 'RDEL' ] = $this->smarty->right_delimiter;
     }
 
     public function PrintTrace()
@@ -105,7 +224,17 @@ class Smarty_Internal_Templatelexer
         $this->yyTracePrompt = '<br>';
     }
 
+    /*
+     * Check if this tag is autoliteral
+     */
+    public function isAutoLiteral()
+    {
+        return $this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false;
+    }
+
     private $_yy_state = 1;
+
     private $_yy_stack = array();
 
     public function yylex()
@@ -116,23 +245,31 @@ class Smarty_Internal_Templatelexer
     public function yypushstate($state)
     {
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+            fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt,
+                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+                        $this->_yy_state);
         }
         array_push($this->_yy_stack, $this->_yy_state);
         $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
+                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+                        $this->_yy_state);
         }
     }
 
     public function yypopstate()
     {
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+            fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,
+                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+                        $this->_yy_state);
         }
         $this->_yy_state = array_pop($this->_yy_stack);
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
+                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+                        $this->_yy_state);
         }
     }
 
@@ -140,57 +277,41 @@ class Smarty_Internal_Templatelexer
     {
         $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+            fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt,
+                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+                        $this->_yy_state);
         }
     }
 
     public function yylex1()
     {
-        $tokenMap = array(
-            1  => 0,
-            2  => 1,
-            4  => 0,
-            5  => 0,
-            6  => 0,
-            7  => 1,
-            9  => 0,
-            10 => 0,
-            11 => 0,
-            12 => 0,
-            13 => 0,
-            14 => 2,
-            17 => 0,
-            18 => 0,
-            19 => 0,
-            20 => 0,
-            21 => 0,
-            22 => 0,
-        );
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 =
+                "/\G([{][}])|\G(" . $this->ldel . "[*])|\G((" . $this->ldel . "\\s*php(.*?)" . $this->rdel . ")|(" .
+                $this->ldel . "\\s*[\/]php" . $this->rdel . "))|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel .
+                ")|\G(" . $this->ldel . "\\s*)|\G(\\s*" . $this->rdel .
+                ")|\G((<[?]((php\\s+|=)|\\s+))|(<[%])|(<[?]xml\\s+)|(<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|([?][>])|([%][>]))|\G([\S\s])/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\\{\\})|\G(" . $this->ldel . "\\*([\S\s]*?)\\*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G((<script\\s+language\\s*=\\s*[\"']?\\s*php\\s*[\"']?\\s*>)|(<\\?(?:php\\w+|=|[a-zA-Z]+)?))|\G(\\?>)|\G(<\/script>)|\G(\\s*" . $this->rdel . ")|\G(<%)|\G(%>)|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state TEXT');
+                if (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+                                        substr($this->data, $this->counter, 5) . '... state TEXT');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r1_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -210,8 +331,7 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
@@ -219,42 +339,38 @@ class Smarty_Internal_Templatelexer
 
     const TEXT = 1;
 
-    function yy_r1_1($yy_subpatterns)
+    function yy_r1_1()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r1_2($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_COMMENT;
-    }
-
-    function yy_r1_4($yy_subpatterns)
+    function yy_r1_2()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        preg_match("~[*]{$this->rdel}~", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ] + strlen($match[ 0 ][ 0 ]);
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
+            $this->compiler->trigger_template_error("missing or misspelled comment closing tag '*{$this->smarty->right_delimiter}'");
         }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        return false;
     }
 
-    function yy_r1_5($yy_subpatterns)
+    function yy_r1_3()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-        }
+        $obj = new Smarty_Internal_Compile_Private_Php();
+        $obj->parsePhp($this);
     }
 
-    function yy_r1_6($yy_subpatterns)
+    function yy_r1_7()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        ) {
             $this->token = Smarty_Internal_Templateparser::TP_TEXT;
         } else {
             $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
@@ -262,132 +378,40 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r1_7($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_9($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_10($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_11($yy_subpatterns)
+    function yy_r1_8()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        ) {
             $this->token = Smarty_Internal_Templateparser::TP_TEXT;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_12($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_13($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r1_14($yy_subpatterns)
-    {
-
-        if (($script = strpos($this->value, '<s') === 0) || in_array($this->value, Array('<?', '<?=', '<?php'))) {
-            if ($script) {
-                $this->is_phpScript = true;
-            }
-            $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-        } elseif ($this->value == '<?xml') {
-            $this->token = Smarty_Internal_Templateparser::TP_XMLTAG;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-            //$this->value = substr($this->value, 0, 2);
+            $this->yypushstate(self::TAG);
+            return true;
         }
     }
 
-    function yy_r1_17($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-    }
-
-    function yy_r1_18($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_PHPENDSCRIPT;
-    }
-
-    function yy_r1_19($yy_subpatterns)
+    function yy_r1_9()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r1_20($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-
-    function yy_r1_21($yy_subpatterns)
+    function yy_r1_10()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
+        $obj = new Smarty_Internal_Compile_Private_Php();
+        $obj->parsePhp($this);
     }
 
-    function yy_r1_22($yy_subpatterns)
+    function yy_r1_19()
     {
 
-        $phpEndScript = $this->is_phpScript ? '|<\\/script>' : '';
         $to = strlen($this->data);
-        preg_match("/{$this->ldel}|<\?|<%|\?>|%>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>{$phpEndScript}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
+        preg_match("~($this->ldel)|(<[?]((php\s+|=)|\s+))|(<[%])|(<[?]xml\s+)|(<script\s+language\s*=\s*[\"']?\s*php\s*[\"']?\s*>)|([?][>])|([%][>])~i",
+                   $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ];
         }
         $this->value = substr($this->data, $this->counter, $to - $this->counter);
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
@@ -395,99 +419,35 @@ class Smarty_Internal_Templatelexer
 
     public function yylex2()
     {
-        $tokenMap = array(
-            1  => 0,
-            2  => 0,
-            3  => 1,
-            5  => 0,
-            6  => 0,
-            7  => 0,
-            8  => 0,
-            9  => 0,
-            10 => 0,
-            11 => 0,
-            12 => 0,
-            13 => 0,
-            14 => 0,
-            15 => 1,
-            17 => 1,
-            19 => 1,
-            21 => 0,
-            22 => 0,
-            23 => 0,
-            24 => 0,
-            25 => 0,
-            26 => 0,
-            27 => 0,
-            28 => 0,
-            29 => 0,
-            30 => 0,
-            31 => 0,
-            32 => 0,
-            33 => 0,
-            34 => 0,
-            35 => 0,
-            36 => 0,
-            37 => 0,
-            38 => 3,
-            42 => 0,
-            43 => 0,
-            44 => 0,
-            45 => 0,
-            46 => 0,
-            47 => 0,
-            48 => 0,
-            49 => 0,
-            50 => 1,
-            52 => 1,
-            54 => 0,
-            55 => 0,
-            56 => 0,
-            57 => 0,
-            58 => 0,
-            59 => 0,
-            60 => 0,
-            61 => 0,
-            62 => 0,
-            63 => 0,
-            64 => 0,
-            65 => 0,
-            66 => 0,
-            67 => 0,
-            68 => 0,
-            69 => 0,
-            70 => 1,
-            72 => 0,
-            73 => 0,
-            74 => 0,
-            75 => 0,
-            76 => 0,
-        );
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 =
+                "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" .
+                $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel .
+                "\\s*[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel .
+                "\\s*[\/](?:(?!block)[0-9]*[a-zA-Z_]\\w*)\\s*" . $this->rdel . ")|\G(" . $this->ldel .
+                "\\s*[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/])|\G(" .
+                $this->ldel . "\\s*)/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G(\\$)|\G(\\s*" . $this->rdel . ")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(@)|\G(#)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state SMARTY');
+                if (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+                                        substr($this->data, $this->counter, 5) . '... state TAG');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r2_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -507,484 +467,457 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
     } // end function
 
-    const SMARTY = 2;
+    const TAG = 2;
 
-    function yy_r2_1($yy_subpatterns)
+    function yy_r2_1()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
 
-    function yy_r2_2($yy_subpatterns)
+    function yy_r2_3()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
 
-    function yy_r2_3($yy_subpatterns)
+    function yy_r2_4()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
         $this->taglineno = $this->line;
     }
 
-    function yy_r2_5($yy_subpatterns)
+    function yy_r2_5()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
 
-    function yy_r2_6($yy_subpatterns)
+    function yy_r2_6()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
         $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
     }
 
-    function yy_r2_7($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
-    }
-
-    function yy_r2_8($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_AS;
-    }
-
-    function yy_r2_9($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TO;
-    }
-
-    function yy_r2_10($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_STEP;
-    }
-
-    function yy_r2_11($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
-    }
-
-    function yy_r2_12($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
-    }
-
-    function yy_r2_13($yy_subpatterns)
+    function yy_r2_8()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
     }
 
-    function yy_r2_14($yy_subpatterns)
+    function yy_r2_9()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_EQUALS;
+        if ($this->_yy_stack[ count($this->_yy_stack) - 1 ] == self::TEXT) {
+            $this->yypopstate();
+            $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+            $this->taglineno = $this->line;
+        } else {
+            $this->value = $this->smarty->left_delimiter;
+            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->yybegin(self::TAGBODY);
+            $this->taglineno = $this->line;
+        }
     }
 
-    function yy_r2_15($yy_subpatterns)
+    function yy_r2_11()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
 
-    function yy_r2_17($yy_subpatterns)
+    function yy_r2_12()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
     }
 
-    function yy_r2_19($yy_subpatterns)
+    public function yylex3()
     {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = "/\G(\\s*" . $this->rdel . ")|\G(" . $this->ldel .
+                "\\s*)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*(([!=][=]{1,2})|([<][=>]?)|([>][=]?)|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor|(is\\s+(not\\s+)?(odd|even|div)\\s+by))\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G(([!]\\s*)|(not\\s+))|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|])|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS";
+        }
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
 
-        $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
-    }
-
-    function yy_r2_21($yy_subpatterns)
-    {
+        do {
+            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                if (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+                                        substr($this->data, $this->counter, 5) . '... state TAGBODY');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r3_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+            }
+            break;
+        } while (true);
+    } // end function
 
-        $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
-    }
+    const TAGBODY = 3;
 
-    function yy_r2_22($yy_subpatterns)
+    function yy_r3_1()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
+        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+        $this->yypopstate();
     }
 
-    function yy_r2_23($yy_subpatterns)
+    function yy_r3_2()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_MOD;
+        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        ) {
+            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+        } else {
+            $this->yypushstate(self::TAG);
+            return true;
+        }
     }
 
-    function yy_r2_24($yy_subpatterns)
+    function yy_r3_3()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_NOT;
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
     }
 
-    function yy_r2_25($yy_subpatterns)
+    function yy_r3_4()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LAND;
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
     }
 
-    function yy_r2_26($yy_subpatterns)
+    function yy_r3_5()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LOR;
+        $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+        $this->taglineno = $this->line;
     }
 
-    function yy_r2_27($yy_subpatterns)
+    function yy_r3_7()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_LXOR;
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
     }
 
-    function yy_r2_28($yy_subpatterns)
+    function yy_r3_8()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
     }
 
-    function yy_r2_29($yy_subpatterns)
+    function yy_r3_9()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
+        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
     }
 
-    function yy_r2_30($yy_subpatterns)
+    function yy_r3_10()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ISODD;
+        $this->token = Smarty_Internal_Templateparser::TP_AS;
     }
 
-    function yy_r2_31($yy_subpatterns)
+    function yy_r3_11()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
+        $this->token = Smarty_Internal_Templateparser::TP_TO;
     }
 
-    function yy_r2_32($yy_subpatterns)
+    function yy_r3_12()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
+        $this->token = Smarty_Internal_Templateparser::TP_STEP;
     }
 
-    function yy_r2_33($yy_subpatterns)
+    function yy_r3_13()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
+        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
     }
 
-    function yy_r2_34($yy_subpatterns)
+    function yy_r3_14()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
     }
 
-    function yy_r2_35($yy_subpatterns)
+    function yy_r3_19()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
     }
 
-    function yy_r2_36($yy_subpatterns)
+    function yy_r3_24()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
     }
 
-    function yy_r2_37($yy_subpatterns)
+    function yy_r3_27()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
+        $this->token = Smarty_Internal_Templateparser::TP_NOT;
     }
 
-    function yy_r2_38($yy_subpatterns)
+    function yy_r3_30()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
     }
 
-    function yy_r2_42($yy_subpatterns)
+    function yy_r3_34()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_OPENP;
     }
 
-    function yy_r2_43($yy_subpatterns)
+    function yy_r3_35()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
     }
 
-    function yy_r2_44($yy_subpatterns)
+    function yy_r3_36()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_OPENB;
     }
 
-    function yy_r2_45($yy_subpatterns)
+    function yy_r3_37()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
     }
 
-    function yy_r2_46($yy_subpatterns)
+    function yy_r3_38()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_PTR;
     }
 
-    function yy_r2_47($yy_subpatterns)
+    function yy_r3_39()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_APTR;
     }
 
-    function yy_r2_48($yy_subpatterns)
+    function yy_r3_40()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
     }
 
-    function yy_r2_49($yy_subpatterns)
+    function yy_r3_41()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
     }
 
-    function yy_r2_50($yy_subpatterns)
+    function yy_r3_43()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
     }
 
-    function yy_r2_52($yy_subpatterns)
+    function yy_r3_45()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_MATH;
     }
 
-    function yy_r2_54($yy_subpatterns)
+    function yy_r3_47()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_AT;
     }
 
-    function yy_r2_55($yy_subpatterns)
+    function yy_r3_48()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_HATCH;
     }
 
-    function yy_r2_56($yy_subpatterns)
+    function yy_r3_49()
     {
 
         // resolve conflicts with shorttag and right_delimiter starting with '='
-        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) == $this->smarty->right_delimiter) {
-            preg_match("/\s+/", $this->value, $match);
-            $this->value = $match[0];
+        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) ==
+            $this->smarty->right_delimiter
+        ) {
+            preg_match("~\s+~", $this->value, $match);
+            $this->value = $match[ 0 ];
             $this->token = Smarty_Internal_Templateparser::TP_SPACE;
         } else {
             $this->token = Smarty_Internal_Templateparser::TP_ATTR;
         }
     }
 
-    function yy_r2_57($yy_subpatterns)
+    function yy_r3_50()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+    }
+
+    function yy_r3_53()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_ID;
     }
 
-    function yy_r2_58($yy_subpatterns)
+    function yy_r3_54()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
     }
 
-    function yy_r2_59($yy_subpatterns)
+    function yy_r3_55()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
         $this->yypopstate();
     }
 
-    function yy_r2_60($yy_subpatterns)
+    function yy_r3_56()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_VERT;
     }
 
-    function yy_r2_61($yy_subpatterns)
+    function yy_r3_57()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_DOT;
     }
 
-    function yy_r2_62($yy_subpatterns)
+    function yy_r3_58()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_COMMA;
     }
 
-    function yy_r2_63($yy_subpatterns)
+    function yy_r3_59()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
     }
 
-    function yy_r2_64($yy_subpatterns)
+    function yy_r3_60()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
     }
 
-    function yy_r2_65($yy_subpatterns)
+    function yy_r3_61()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_COLON;
     }
 
-    function yy_r2_66($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
-    }
-
-    function yy_r2_67($yy_subpatterns)
+    function yy_r3_62()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_QMARK;
     }
 
-    function yy_r2_68($yy_subpatterns)
+    function yy_r3_63()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_HEX;
     }
 
-    function yy_r2_69($yy_subpatterns)
+    function yy_r3_64()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_SPACE;
     }
 
-    function yy_r2_70($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_72($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_73($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_74($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_75($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
-    }
-
-    function yy_r2_76($yy_subpatterns)
+    function yy_r3_65()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    public function yylex3()
+    public function yylex4()
     {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-            3 => 0,
-        );
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 =
+                "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" .
+                $this->rdel . ")|\G([\S\s])/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state LITERAL');
+                if (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+                                        substr($this->data, $this->counter, 5) . '... state LITERAL');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r4_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -1004,23 +937,22 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
     } // end function
 
-    const LITERAL = 3;
+    const LITERAL = 4;
 
-    function yy_r3_1($yy_subpatterns)
+    function yy_r4_1()
     {
 
         $this->literal_cnt ++;
         $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
 
-    function yy_r3_2($yy_subpatterns)
+    function yy_r4_2()
     {
 
         if ($this->literal_cnt) {
@@ -1032,13 +964,14 @@ class Smarty_Internal_Templatelexer
         }
     }
 
-    function yy_r3_3($yy_subpatterns)
+    function yy_r4_3()
     {
 
         $to = strlen($this->data);
-        preg_match("/{$this->ldel}\/?literal{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
+        preg_match("~{$this->ldel}[/]?literal{$this->rdel}~i", $this->data, $match, PREG_OFFSET_CAPTURE,
+                   $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ];
         } else {
             $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
         }
@@ -1046,48 +979,36 @@ class Smarty_Internal_Templatelexer
         $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
 
-    public function yylex4()
+    public function yylex5()
     {
-        $tokenMap = array(
-            1  => 1,
-            3  => 0,
-            4  => 0,
-            5  => 0,
-            6  => 0,
-            7  => 0,
-            8  => 0,
-            9  => 0,
-            10 => 0,
-            11 => 0,
-            12 => 0,
-            13 => 3,
-            17 => 0,
-        );
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 =
+                "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/]literal\\s*" .
+                $this->rdel . ")|\G(" . $this->ldel . "\\s*[\/])|\G(" . $this->ldel . "\\s*[0-9]*[a-zA-Z_]\\w*)|\G(" .
+                $this->ldel .
+                "\\s*)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" .
+                $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/isS";
+        }
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/iS";
 
         do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+                if (strlen($yysubmatches[ 0 ]) < 200) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+                } else {
+                    $yymatches = array_filter($yymatches, 'strlen');
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+                                        substr($this->data, $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r5_' . $this->token}();
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -1107,122 +1028,101 @@ class Smarty_Internal_Templatelexer
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
             }
             break;
         } while (true);
     } // end function
 
-    const DOUBLEQUOTEDSTRING = 4;
+    const DOUBLEQUOTEDSTRING = 5;
 
-    function yy_r4_1($yy_subpatterns)
+    function yy_r5_1()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r4_3($yy_subpatterns)
+    function yy_r5_2()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
-        }
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r4_4($yy_subpatterns)
+    function yy_r5_3()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        ) {
             $this->token = Smarty_Internal_Templateparser::TP_TEXT;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
+            $this->yypushstate(self::TAG);
+            return true;
         }
     }
 
-    function yy_r4_5($yy_subpatterns)
-    {
-
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    function yy_r4_6($yy_subpatterns)
+    function yy_r5_4()
     {
 
-        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-    function yy_r4_7($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        ) {
             $this->token = Smarty_Internal_Templateparser::TP_TEXT;
         } else {
-            $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-            $this->yypushstate(self::SMARTY);
-            $this->taglineno = $this->line;
+            $this->yypushstate(self::TAG);
+            return true;
         }
     }
 
-    function yy_r4_8($yy_subpatterns)
+    function yy_r5_5()
     {
 
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
+        if ($this->smarty->auto_literal && isset($this->value[ $this->ldel_length ]) ?
+            strpos(" \n\t\r", $this->value[ $this->ldel_length ]) !== false : false
+        ) {
             $this->token = Smarty_Internal_Templateparser::TP_TEXT;
         } else {
             $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-            $this->yypushstate(self::SMARTY);
             $this->taglineno = $this->line;
+            $this->yypushstate(self::TAGBODY);
         }
     }
 
-    function yy_r4_9($yy_subpatterns)
+    function yy_r5_6()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
         $this->yypopstate();
     }
 
-    function yy_r4_10($yy_subpatterns)
+    function yy_r5_7()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
         $this->value = substr($this->value, 0, - 1);
-        $this->yypushstate(self::SMARTY);
+        $this->yypushstate(self::TAGBODY);
         $this->taglineno = $this->line;
     }
 
-    function yy_r4_11($yy_subpatterns)
+    function yy_r5_8()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
     }
 
-    function yy_r4_12($yy_subpatterns)
+    function yy_r5_9()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r4_13($yy_subpatterns)
+    function yy_r5_10()
     {
 
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    function yy_r4_17($yy_subpatterns)
+    function yy_r5_14()
     {
 
         $to = strlen($this->data);
@@ -1230,323 +1130,6 @@ class Smarty_Internal_Templatelexer
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
-    public function yylex5()
-    {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-            3 => 0,
-            4 => 0,
-        );
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G([\S\s])/iS";
-
-        do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state CHILDBODY');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const CHILDBODY = 5;
-
-    function yy_r5_1($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            return false;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
-        }
-    }
-
-    function yy_r5_2($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            return false;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-        }
-    }
-
-    function yy_r5_3($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            return false;
-        } else {
-            $this->yypopstate();
-            return true;
-        }
-    }
-
-    function yy_r5_4($yy_subpatterns)
-    {
-
-        $to = strlen($this->data);
-        preg_match("/" . $this->ldel . "\s*((\/)?strip\s*" . $this->rdel . "|block\s+)/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        return false;
-    }
-
-    public function yylex6()
-    {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-            3 => 0,
-            4 => 1,
-            6 => 0,
-        );
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G(" . $this->ldel . "\\s*\/block)|\G(" . $this->ldel . "\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/iS";
-
-        do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state CHILDBLOCK');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r6_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const CHILDBLOCK = 6;
-
-    function yy_r6_1($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-            $this->yypushstate(self::CHILDLITERAL);
-        }
-    }
-
-    function yy_r6_2($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->yypopstate();
-            return true;
-        }
-    }
-
-    function yy_r6_3($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->yypopstate();
-            return true;
-        }
-    }
-
-    function yy_r6_4($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->yypopstate();
-            return true;
-        }
-    }
-
-    function yy_r6_6($yy_subpatterns)
-    {
-
-        $to = strlen($this->data);
-        preg_match("/" . $this->ldel . "\s*(literal\s*" . $this->rdel . "|(\/)?block(\s|" . $this->rdel . ")|[\$]smarty\.block\.(child|parent))/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-    }
-
-    public function yylex7()
-    {
-        $tokenMap = array(
-            1 => 0,
-            2 => 0,
-            3 => 0,
-        );
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS";
-
-        do {
-            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                                        ' an empty string.  Input "' . substr($this->data,
-                                                                              $this->counter, 5) . '... state CHILDLITERAL');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                                                $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r7_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-    } // end function
-
-    const CHILDLITERAL = 7;
-
-    function yy_r7_1($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-            $this->yypushstate(self::CHILDLITERAL);
-        }
-    }
-
-    function yy_r7_2($yy_subpatterns)
-    {
-
-        if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-        } else {
-            $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-            $this->yypopstate();
-        }
-    }
-
-    function yy_r7_3($yy_subpatterns)
-    {
-
-        $to = strlen($this->data);
-        preg_match("/{$this->ldel}\/?literal\s*{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[0][1])) {
-            $to = $match[0][1];
-        } else {
-            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-    }
 }
 
      
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_templateparser.php b/library/Smarty/libs/sysplugins/smarty_internal_templateparser.php
index 98b9fc7fb..57dbf61a3 100644
--- a/library/Smarty/libs/sysplugins/smarty_internal_templateparser.php
+++ b/library/Smarty/libs/sysplugins/smarty_internal_templateparser.php
@@ -1,17 +1,9 @@
 <?php
 
-/**
- * Smarty Internal Plugin Templateparser
- * This is the template parser.
- * It is generated from the internal.templateparser.y file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
 class TP_yyToken implements ArrayAccess
 {
     public $string = '';
+
     public $metadata = array();
 
     public function __construct($s, $m = array())
@@ -31,7 +23,7 @@ class TP_yyToken implements ArrayAccess
 
     public function __toString()
     {
-        return $this->_string;
+        return $this->string;
     }
 
     public function offsetExists($offset)
@@ -48,8 +40,7 @@ class TP_yyToken implements ArrayAccess
     {
         if ($offset === null) {
             if (isset($value[0])) {
-                $x = ($value instanceof TP_yyToken) ?
-                    $value->metadata : $value;
+                $x = ($value instanceof TP_yyToken) ? $value->metadata : $value;
                 $this->metadata = array_merge($this->metadata, $x);
 
                 return;
@@ -85,2072 +76,809 @@ class TP_yyStackEntry
 
 ;
 
-#line 13 "smarty_internal_templateparser.y"
-class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php"
+#line 11 "../smarty/lexer/smarty_internal_templateparser.y"
+
+/**
+ * Smarty Template Parser Class
+ *
+ * This is the template parser.
+ * It is generated from the smarty_internal_templateparser.y file
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Templateparser
 {
-    #line 15 "smarty_internal_templateparser.y"
+    #line 23 "../smarty/lexer/smarty_internal_templateparser.y"
 
     const Err1 = "Security error: Call to private object member not allowed";
+
     const Err2 = "Security error: Call to dynamic object member not allowed";
+
     const Err3 = "PHP in template not allowed. Use SmartyBC to enable it";
-    // states whether the parse was successful or not
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
     public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
     public $retvalue = 0;
+
+    /**
+     * counter for prefix code
+     *
+     * @var int
+     */
     public static $prefix_number = 0;
-    private $_string;
+
+    /**
+     * @var
+     */
     public $yymajor;
+
+    /**
+     * last index of array variable
+     *
+     * @var mixed
+     */
     public $last_index;
+
+    /**
+     * last variable name
+     *
+     * @var string
+     */
     public $last_variable;
+
+    /**
+     * root parse tree buffer
+     *
+     * @var Smarty_Internal_ParseTree
+     */
     public $root_buffer;
+
+    /**
+     * current parse tree object
+     *
+     * @var Smarty_Internal_ParseTree
+     */
     public $current_buffer;
-    private $lex;
+
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Templatelexer
+     */
+    public $lex;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
     private $internalError = false;
-    private $strip = false;
 
-    function __construct($lex, $compiler)
+    /**
+     * {strip} status
+     *
+     * @var bool
+     */
+    public $strip = false;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * template object
+     *
+     * @var Smarty_Internal_Template
+     */
+    public $template = null;
+
+    /**
+     * block nesting level
+     *
+     * @var int
+     */
+    public $block_nesting_level = 0;
+
+    /**
+     * security object
+     *
+     * @var Smarty_Security
+     */
+    public $security = null;
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_prefix = array();
+
+    /**
+     * security object
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_postfix = array();
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Templatelexer        $lex
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
     {
         $this->lex = $lex;
         $this->compiler = $compiler;
-        $this->smarty = $this->compiler->smarty;
         $this->template = $this->compiler->template;
-        $this->compiler->has_variable_string = false;
-        $this->compiler->prefix_code = array();
-        $this->block_nesting_level = 0;
-        if ($this->security = isset($this->smarty->security_policy)) {
-            $this->php_handling = $this->smarty->security_policy->php_handling;
-        } else {
-            $this->php_handling = $this->smarty->php_handling;
-        }
-        $this->is_xml = false;
-        $this->asp_tags = (ini_get('asp_tags') != '0');
-        $this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this);
+        $this->smarty = $this->template->smarty;
+        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
+        $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
     }
 
-    public function compileVariable($variable)
+    /**
+     * insert PHP code in current buffer
+     *
+     * @param string $code
+     */
+    public function insertPhpCode($code)
     {
-        if (strpos($variable, '(') == 0) {
-            // not a variable variable
-            $var = trim($variable, '\'');
-            $this->compiler->tag_nocache = $this->compiler->tag_nocache | $this->template->getVariable($var, null, true, false)->nocache;
-            $this->template->properties['variables'][$var] = $this->compiler->tag_nocache | $this->compiler->nocache;
-        }
-        //       return '(isset($_smarty_tpl->tpl_vars['. $variable .'])?$_smarty_tpl->tpl_vars['. $variable .']->value:$_smarty_tpl->getVariable('. $variable .')->value)';
-        return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
+        $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code));
     }
 
-    #line 130 "smarty_internal_templateparser.php"
+    /**
+     *  merge PHP code with prefix code and return parse tree tag object
+     *
+     * @param string $code
+     *
+     * @return Smarty_Internal_ParseTree_Tag
+     */
+    public function mergePrefixCode($code)
+    {
+        $tmp = '';
+        foreach ($this->compiler->prefix_code as $preCode) {
+            $tmp .= $preCode;
+        }
+        $this->compiler->prefix_code = array();
+        $tmp .= $code;
+        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
+    }
 
     const TP_VERT = 1;
+
     const TP_COLON = 2;
-    const TP_RDEL = 3;
-    const TP_COMMENT = 4;
-    const TP_PHPSTARTTAG = 5;
-    const TP_PHPENDTAG = 6;
-    const TP_PHPENDSCRIPT = 7;
-    const TP_ASPSTARTTAG = 8;
-    const TP_ASPENDTAG = 9;
-    const TP_XMLTAG = 10;
-    const TP_TEXT = 11;
-    const TP_STRIPON = 12;
-    const TP_STRIPOFF = 13;
-    const TP_BLOCKSOURCE = 14;
-    const TP_LITERALSTART = 15;
-    const TP_LITERALEND = 16;
-    const TP_LITERAL = 17;
-    const TP_LDEL = 18;
-    const TP_DOLLAR = 19;
-    const TP_ID = 20;
-    const TP_EQUAL = 21;
-    const TP_PTR = 22;
-    const TP_LDELIF = 23;
-    const TP_LDELFOR = 24;
-    const TP_SEMICOLON = 25;
-    const TP_INCDEC = 26;
-    const TP_TO = 27;
-    const TP_STEP = 28;
-    const TP_LDELFOREACH = 29;
-    const TP_SPACE = 30;
-    const TP_AS = 31;
-    const TP_APTR = 32;
-    const TP_LDELSETFILTER = 33;
-    const TP_SMARTYBLOCKCHILDPARENT = 34;
-    const TP_LDELSLASH = 35;
-    const TP_ATTR = 36;
-    const TP_INTEGER = 37;
-    const TP_COMMA = 38;
-    const TP_OPENP = 39;
-    const TP_CLOSEP = 40;
-    const TP_MATH = 41;
-    const TP_UNIMATH = 42;
-    const TP_ANDSYM = 43;
-    const TP_ISIN = 44;
-    const TP_ISDIVBY = 45;
-    const TP_ISNOTDIVBY = 46;
-    const TP_ISEVEN = 47;
-    const TP_ISNOTEVEN = 48;
-    const TP_ISEVENBY = 49;
-    const TP_ISNOTEVENBY = 50;
-    const TP_ISODD = 51;
-    const TP_ISNOTODD = 52;
-    const TP_ISODDBY = 53;
-    const TP_ISNOTODDBY = 54;
-    const TP_INSTANCEOF = 55;
-    const TP_QMARK = 56;
-    const TP_NOT = 57;
-    const TP_TYPECAST = 58;
-    const TP_HEX = 59;
-    const TP_DOT = 60;
-    const TP_SINGLEQUOTESTRING = 61;
-    const TP_DOUBLECOLON = 62;
-    const TP_AT = 63;
-    const TP_HATCH = 64;
-    const TP_OPENB = 65;
-    const TP_CLOSEB = 66;
-    const TP_EQUALS = 67;
-    const TP_NOTEQUALS = 68;
-    const TP_GREATERTHAN = 69;
-    const TP_LESSTHAN = 70;
-    const TP_GREATEREQUAL = 71;
-    const TP_LESSEQUAL = 72;
-    const TP_IDENTITY = 73;
-    const TP_NONEIDENTITY = 74;
-    const TP_MOD = 75;
-    const TP_LAND = 76;
-    const TP_LOR = 77;
-    const TP_LXOR = 78;
-    const TP_QUOTE = 79;
-    const TP_BACKTICK = 80;
-    const TP_DOLLARID = 81;
-    const YY_NO_ACTION = 560;
-    const YY_ACCEPT_ACTION = 559;
-    const YY_ERROR_ACTION = 558;
-
-    const YY_SZ_ACTTAB = 2541;
-    static public $yy_action = array(
-        /*     0 */
-        225, 35, 312, 333, 198, 272, 273, 275, 283, 292,
-        /*    10 */
-        293, 294, 295, 287, 288, 267, 190, 43, 19, 8,
-        /*    20 */
-        204, 14, 212, 299, 2, 108, 225, 9, 424, 41,
-        /*    30 */
-        139, 208, 225, 41, 250, 32, 228, 13, 159, 32,
-        /*    40 */
-        51, 52, 50, 44, 11, 12, 298, 300, 21, 23,
-        /*    50 */
-        303, 302, 25, 17, 225, 424, 234, 225, 225, 381,
-        /*    60 */
-        421, 424, 45, 38, 145, 357, 313, 323, 322, 324,
-        /*    70 */
-        325, 326, 320, 315, 314, 316, 317, 319, 127, 41,
-        /*    80 */
-        46, 42, 338, 41, 168, 32, 41, 421, 14, 32,
-        /*    90 */
-        299, 34, 32, 421, 51, 52, 50, 44, 11, 12,
-        /*   100 */
-        298, 300, 21, 23, 303, 302, 25, 17, 225, 104,
-        /*   110 */
-        185, 46, 46, 559, 95, 279, 242, 271, 3, 321,
-        /*   120 */
-        313, 323, 322, 324, 325, 326, 320, 315, 314, 316,
-        /*   130 */
-        317, 319, 14, 241, 299, 34, 208, 41, 225, 14,
-        /*   140 */
-        418, 299, 28, 32, 179, 7, 356, 285, 51, 52,
-        /*   150 */
-        50, 44, 11, 12, 298, 300, 21, 23, 303, 302,
-        /*   160 */
-        25, 17, 225, 225, 274, 424, 240, 41, 134, 190,
-        /*   170 */
-        332, 343, 340, 32, 313, 323, 322, 324, 325, 326,
-        /*   180 */
-        320, 315, 314, 316, 317, 319, 37, 122, 182, 31,
-        /*   190 */
-        202, 225, 424, 352, 225, 14, 7, 299, 424, 225,
-        /*   200 */
-        150, 386, 51, 52, 50, 44, 11, 12, 298, 300,
-        /*   210 */
-        21, 23, 303, 302, 25, 17, 225, 46, 349, 134,
-        /*   220 */
-        41, 278, 242, 271, 7, 29, 32, 341, 313, 323,
-        /*   230 */
-        322, 324, 325, 326, 320, 315, 314, 316, 317, 319,
-        /*   240 */
-        226, 227, 197, 304, 103, 184, 232, 134, 46, 14,
-        /*   250 */
-        35, 299, 265, 46, 321, 18, 51, 52, 50, 44,
-        /*   260 */
-        11, 12, 298, 300, 21, 23, 303, 302, 25, 17,
-        /*   270 */
-        225, 208, 264, 259, 258, 218, 6, 109, 345, 35,
-        /*   280 */
-        193, 263, 313, 323, 322, 324, 325, 326, 320, 315,
-        /*   290 */
-        314, 316, 317, 319, 241, 192, 304, 107, 102, 175,
-        /*   300 */
-        269, 201, 191, 304, 203, 142, 253, 208, 321, 335,
-        /*   310 */
-        51, 52, 50, 44, 11, 12, 298, 300, 21, 23,
-        /*   320 */
-        303, 302, 25, 17, 225, 208, 268, 196, 208, 305,
-        /*   330 */
-        485, 208, 230, 200, 308, 485, 313, 323, 322, 324,
-        /*   340 */
-        325, 326, 320, 315, 314, 316, 317, 319, 30, 159,
-        /*   350 */
-        105, 20, 233, 161, 186, 305, 301, 274, 256, 247,
-        /*   360 */
-        208, 225, 321, 36, 51, 52, 50, 44, 11, 12,
-        /*   370 */
-        298, 300, 21, 23, 303, 302, 25, 17, 225, 204,
-        /*   380 */
-        207, 14, 254, 299, 131, 259, 249, 225, 158, 127,
-        /*   390 */
-        313, 323, 322, 324, 325, 326, 320, 315, 314, 316,
-        /*   400 */
-        317, 319, 237, 262, 130, 225, 45, 183, 187, 14,
-        /*   410 */
-        169, 223, 301, 342, 274, 334, 321, 321, 51, 52,
-        /*   420 */
-        50, 44, 11, 12, 298, 300, 21, 23, 303, 302,
-        /*   430 */
-        25, 17, 225, 204, 204, 14, 6, 244, 141, 259,
-        /*   440 */
-        291, 46, 98, 194, 313, 323, 322, 324, 325, 326,
-        /*   450 */
-        320, 315, 314, 316, 317, 319, 132, 262, 227, 166,
-        /*   460 */
-        163, 189, 14, 284, 231, 26, 237, 27, 321, 321,
-        /*   470 */
-        321, 32, 51, 52, 50, 44, 11, 12, 298, 300,
-        /*   480 */
-        21, 23, 303, 302, 25, 17, 225, 204, 14, 276,
-        /*   490 */
-        245, 206, 22, 4, 144, 328, 150, 120, 313, 323,
-        /*   500 */
-        322, 324, 325, 326, 320, 315, 314, 316, 317, 319,
-        /*   510 */
-        195, 348, 262, 176, 171, 39, 30, 199, 143, 180,
-        /*   520 */
-        148, 281, 321, 260, 159, 230, 51, 52, 50, 44,
-        /*   530 */
-        11, 12, 298, 300, 21, 23, 303, 302, 25, 17,
-        /*   540 */
-        225, 296, 205, 129, 346, 289, 124, 329, 125, 339,
-        /*   550 */
-        97, 119, 313, 323, 322, 324, 325, 326, 320, 315,
-        /*   560 */
-        314, 316, 317, 319, 127, 262, 262, 239, 277, 282,
-        /*   570 */
-        307, 94, 266, 351, 269, 170, 159, 181, 172, 106,
-        /*   580 */
-        51, 52, 50, 44, 11, 12, 298, 300, 21, 23,
-        /*   590 */
-        303, 302, 25, 17, 225, 330, 270, 301, 15, 115,
-        /*   600 */
-        331, 310, 326, 255, 140, 126, 313, 323, 322, 324,
-        /*   610 */
-        325, 326, 320, 315, 314, 316, 317, 319, 301, 326,
-        /*   620 */
-        262, 326, 326, 326, 326, 326, 326, 326, 326, 326,
-        /*   630 */
-        326, 326, 326, 243, 51, 52, 50, 44, 11, 12,
-        /*   640 */
-        298, 300, 21, 23, 303, 302, 25, 17, 225, 40,
-        /*   650 */
-        326, 326, 326, 326, 326, 326, 326, 113, 99, 100,
-        /*   660 */
-        313, 323, 322, 324, 325, 326, 320, 315, 314, 316,
-        /*   670 */
-        317, 319, 262, 262, 262, 326, 326, 326, 326, 326,
-        /*   680 */
-        326, 326, 326, 326, 326, 326, 326, 326, 51, 52,
-        /*   690 */
-        50, 44, 11, 12, 298, 300, 21, 23, 303, 302,
-        /*   700 */
-        25, 17, 225, 326, 326, 326, 326, 326, 326, 326,
-        /*   710 */
-        326, 114, 326, 326, 313, 323, 322, 324, 325, 326,
-        /*   720 */
-        320, 315, 314, 316, 317, 319, 262, 326, 326, 326,
-        /*   730 */
-        326, 326, 326, 326, 326, 326, 326, 326, 326, 326,
-        /*   740 */
-        326, 286, 51, 52, 50, 44, 11, 12, 298, 300,
-        /*   750 */
-        21, 23, 303, 302, 25, 17, 225, 326, 326, 326,
-        /*   760 */
-        326, 326, 326, 326, 326, 326, 326, 326, 313, 323,
-        /*   770 */
-        322, 324, 325, 326, 320, 315, 314, 316, 317, 319,
-        /*   780 */
-        326, 326, 326, 326, 326, 326, 326, 326, 326, 326,
-        /*   790 */
-        326, 326, 326, 326, 326, 326, 51, 52, 50, 44,
-        /*   800 */
-        11, 12, 298, 300, 21, 23, 303, 302, 25, 17,
-        /*   810 */
-        326, 326, 326, 326, 326, 326, 326, 326, 326, 326,
-        /*   820 */
-        159, 326, 313, 323, 322, 324, 325, 326, 320, 315,
-        /*   830 */
-        314, 316, 317, 319, 326, 326, 326, 326, 51, 52,
-        /*   840 */
-        50, 44, 11, 12, 298, 300, 21, 23, 303, 302,
-        /*   850 */
-        25, 17, 326, 326, 326, 326, 326, 326, 212, 326,
-        /*   860 */
-        326, 326, 326, 9, 313, 323, 322, 324, 325, 326,
-        /*   870 */
-        320, 315, 314, 316, 317, 319, 326, 326, 326, 326,
-        /*   880 */
-        326, 326, 326, 8, 138, 211, 326, 326, 2, 108,
-        /*   890 */
-        326, 235, 326, 326, 139, 157, 165, 326, 250, 128,
-        /*   900 */
-        228, 326, 246, 326, 24, 321, 326, 48, 261, 326,
-        /*   910 */
-        326, 251, 336, 353, 326, 311, 326, 301, 174, 173,
-        /*   920 */
-        326, 326, 49, 47, 280, 238, 297, 321, 321, 105,
-        /*   930 */
-        1, 337, 326, 147, 326, 326, 326, 326, 326, 301,
-        /*   940 */
-        301, 8, 123, 92, 96, 257, 2, 108, 326, 311,
-        /*   950 */
-        326, 326, 139, 326, 326, 235, 250, 309, 228, 146,
-        /*   960 */
-        246, 326, 24, 128, 162, 48, 326, 326, 326, 326,
-        /*   970 */
-        235, 326, 350, 321, 155, 251, 336, 353, 128, 311,
-        /*   980 */
-        49, 47, 280, 238, 297, 301, 326, 105, 1, 326,
-        /*   990 */
-        251, 336, 353, 326, 311, 14, 326, 299, 326, 8,
-        /*  1000 */
-        138, 224, 96, 326, 2, 108, 326, 41, 326, 252,
-        /*  1010 */
-        139, 235, 326, 32, 250, 153, 228, 326, 246, 128,
-        /*  1020 */
-        24, 326, 326, 48, 326, 326, 326, 326, 326, 326,
-        /*  1030 */
-        326, 251, 336, 353, 326, 311, 326, 326, 49, 47,
-        /*  1040 */
-        280, 238, 297, 326, 326, 105, 1, 326, 326, 326,
-        /*  1050 */
-        326, 326, 14, 326, 299, 326, 326, 8, 142, 224,
-        /*  1060 */
-        96, 326, 2, 108, 41, 235, 248, 326, 139, 154,
-        /*  1070 */
-        32, 235, 250, 128, 228, 156, 246, 326, 33, 128,
-        /*  1080 */
-        326, 48, 326, 326, 326, 251, 336, 353, 326, 311,
-        /*  1090 */
-        326, 251, 336, 353, 326, 311, 49, 47, 280, 238,
-        /*  1100 */
-        297, 326, 326, 105, 1, 326, 326, 326, 326, 326,
-        /*  1110 */
-        326, 326, 326, 326, 326, 8, 138, 213, 96, 326,
-        /*  1120 */
-        2, 108, 326, 326, 326, 326, 139, 235, 326, 326,
-        /*  1130 */
-        250, 149, 228, 326, 246, 128, 24, 326, 326, 48,
-        /*  1140 */
-        326, 326, 326, 326, 326, 326, 326, 251, 336, 353,
-        /*  1150 */
-        326, 311, 326, 326, 49, 47, 280, 238, 297, 326,
-        /*  1160 */
-        326, 105, 1, 326, 326, 326, 326, 326, 326, 326,
-        /*  1170 */
-        326, 326, 326, 8, 138, 210, 96, 326, 2, 108,
-        /*  1180 */
-        326, 326, 326, 326, 139, 235, 326, 326, 250, 151,
-        /*  1190 */
-        228, 326, 219, 128, 24, 326, 326, 48, 326, 326,
-        /*  1200 */
-        326, 326, 326, 326, 326, 251, 336, 353, 326, 311,
-        /*  1210 */
-        326, 326, 49, 47, 280, 238, 297, 326, 326, 105,
-        /*  1220 */
-        1, 326, 326, 326, 326, 326, 326, 326, 326, 326,
-        /*  1230 */
-        326, 8, 136, 224, 96, 326, 2, 108, 326, 326,
-        /*  1240 */
-        326, 326, 139, 235, 326, 326, 250, 152, 228, 326,
-        /*  1250 */
-        246, 128, 24, 326, 326, 48, 326, 326, 326, 326,
-        /*  1260 */
-        326, 326, 326, 251, 336, 353, 326, 311, 326, 326,
-        /*  1270 */
-        49, 47, 280, 238, 297, 326, 326, 105, 1, 326,
-        /*  1280 */
-        225, 326, 391, 326, 422, 326, 326, 326, 326, 8,
-        /*  1290 */
-        135, 224, 96, 326, 2, 108, 326, 326, 326, 326,
-        /*  1300 */
-        139, 236, 229, 326, 250, 326, 228, 326, 246, 41,
-        /*  1310 */
-        5, 422, 326, 48, 326, 32, 326, 422, 7, 326,
-        /*  1320 */
-        7, 326, 326, 326, 198, 178, 326, 326, 49, 47,
-        /*  1330 */
-        280, 238, 297, 326, 321, 105, 1, 43, 19, 326,
-        /*  1340 */
-        326, 134, 326, 134, 326, 326, 326, 8, 138, 209,
-        /*  1350 */
-        96, 208, 2, 108, 326, 326, 326, 326, 139, 326,
-        /*  1360 */
-        326, 326, 250, 326, 228, 326, 246, 326, 24, 198,
-        /*  1370 */
-        164, 48, 326, 326, 326, 326, 326, 326, 326, 321,
-        /*  1380 */
-        326, 326, 43, 19, 326, 326, 49, 47, 280, 238,
-        /*  1390 */
-        297, 326, 326, 105, 1, 326, 208, 326, 326, 326,
-        /*  1400 */
-        326, 326, 326, 326, 326, 8, 142, 224, 96, 326,
-        /*  1410 */
-        2, 108, 326, 326, 326, 326, 139, 326, 326, 326,
-        /*  1420 */
-        250, 326, 228, 326, 246, 326, 33, 198, 177, 48,
-        /*  1430 */
-        326, 326, 326, 326, 326, 326, 326, 321, 326, 326,
-        /*  1440 */
-        43, 19, 326, 326, 49, 47, 280, 238, 297, 326,
-        /*  1450 */
-        326, 105, 326, 326, 208, 326, 326, 326, 326, 326,
-        /*  1460 */
-        326, 326, 326, 8, 142, 222, 96, 326, 2, 108,
-        /*  1470 */
-        326, 326, 326, 326, 139, 326, 326, 326, 250, 326,
-        /*  1480 */
-        228, 326, 246, 326, 33, 326, 467, 48, 326, 326,
-        /*  1490 */
-        326, 326, 326, 326, 326, 326, 326, 326, 326, 326,
-        /*  1500 */
-        326, 326, 49, 47, 280, 238, 297, 326, 467, 105,
-        /*  1510 */
-        467, 467, 326, 467, 467, 326, 326, 326, 326, 467,
-        /*  1520 */
-        326, 467, 7, 467, 96, 326, 326, 326, 326, 326,
-        /*  1530 */
-        326, 326, 326, 326, 326, 235, 326, 326, 467, 121,
-        /*  1540 */
-        326, 326, 86, 128, 326, 134, 326, 326, 326, 467,
-        /*  1550 */
-        326, 290, 318, 326, 326, 251, 336, 353, 326, 311,
-        /*  1560 */
-        326, 326, 326, 467, 326, 326, 326, 235, 326, 216,
-        /*  1570 */
-        354, 133, 326, 326, 68, 117, 249, 326, 326, 326,
-        /*  1580 */
-        326, 326, 326, 290, 318, 326, 326, 251, 336, 353,
-        /*  1590 */
-        235, 311, 326, 326, 133, 326, 326, 76, 128, 326,
-        /*  1600 */
-        326, 326, 326, 326, 326, 326, 290, 318, 326, 235,
-        /*  1610 */
-        251, 336, 353, 133, 311, 326, 76, 128, 326, 326,
-        /*  1620 */
-        326, 221, 326, 326, 326, 290, 318, 326, 326, 251,
-        /*  1630 */
-        336, 353, 326, 311, 326, 326, 326, 326, 235, 326,
-        /*  1640 */
-        215, 326, 121, 326, 326, 86, 128, 326, 326, 326,
-        /*  1650 */
-        326, 326, 326, 326, 290, 318, 326, 326, 251, 336,
-        /*  1660 */
-        353, 235, 311, 326, 326, 133, 326, 326, 59, 117,
-        /*  1670 */
-        137, 326, 326, 355, 326, 326, 326, 290, 318, 326,
-        /*  1680 */
-        326, 251, 336, 353, 235, 311, 326, 326, 133, 326,
-        /*  1690 */
-        326, 76, 128, 326, 326, 326, 326, 326, 326, 326,
-        /*  1700 */
-        290, 318, 326, 235, 251, 336, 353, 110, 311, 326,
-        /*  1710 */
-        69, 128, 326, 326, 326, 217, 326, 326, 326, 290,
-        /*  1720 */
-        318, 326, 326, 251, 336, 353, 326, 311, 326, 235,
-        /*  1730 */
-        101, 160, 326, 133, 326, 326, 57, 128, 326, 326,
-        /*  1740 */
-        321, 326, 326, 43, 19, 290, 318, 326, 235, 251,
-        /*  1750 */
-        336, 353, 133, 311, 326, 73, 128, 208, 326, 326,
-        /*  1760 */
-        326, 326, 326, 326, 290, 318, 326, 326, 251, 336,
-        /*  1770 */
-        353, 235, 311, 326, 326, 133, 326, 326, 78, 128,
-        /*  1780 */
-        326, 326, 326, 326, 326, 326, 326, 290, 318, 326,
-        /*  1790 */
-        235, 251, 336, 353, 133, 311, 326, 70, 128, 326,
-        /*  1800 */
-        326, 326, 326, 326, 326, 326, 290, 318, 326, 326,
-        /*  1810 */
-        251, 336, 353, 326, 311, 326, 235, 198, 167, 326,
-        /*  1820 */
-        133, 326, 326, 64, 128, 326, 326, 321, 326, 326,
-        /*  1830 */
-        43, 19, 290, 318, 326, 235, 251, 336, 353, 133,
-        /*  1840 */
-        311, 326, 67, 128, 208, 326, 326, 326, 326, 326,
-        /*  1850 */
-        326, 290, 318, 326, 326, 251, 336, 353, 235, 311,
-        /*  1860 */
-        326, 326, 133, 326, 326, 88, 128, 326, 326, 326,
-        /*  1870 */
-        326, 326, 326, 326, 290, 318, 326, 235, 251, 336,
-        /*  1880 */
-        353, 133, 311, 326, 82, 128, 326, 326, 326, 326,
-        /*  1890 */
-        326, 326, 326, 290, 318, 326, 326, 251, 336, 353,
-        /*  1900 */
-        326, 311, 326, 235, 198, 188, 326, 133, 326, 326,
-        /*  1910 */
-        72, 128, 326, 326, 321, 326, 326, 43, 19, 290,
-        /*  1920 */
-        318, 326, 235, 251, 336, 353, 93, 311, 326, 55,
-        /*  1930 */
-        116, 208, 326, 326, 326, 326, 326, 326, 290, 318,
-        /*  1940 */
-        326, 326, 251, 336, 353, 235, 311, 326, 326, 112,
-        /*  1950 */
-        326, 326, 87, 128, 326, 326, 326, 326, 326, 326,
-        /*  1960 */
-        326, 290, 318, 326, 235, 251, 336, 353, 133, 311,
-        /*  1970 */
-        326, 77, 128, 326, 326, 326, 326, 326, 326, 326,
-        /*  1980 */
-        290, 318, 326, 326, 251, 336, 353, 326, 311, 326,
-        /*  1990 */
-        235, 326, 326, 326, 133, 326, 326, 89, 128, 326,
-        /*  2000 */
-        326, 326, 326, 326, 326, 326, 290, 318, 326, 235,
-        /*  2010 */
-        251, 336, 353, 133, 311, 326, 75, 128, 326, 326,
-        /*  2020 */
-        326, 326, 326, 326, 326, 290, 318, 326, 326, 251,
-        /*  2030 */
-        336, 353, 235, 311, 326, 326, 133, 326, 326, 91,
-        /*  2040 */
-        128, 326, 326, 326, 326, 326, 326, 326, 290, 318,
-        /*  2050 */
-        326, 235, 251, 336, 353, 133, 311, 326, 62, 128,
-        /*  2060 */
-        326, 326, 326, 326, 326, 326, 326, 290, 318, 326,
-        /*  2070 */
-        326, 251, 336, 353, 326, 311, 326, 235, 326, 326,
-        /*  2080 */
-        326, 93, 326, 326, 53, 116, 326, 326, 326, 326,
-        /*  2090 */
-        326, 326, 326, 290, 318, 326, 235, 220, 336, 353,
-        /*  2100 */
-        133, 311, 326, 63, 128, 326, 326, 326, 326, 326,
-        /*  2110 */
-        326, 326, 290, 318, 326, 326, 251, 336, 353, 235,
-        /*  2120 */
-        311, 326, 326, 133, 326, 326, 61, 128, 326, 326,
-        /*  2130 */
-        326, 326, 326, 326, 326, 290, 318, 326, 235, 214,
-        /*  2140 */
-        336, 353, 133, 311, 326, 71, 128, 326, 326, 326,
-        /*  2150 */
-        326, 326, 326, 326, 290, 318, 326, 326, 251, 336,
-        /*  2160 */
-        353, 326, 311, 326, 235, 326, 326, 326, 133, 326,
-        /*  2170 */
-        326, 85, 128, 326, 326, 326, 326, 326, 326, 326,
-        /*  2180 */
-        290, 318, 326, 235, 251, 336, 353, 133, 311, 326,
-        /*  2190 */
-        65, 128, 326, 326, 326, 326, 326, 326, 326, 290,
-        /*  2200 */
-        318, 326, 326, 251, 336, 353, 235, 311, 326, 326,
-        /*  2210 */
-        111, 326, 326, 74, 128, 326, 326, 326, 326, 326,
-        /*  2220 */
-        326, 326, 290, 318, 326, 235, 251, 336, 353, 118,
-        /*  2230 */
-        311, 326, 58, 128, 326, 326, 326, 326, 326, 326,
-        /*  2240 */
-        326, 290, 318, 326, 326, 251, 336, 353, 326, 311,
-        /*  2250 */
-        326, 235, 326, 326, 326, 133, 326, 326, 56, 128,
-        /*  2260 */
-        326, 326, 326, 326, 326, 326, 326, 290, 318, 326,
-        /*  2270 */
-        235, 251, 336, 353, 133, 311, 326, 79, 128, 326,
-        /*  2280 */
-        326, 326, 326, 326, 326, 326, 290, 318, 326, 326,
-        /*  2290 */
-        251, 336, 353, 235, 311, 326, 326, 133, 326, 326,
-        /*  2300 */
-        80, 128, 326, 326, 326, 326, 326, 326, 326, 290,
-        /*  2310 */
-        318, 326, 235, 251, 336, 353, 133, 311, 326, 84,
-        /*  2320 */
-        128, 326, 326, 326, 326, 326, 326, 326, 290, 318,
-        /*  2330 */
-        326, 326, 251, 336, 353, 326, 311, 326, 235, 326,
-        /*  2340 */
-        326, 326, 133, 326, 326, 66, 128, 326, 326, 326,
-        /*  2350 */
-        326, 326, 326, 326, 290, 318, 326, 344, 251, 336,
-        /*  2360 */
-        353, 326, 311, 326, 10, 326, 326, 326, 326, 2,
-        /*  2370 */
-        108, 344, 326, 326, 326, 139, 326, 326, 10, 250,
-        /*  2380 */
-        326, 228, 326, 2, 108, 326, 326, 326, 326, 139,
-        /*  2390 */
-        326, 326, 326, 250, 326, 228, 235, 326, 326, 326,
-        /*  2400 */
-        133, 326, 326, 60, 128, 326, 326, 326, 326, 326,
-        /*  2410 */
-        326, 326, 290, 318, 326, 326, 251, 336, 353, 326,
-        /*  2420 */
-        311, 326, 326, 326, 326, 306, 16, 347, 326, 235,
-        /*  2430 */
-        326, 326, 326, 133, 326, 326, 81, 128, 326, 327,
-        /*  2440 */
-        16, 347, 326, 326, 326, 290, 318, 326, 326, 251,
-        /*  2450 */
-        336, 353, 326, 311, 326, 326, 235, 326, 326, 326,
-        /*  2460 */
-        133, 326, 326, 68, 128, 326, 326, 326, 326, 326,
-        /*  2470 */
-        326, 326, 290, 318, 326, 326, 251, 336, 353, 326,
-        /*  2480 */
-        311, 326, 235, 326, 326, 326, 133, 326, 326, 54,
-        /*  2490 */
-        128, 326, 326, 326, 326, 326, 326, 326, 290, 318,
-        /*  2500 */
-        326, 326, 251, 336, 353, 235, 311, 326, 326, 133,
-        /*  2510 */
-        326, 326, 83, 128, 326, 326, 235, 326, 326, 326,
-        /*  2520 */
-        133, 290, 318, 90, 128, 251, 336, 353, 326, 311,
-        /*  2530 */
-        326, 326, 290, 318, 326, 326, 251, 336, 353, 326,
-        /*  2540 */
-        311,
-    );
-    static public $yy_lookahead = array(
-        /*     0 */
-        1, 38, 3, 40, 91, 4, 5, 6, 7, 8,
-        /*    10 */
-        9, 10, 11, 12, 13, 14, 15, 104, 105, 18,
-        /*    20 */
-        118, 18, 60, 20, 23, 24, 1, 65, 3, 30,
-        /*    30 */
-        29, 118, 1, 30, 33, 36, 35, 21, 22, 36,
-        /*    40 */
-        41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-        /*    50 */
-        51, 52, 53, 54, 1, 30, 31, 1, 1, 3,
-        /*    60 */
-        3, 36, 2, 18, 19, 20, 67, 68, 69, 70,
-        /*    70 */
-        71, 72, 73, 74, 75, 76, 77, 78, 62, 30,
-        /*    80 */
-        55, 28, 37, 30, 111, 36, 30, 30, 18, 36,
-        /*    90 */
-        20, 21, 36, 36, 41, 42, 43, 44, 45, 46,
-        /*   100 */
-        47, 48, 49, 50, 51, 52, 53, 54, 1, 91,
-        /*   110 */
-        92, 55, 55, 83, 84, 85, 86, 87, 38, 101,
-        /*   120 */
-        67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
-        /*   130 */
-        77, 78, 18, 63, 20, 21, 118, 30, 1, 18,
-        /*   140 */
-        3, 20, 21, 36, 111, 39, 66, 26, 41, 42,
-        /*   150 */
-        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-        /*   160 */
-        53, 54, 1, 1, 26, 3, 60, 30, 62, 15,
-        /*   170 */
-        16, 17, 66, 36, 67, 68, 69, 70, 71, 72,
-        /*   180 */
-        73, 74, 75, 76, 77, 78, 18, 19, 20, 32,
-        /*   190 */
-        100, 1, 30, 109, 1, 18, 39, 20, 36, 1,
-        /*   200 */
-        116, 3, 41, 42, 43, 44, 45, 46, 47, 48,
-        /*   210 */
-        49, 50, 51, 52, 53, 54, 1, 55, 80, 62,
-        /*   220 */
-        30, 85, 86, 87, 39, 32, 36, 66, 67, 68,
-        /*   230 */
-        69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
-        /*   240 */
-        63, 86, 114, 115, 91, 92, 31, 62, 55, 18,
-        /*   250 */
-        38, 20, 40, 55, 101, 18, 41, 42, 43, 44,
-        /*   260 */
-        45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
-        /*   270 */
-        1, 118, 3, 94, 95, 96, 39, 122, 123, 38,
-        /*   280 */
-        91, 40, 67, 68, 69, 70, 71, 72, 73, 74,
-        /*   290 */
-        75, 76, 77, 78, 63, 114, 115, 100, 91, 92,
-        /*   300 */
-        112, 91, 114, 115, 91, 19, 20, 118, 101, 20,
-        /*   310 */
-        41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-        /*   320 */
-        51, 52, 53, 54, 1, 118, 3, 100, 118, 119,
-        /*   330 */
-        60, 118, 2, 91, 3, 65, 67, 68, 69, 70,
-        /*   340 */
-        71, 72, 73, 74, 75, 76, 77, 78, 21, 22,
-        /*   350 */
-        64, 21, 63, 92, 111, 119, 113, 26, 19, 20,
-        /*   360 */
-        118, 1, 101, 21, 41, 42, 43, 44, 45, 46,
-        /*   370 */
-        47, 48, 49, 50, 51, 52, 53, 54, 1, 118,
-        /*   380 */
-        3, 18, 22, 20, 19, 94, 95, 1, 98, 62,
-        /*   390 */
-        67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
-        /*   400 */
-        77, 78, 60, 113, 39, 1, 2, 92, 92, 18,
-        /*   410 */
-        111, 20, 113, 87, 26, 89, 101, 101, 41, 42,
-        /*   420 */
-        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-        /*   430 */
-        53, 54, 1, 118, 118, 18, 39, 20, 19, 94,
-        /*   440 */
-        95, 55, 98, 25, 67, 68, 69, 70, 71, 72,
-        /*   450 */
-        73, 74, 75, 76, 77, 78, 38, 113, 86, 92,
-        /*   460 */
-        92, 92, 18, 40, 20, 30, 60, 2, 101, 101,
-        /*   470 */
-        101, 36, 41, 42, 43, 44, 45, 46, 47, 48,
-        /*   480 */
-        49, 50, 51, 52, 53, 54, 1, 118, 18, 109,
-        /*   490 */
-        20, 20, 56, 39, 19, 123, 116, 98, 67, 68,
-        /*   500 */
-        69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
-        /*   510 */
-        25, 80, 113, 92, 64, 27, 21, 20, 19, 64,
-        /*   520 */
-        20, 3, 101, 20, 22, 2, 41, 42, 43, 44,
-        /*   530 */
-        45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
-        /*   540 */
-        1, 20, 3, 19, 3, 20, 20, 20, 19, 66,
-        /*   550 */
-        98, 98, 67, 68, 69, 70, 71, 72, 73, 74,
-        /*   560 */
-        75, 76, 77, 78, 62, 113, 113, 20, 37, 37,
-        /*   570 */
-        3, 20, 20, 101, 112, 111, 22, 111, 111, 111,
-        /*   580 */
-        41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-        /*   590 */
-        51, 52, 53, 54, 1, 116, 30, 113, 97, 88,
-        /*   600 */
-        16, 115, 124, 97, 99, 98, 67, 68, 69, 70,
-        /*   610 */
-        71, 72, 73, 74, 75, 76, 77, 78, 113, 124,
-        /*   620 */
-        113, 124, 124, 124, 124, 124, 124, 124, 124, 124,
-        /*   630 */
-        124, 124, 124, 40, 41, 42, 43, 44, 45, 46,
-        /*   640 */
-        47, 48, 49, 50, 51, 52, 53, 54, 1, 2,
-        /*   650 */
-        124, 124, 124, 124, 124, 124, 124, 98, 98, 98,
-        /*   660 */
-        67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
-        /*   670 */
-        77, 78, 113, 113, 113, 124, 124, 124, 124, 124,
-        /*   680 */
-        124, 124, 124, 124, 124, 124, 124, 124, 41, 42,
-        /*   690 */
-        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-        /*   700 */
-        53, 54, 1, 124, 124, 124, 124, 124, 124, 124,
-        /*   710 */
-        124, 98, 124, 124, 67, 68, 69, 70, 71, 72,
-        /*   720 */
-        73, 74, 75, 76, 77, 78, 113, 124, 124, 124,
-        /*   730 */
-        124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
-        /*   740 */
-        124, 40, 41, 42, 43, 44, 45, 46, 47, 48,
-        /*   750 */
-        49, 50, 51, 52, 53, 54, 1, 124, 124, 124,
-        /*   760 */
-        124, 124, 124, 124, 124, 124, 124, 124, 67, 68,
-        /*   770 */
-        69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
-        /*   780 */
-        124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
-        /*   790 */
-        124, 124, 124, 124, 124, 124, 41, 42, 43, 44,
-        /*   800 */
-        45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
-        /*   810 */
-        124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
-        /*   820 */
-        22, 124, 67, 68, 69, 70, 71, 72, 73, 74,
-        /*   830 */
-        75, 76, 77, 78, 124, 124, 124, 124, 41, 42,
-        /*   840 */
-        43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-        /*   850 */
-        53, 54, 124, 124, 124, 124, 124, 124, 60, 124,
-        /*   860 */
-        124, 124, 124, 65, 67, 68, 69, 70, 71, 72,
-        /*   870 */
-        73, 74, 75, 76, 77, 78, 124, 124, 124, 124,
-        /*   880 */
-        124, 124, 124, 18, 19, 20, 124, 124, 23, 24,
-        /*   890 */
-        124, 86, 124, 124, 29, 90, 92, 124, 33, 94,
-        /*   900 */
-        35, 124, 37, 124, 39, 101, 124, 42, 103, 124,
-        /*   910 */
-        124, 106, 107, 108, 124, 110, 124, 113, 92, 92,
-        /*   920 */
-        124, 124, 57, 58, 59, 60, 61, 101, 101, 64,
-        /*   930 */
-        65, 66, 124, 94, 124, 124, 124, 124, 124, 113,
-        /*   940 */
-        113, 18, 19, 20, 79, 106, 23, 24, 124, 110,
-        /*   950 */
-        124, 124, 29, 124, 124, 86, 33, 34, 35, 90,
-        /*   960 */
-        37, 124, 39, 94, 92, 42, 124, 124, 124, 124,
-        /*   970 */
-        86, 124, 103, 101, 90, 106, 107, 108, 94, 110,
-        /*   980 */
-        57, 58, 59, 60, 61, 113, 124, 64, 65, 124,
-        /*   990 */
-        106, 107, 108, 124, 110, 18, 124, 20, 124, 18,
-        /*  1000 */
-        19, 20, 79, 124, 23, 24, 124, 30, 124, 32,
-        /*  1010 */
-        29, 86, 124, 36, 33, 90, 35, 124, 37, 94,
-        /*  1020 */
-        39, 124, 124, 42, 124, 124, 124, 124, 124, 124,
-        /*  1030 */
-        124, 106, 107, 108, 124, 110, 124, 124, 57, 58,
-        /*  1040 */
-        59, 60, 61, 124, 124, 64, 65, 124, 124, 124,
-        /*  1050 */
-        124, 124, 18, 124, 20, 124, 124, 18, 19, 20,
-        /*  1060 */
-        79, 124, 23, 24, 30, 86, 32, 124, 29, 90,
-        /*  1070 */
-        36, 86, 33, 94, 35, 90, 37, 124, 39, 94,
-        /*  1080 */
-        124, 42, 124, 124, 124, 106, 107, 108, 124, 110,
-        /*  1090 */
-        124, 106, 107, 108, 124, 110, 57, 58, 59, 60,
-        /*  1100 */
-        61, 124, 124, 64, 65, 124, 124, 124, 124, 124,
-        /*  1110 */
-        124, 124, 124, 124, 124, 18, 19, 20, 79, 124,
-        /*  1120 */
-        23, 24, 124, 124, 124, 124, 29, 86, 124, 124,
-        /*  1130 */
-        33, 90, 35, 124, 37, 94, 39, 124, 124, 42,
-        /*  1140 */
-        124, 124, 124, 124, 124, 124, 124, 106, 107, 108,
-        /*  1150 */
-        124, 110, 124, 124, 57, 58, 59, 60, 61, 124,
-        /*  1160 */
-        124, 64, 65, 124, 124, 124, 124, 124, 124, 124,
-        /*  1170 */
-        124, 124, 124, 18, 19, 20, 79, 124, 23, 24,
-        /*  1180 */
-        124, 124, 124, 124, 29, 86, 124, 124, 33, 90,
-        /*  1190 */
-        35, 124, 37, 94, 39, 124, 124, 42, 124, 124,
-        /*  1200 */
-        124, 124, 124, 124, 124, 106, 107, 108, 124, 110,
-        /*  1210 */
-        124, 124, 57, 58, 59, 60, 61, 124, 124, 64,
-        /*  1220 */
-        65, 124, 124, 124, 124, 124, 124, 124, 124, 124,
-        /*  1230 */
-        124, 18, 19, 20, 79, 124, 23, 24, 124, 124,
-        /*  1240 */
-        124, 124, 29, 86, 124, 124, 33, 90, 35, 124,
-        /*  1250 */
-        37, 94, 39, 124, 124, 42, 124, 124, 124, 124,
-        /*  1260 */
-        124, 124, 124, 106, 107, 108, 124, 110, 124, 124,
-        /*  1270 */
-        57, 58, 59, 60, 61, 124, 124, 64, 65, 124,
-        /*  1280 */
-        1, 124, 3, 124, 3, 124, 124, 124, 124, 18,
-        /*  1290 */
-        19, 20, 79, 124, 23, 24, 124, 124, 124, 124,
-        /*  1300 */
-        29, 22, 21, 124, 33, 124, 35, 124, 37, 30,
-        /*  1310 */
-        39, 30, 124, 42, 124, 36, 124, 36, 39, 124,
-        /*  1320 */
-        39, 124, 124, 124, 91, 92, 124, 124, 57, 58,
-        /*  1330 */
-        59, 60, 61, 124, 101, 64, 65, 104, 105, 124,
-        /*  1340 */
-        124, 62, 124, 62, 124, 124, 124, 18, 19, 20,
-        /*  1350 */
-        79, 118, 23, 24, 124, 124, 124, 124, 29, 124,
-        /*  1360 */
-        124, 124, 33, 124, 35, 124, 37, 124, 39, 91,
-        /*  1370 */
-        92, 42, 124, 124, 124, 124, 124, 124, 124, 101,
-        /*  1380 */
-        124, 124, 104, 105, 124, 124, 57, 58, 59, 60,
-        /*  1390 */
-        61, 124, 124, 64, 65, 124, 118, 124, 124, 124,
-        /*  1400 */
-        124, 124, 124, 124, 124, 18, 19, 20, 79, 124,
-        /*  1410 */
-        23, 24, 124, 124, 124, 124, 29, 124, 124, 124,
-        /*  1420 */
-        33, 124, 35, 124, 37, 124, 39, 91, 92, 42,
-        /*  1430 */
-        124, 124, 124, 124, 124, 124, 124, 101, 124, 124,
-        /*  1440 */
-        104, 105, 124, 124, 57, 58, 59, 60, 61, 124,
-        /*  1450 */
-        124, 64, 124, 124, 118, 124, 124, 124, 124, 124,
-        /*  1460 */
-        124, 124, 124, 18, 19, 20, 79, 124, 23, 24,
-        /*  1470 */
-        124, 124, 124, 124, 29, 124, 124, 124, 33, 124,
-        /*  1480 */
-        35, 124, 37, 124, 39, 124, 3, 42, 124, 124,
-        /*  1490 */
-        124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
-        /*  1500 */
-        124, 124, 57, 58, 59, 60, 61, 124, 25, 64,
-        /*  1510 */
-        27, 28, 124, 30, 31, 124, 124, 124, 124, 36,
-        /*  1520 */
-        124, 38, 39, 40, 79, 124, 124, 124, 124, 124,
-        /*  1530 */
-        124, 124, 124, 124, 124, 86, 124, 124, 55, 90,
-        /*  1540 */
-        124, 124, 93, 94, 124, 62, 124, 124, 124, 66,
-        /*  1550 */
-        124, 102, 103, 124, 124, 106, 107, 108, 124, 110,
-        /*  1560 */
-        124, 124, 124, 80, 124, 124, 124, 86, 124, 120,
-        /*  1570 */
-        121, 90, 124, 124, 93, 94, 95, 124, 124, 124,
-        /*  1580 */
-        124, 124, 124, 102, 103, 124, 124, 106, 107, 108,
-        /*  1590 */
-        86, 110, 124, 124, 90, 124, 124, 93, 94, 124,
-        /*  1600 */
-        124, 124, 124, 124, 124, 124, 102, 103, 124, 86,
-        /*  1610 */
-        106, 107, 108, 90, 110, 124, 93, 94, 124, 124,
-        /*  1620 */
-        124, 117, 124, 124, 124, 102, 103, 124, 124, 106,
-        /*  1630 */
-        107, 108, 124, 110, 124, 124, 124, 124, 86, 124,
-        /*  1640 */
-        117, 124, 90, 124, 124, 93, 94, 124, 124, 124,
-        /*  1650 */
-        124, 124, 124, 124, 102, 103, 124, 124, 106, 107,
-        /*  1660 */
-        108, 86, 110, 124, 124, 90, 124, 124, 93, 94,
-        /*  1670 */
-        95, 124, 124, 121, 124, 124, 124, 102, 103, 124,
-        /*  1680 */
-        124, 106, 107, 108, 86, 110, 124, 124, 90, 124,
-        /*  1690 */
-        124, 93, 94, 124, 124, 124, 124, 124, 124, 124,
-        /*  1700 */
-        102, 103, 124, 86, 106, 107, 108, 90, 110, 124,
-        /*  1710 */
-        93, 94, 124, 124, 124, 117, 124, 124, 124, 102,
-        /*  1720 */
-        103, 124, 124, 106, 107, 108, 124, 110, 124, 86,
-        /*  1730 */
-        91, 92, 124, 90, 124, 124, 93, 94, 124, 124,
-        /*  1740 */
-        101, 124, 124, 104, 105, 102, 103, 124, 86, 106,
-        /*  1750 */
-        107, 108, 90, 110, 124, 93, 94, 118, 124, 124,
-        /*  1760 */
-        124, 124, 124, 124, 102, 103, 124, 124, 106, 107,
-        /*  1770 */
-        108, 86, 110, 124, 124, 90, 124, 124, 93, 94,
-        /*  1780 */
-        124, 124, 124, 124, 124, 124, 124, 102, 103, 124,
-        /*  1790 */
-        86, 106, 107, 108, 90, 110, 124, 93, 94, 124,
-        /*  1800 */
-        124, 124, 124, 124, 124, 124, 102, 103, 124, 124,
-        /*  1810 */
-        106, 107, 108, 124, 110, 124, 86, 91, 92, 124,
-        /*  1820 */
-        90, 124, 124, 93, 94, 124, 124, 101, 124, 124,
-        /*  1830 */
-        104, 105, 102, 103, 124, 86, 106, 107, 108, 90,
-        /*  1840 */
-        110, 124, 93, 94, 118, 124, 124, 124, 124, 124,
-        /*  1850 */
-        124, 102, 103, 124, 124, 106, 107, 108, 86, 110,
-        /*  1860 */
-        124, 124, 90, 124, 124, 93, 94, 124, 124, 124,
-        /*  1870 */
-        124, 124, 124, 124, 102, 103, 124, 86, 106, 107,
-        /*  1880 */
-        108, 90, 110, 124, 93, 94, 124, 124, 124, 124,
-        /*  1890 */
-        124, 124, 124, 102, 103, 124, 124, 106, 107, 108,
-        /*  1900 */
-        124, 110, 124, 86, 91, 92, 124, 90, 124, 124,
-        /*  1910 */
-        93, 94, 124, 124, 101, 124, 124, 104, 105, 102,
-        /*  1920 */
-        103, 124, 86, 106, 107, 108, 90, 110, 124, 93,
-        /*  1930 */
-        94, 118, 124, 124, 124, 124, 124, 124, 102, 103,
-        /*  1940 */
-        124, 124, 106, 107, 108, 86, 110, 124, 124, 90,
-        /*  1950 */
-        124, 124, 93, 94, 124, 124, 124, 124, 124, 124,
-        /*  1960 */
-        124, 102, 103, 124, 86, 106, 107, 108, 90, 110,
-        /*  1970 */
-        124, 93, 94, 124, 124, 124, 124, 124, 124, 124,
-        /*  1980 */
-        102, 103, 124, 124, 106, 107, 108, 124, 110, 124,
-        /*  1990 */
-        86, 124, 124, 124, 90, 124, 124, 93, 94, 124,
-        /*  2000 */
-        124, 124, 124, 124, 124, 124, 102, 103, 124, 86,
-        /*  2010 */
-        106, 107, 108, 90, 110, 124, 93, 94, 124, 124,
-        /*  2020 */
-        124, 124, 124, 124, 124, 102, 103, 124, 124, 106,
-        /*  2030 */
-        107, 108, 86, 110, 124, 124, 90, 124, 124, 93,
-        /*  2040 */
-        94, 124, 124, 124, 124, 124, 124, 124, 102, 103,
-        /*  2050 */
-        124, 86, 106, 107, 108, 90, 110, 124, 93, 94,
-        /*  2060 */
-        124, 124, 124, 124, 124, 124, 124, 102, 103, 124,
-        /*  2070 */
-        124, 106, 107, 108, 124, 110, 124, 86, 124, 124,
-        /*  2080 */
-        124, 90, 124, 124, 93, 94, 124, 124, 124, 124,
-        /*  2090 */
-        124, 124, 124, 102, 103, 124, 86, 106, 107, 108,
-        /*  2100 */
-        90, 110, 124, 93, 94, 124, 124, 124, 124, 124,
-        /*  2110 */
-        124, 124, 102, 103, 124, 124, 106, 107, 108, 86,
-        /*  2120 */
-        110, 124, 124, 90, 124, 124, 93, 94, 124, 124,
-        /*  2130 */
-        124, 124, 124, 124, 124, 102, 103, 124, 86, 106,
-        /*  2140 */
-        107, 108, 90, 110, 124, 93, 94, 124, 124, 124,
-        /*  2150 */
-        124, 124, 124, 124, 102, 103, 124, 124, 106, 107,
-        /*  2160 */
-        108, 124, 110, 124, 86, 124, 124, 124, 90, 124,
-        /*  2170 */
-        124, 93, 94, 124, 124, 124, 124, 124, 124, 124,
-        /*  2180 */
-        102, 103, 124, 86, 106, 107, 108, 90, 110, 124,
-        /*  2190 */
-        93, 94, 124, 124, 124, 124, 124, 124, 124, 102,
-        /*  2200 */
-        103, 124, 124, 106, 107, 108, 86, 110, 124, 124,
-        /*  2210 */
-        90, 124, 124, 93, 94, 124, 124, 124, 124, 124,
-        /*  2220 */
-        124, 124, 102, 103, 124, 86, 106, 107, 108, 90,
-        /*  2230 */
-        110, 124, 93, 94, 124, 124, 124, 124, 124, 124,
-        /*  2240 */
-        124, 102, 103, 124, 124, 106, 107, 108, 124, 110,
-        /*  2250 */
-        124, 86, 124, 124, 124, 90, 124, 124, 93, 94,
-        /*  2260 */
-        124, 124, 124, 124, 124, 124, 124, 102, 103, 124,
-        /*  2270 */
-        86, 106, 107, 108, 90, 110, 124, 93, 94, 124,
-        /*  2280 */
-        124, 124, 124, 124, 124, 124, 102, 103, 124, 124,
-        /*  2290 */
-        106, 107, 108, 86, 110, 124, 124, 90, 124, 124,
-        /*  2300 */
-        93, 94, 124, 124, 124, 124, 124, 124, 124, 102,
-        /*  2310 */
-        103, 124, 86, 106, 107, 108, 90, 110, 124, 93,
-        /*  2320 */
-        94, 124, 124, 124, 124, 124, 124, 124, 102, 103,
-        /*  2330 */
-        124, 124, 106, 107, 108, 124, 110, 124, 86, 124,
-        /*  2340 */
-        124, 124, 90, 124, 124, 93, 94, 124, 124, 124,
-        /*  2350 */
-        124, 124, 124, 124, 102, 103, 124, 11, 106, 107,
-        /*  2360 */
-        108, 124, 110, 124, 18, 124, 124, 124, 124, 23,
-        /*  2370 */
-        24, 11, 124, 124, 124, 29, 124, 124, 18, 33,
-        /*  2380 */
-        124, 35, 124, 23, 24, 124, 124, 124, 124, 29,
-        /*  2390 */
-        124, 124, 124, 33, 124, 35, 86, 124, 124, 124,
-        /*  2400 */
-        90, 124, 124, 93, 94, 124, 124, 124, 124, 124,
-        /*  2410 */
-        124, 124, 102, 103, 124, 124, 106, 107, 108, 124,
-        /*  2420 */
-        110, 124, 124, 124, 124, 79, 80, 81, 124, 86,
-        /*  2430 */
-        124, 124, 124, 90, 124, 124, 93, 94, 124, 79,
-        /*  2440 */
-        80, 81, 124, 124, 124, 102, 103, 124, 124, 106,
-        /*  2450 */
-        107, 108, 124, 110, 124, 124, 86, 124, 124, 124,
-        /*  2460 */
-        90, 124, 124, 93, 94, 124, 124, 124, 124, 124,
-        /*  2470 */
-        124, 124, 102, 103, 124, 124, 106, 107, 108, 124,
-        /*  2480 */
-        110, 124, 86, 124, 124, 124, 90, 124, 124, 93,
-        /*  2490 */
-        94, 124, 124, 124, 124, 124, 124, 124, 102, 103,
-        /*  2500 */
-        124, 124, 106, 107, 108, 86, 110, 124, 124, 90,
-        /*  2510 */
-        124, 124, 93, 94, 124, 124, 86, 124, 124, 124,
-        /*  2520 */
-        90, 102, 103, 93, 94, 106, 107, 108, 124, 110,
-        /*  2530 */
-        124, 124, 102, 103, 124, 124, 106, 107, 108, 124,
-        /*  2540 */
-        110,
-    );
-    const YY_SHIFT_USE_DFLT = - 39;
-    const YY_SHIFT_MAX = 259;
-    static public $yy_shift_ofst = array(
-        /*     0 */
-        1, 1097, 1271, 1097, 981, 1271, 981, 981, 923, 865,
-        /*    10 */
-        923, 981, 981, 981, 981, 981, 981, 981, 981, 981,
-        /*    20 */
-        981, 981, 1213, 981, 981, 981, 1155, 1329, 981, 981,
-        /*    30 */
-        981, 981, 981, 981, 981, 981, 981, 981, 981, 981,
-        /*    40 */
-        981, 1155, 981, 981, 1039, 1039, 1445, 1387, 1387, 1387,
-        /*    50 */
-        1387, 1387, 1387, - 1, 53, 107, 107, 107, 107, 107,
-        /*    60 */
-        539, 431, 701, 161, 377, 269, 647, 485, 593, 215,
-        /*    70 */
-        323, 755, 755, 755, 755, 755, 755, 755, 755, 755,
-        /*    80 */
-        755, 755, 755, 755, 755, 755, 755, 755, 755, 755,
-        /*    90 */
-        797, 797, 1279, 56, 190, 1, 2346, 977, 1034, 3,
-        /*   100 */
-        3, 137, 137, 190, 190, 286, 798, 404, 365, 2360,
-        /*   110 */
-        25, 162, 57, 121, 70, 154, 16, 327, 198, 231,
-        /*   120 */
-        114, 193, 417, 391, 360, 363, 363, 339, 502, 363,
-        /*   130 */
-        365, 363, 365, 386, 339, 444, 470, 49, 444, 435,
-        /*   140 */
-        49, 363, 363, 363, 363, 363, 31, 554, 31, 31,
-        /*   150 */
-        554, 31, 31, 31, 31, 31, 31, - 39, 177, 168,
-        /*   160 */
-        49, 49, 49, 49, 49, 49, 49, 49, - 38, - 38,
-        /*   170 */
-        - 38, 270, - 38, 49, 49, 49, 49, 49, 49, - 38,
-        /*   180 */
-        270, - 38, 237, 49, 49, 49, - 38, 49, 49, 49,
-        /*   190 */
-        584, 554, 554, 31, 566, 566, 60, 554, 31, 454,
-        /*   200 */
-        31, 31, 60, 31, - 39, - 39, - 39, - 39, - 39, 1483,
-        /*   210 */
-        1281, 106, 45, 157, 138, - 37, 80, 241, 418, 342,
-        /*   220 */
-        331, 212, 185, 330, 185, 289, 552, 541, 526, 525,
-        /*   230 */
-        521, 523, 524, 527, 529, 567, 551, 532, 531, 483,
-        /*   240 */
-        547, 503, 518, 436, 454, 465, 406, 397, 419, 423,
-        /*   250 */
-        471, 388, 475, 455, 500, 499, 497, 450, 488, 495,
-    );
-    const YY_REDUCE_USE_DFLT = - 99;
-    const YY_REDUCE_MAX = 208;
-    static public $yy_reduce_ofst = array(
-        /*     0 */
-        30, 1449, 1575, 1552, 1523, 1481, 1504, 1598, 1836, 2010,
-        /*    10 */
-        1991, 1791, 1685, 1643, 1704, 1749, 2033, 2078, 2310, 2419,
-        /*    20 */
-        2139, 2207, 2252, 2343, 2370, 1772, 1617, 1946, 1904, 2184,
-        /*    30 */
-        1923, 1878, 1859, 1965, 2052, 1662, 1817, 1730, 2097, 2396,
-        /*    40 */
-        2430, 2120, 2165, 2226, 869, 805, 985, 925, 884, 979,
-        /*    50 */
-        1099, 1041, 1157, 1639, 1233, 1639, 1336, 1278, 1726, 1813,
-        /*    60 */
-        - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87,
-        /*    70 */
-        - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87,
-        /*    80 */
-        - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87, - 87,
-        /*    90 */
-        - 87, - 87, 18, 207, 153, 136, 155, 827, 872, 804,
-        /*   100 */
-        826, 261, 316, 369, 315, 839, 188, 210, 179, 372,
-        /*   110 */
-        189, 189, 189, 505, 299, 326, 128, 128, 189, 299,
-        /*   120 */
-        299, 189, 507, 453, 242, 344, 243, 84, 128, 452,
-        /*   130 */
-        291, 399, 345, 189, 380, 613, 453, 421, 453, 368,
-        /*   140 */
-        367, 560, 453, 559, 561, 290, 189, 128, 213, 189,
-        /*   150 */
-        181, 189, 189, 189, 189, 189, 189, 189, 484, 479,
-        /*   160 */
-        472, 472, 472, 472, 472, 472, 472, 472, 462, 462,
-        /*   170 */
-        462, 464, 462, 472, 472, 472, 472, 472, 472, 462,
-        /*   180 */
-        467, 462, 466, 472, 472, 472, 462, 472, 472, 472,
-        /*   190 */
-        511, 486, 486, - 98, 501, 506, 236, 486, - 98, 468,
-        /*   200 */
-        - 98, - 98, 236, - 98, 227, - 27, 197, 33, 90,
-    );
-    static public $yyExpectedTokens = array(
-        /* 0 */
-        array(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 23, 24, 29, 33, 35,),
-        /* 1 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 2 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 3 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 4 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 5 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 6 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 7 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 8 */
-        array(18, 19, 20, 23, 24, 29, 33, 34, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 9 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 66, 79,),
-        /* 10 */
-        array(18, 19, 20, 23, 24, 29, 33, 34, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 11 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 12 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 13 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 14 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 15 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 16 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 17 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 18 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 19 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 20 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 21 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 22 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 23 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 24 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 25 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 26 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 27 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 28 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 29 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 30 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 31 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 32 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 33 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 34 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 35 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 36 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 37 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 38 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 39 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 40 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 41 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 42 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 43 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 44 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 45 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-        /* 46 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-        /* 47 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-        /* 48 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-        /* 49 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-        /* 50 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-        /* 51 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-        /* 52 */
-        array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-        /* 53 */
-        array(1, 3, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 54 */
-        array(1, 28, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 55 */
-        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 56 */
-        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 57 */
-        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 58 */
-        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 59 */
-        array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 60 */
-        array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 61 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 80,),
-        /* 62 */
-        array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 63 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 64 */
-        array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 65 */
-        array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 66 */
-        array(1, 2, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 67 */
-        array(1, 25, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 68 */
-        array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 69 */
-        array(1, 31, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 70 */
-        array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 71 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 72 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 73 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 74 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 75 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 76 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 77 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 78 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 79 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 80 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 81 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 82 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 83 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 84 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 85 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 86 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 87 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 88 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 89 */
-        array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 90 */
-        array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 91 */
-        array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-        /* 92 */
-        array(1, 3, 22, 30, 36, 39, 62,),
-        /* 93 */
-        array(1, 3, 30, 36, 55,),
-        /* 94 */
-        array(1, 30, 36,),
-        /* 95 */
-        array(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 23, 24, 29, 33, 35,),
-        /* 96 */
-        array(11, 18, 23, 24, 29, 33, 35, 79, 80, 81,),
-        /* 97 */
-        array(18, 20, 30, 32, 36,),
-        /* 98 */
-        array(18, 20, 30, 32, 36,),
-        /* 99 */
-        array(18, 20, 30, 36,),
-        /* 100 */
-        array(18, 20, 30, 36,),
-        /* 101 */
-        array(1, 3, 30, 36,),
-        /* 102 */
-        array(1, 3, 30, 36,),
-        /* 103 */
-        array(1, 30, 36,),
-        /* 104 */
-        array(1, 30, 36,),
-        /* 105 */
-        array(19, 20, 64,),
-        /* 106 */
-        array(22, 60, 65,),
-        /* 107 */
-        array(1, 2,),
-        /* 108 */
-        array(19, 39,),
-        /* 109 */
-        array(11, 18, 23, 24, 29, 33, 35, 79, 80, 81,),
-        /* 110 */
-        array(1, 3, 30, 31, 36, 55,),
-        /* 111 */
-        array(1, 3, 30, 36, 55,),
-        /* 112 */
-        array(1, 3, 30, 36, 55,),
-        /* 113 */
-        array(18, 20, 21, 26,),
-        /* 114 */
-        array(18, 20, 21, 63,),
-        /* 115 */
-        array(15, 16, 17,),
-        /* 116 */
-        array(21, 22, 62,),
-        /* 117 */
-        array(21, 22, 62,),
-        /* 118 */
-        array(1, 3, 55,),
-        /* 119 */
-        array(18, 20, 63,),
-        /* 120 */
-        array(18, 20, 21,),
-        /* 121 */
-        array(1, 32, 55,),
-        /* 122 */
-        array(18, 20,),
-        /* 123 */
-        array(18, 20,),
-        /* 124 */
-        array(1, 22,),
-        /* 125 */
-        array(18, 20,),
-        /* 126 */
-        array(18, 20,),
-        /* 127 */
-        array(19, 20,),
-        /* 128 */
-        array(22, 62,),
-        /* 129 */
-        array(18, 20,),
-        /* 130 */
-        array(19, 39,),
-        /* 131 */
-        array(18, 20,),
-        /* 132 */
-        array(19, 39,),
-        /* 133 */
-        array(1, 55,),
-        /* 134 */
-        array(19, 20,),
-        /* 135 */
-        array(18, 20,),
-        /* 136 */
-        array(18, 20,),
-        /* 137 */
-        array(30, 36,),
-        /* 138 */
-        array(18, 20,),
-        /* 139 */
-        array(30, 36,),
-        /* 140 */
-        array(30, 36,),
-        /* 141 */
-        array(18, 20,),
-        /* 142 */
-        array(18, 20,),
-        /* 143 */
-        array(18, 20,),
-        /* 144 */
-        array(18, 20,),
-        /* 145 */
-        array(18, 20,),
-        /* 146 */
-        array(1,),
-        /* 147 */
-        array(22,),
-        /* 148 */
-        array(1,),
-        /* 149 */
-        array(1,),
-        /* 150 */
-        array(22,),
-        /* 151 */
-        array(1,),
-        /* 152 */
-        array(1,),
-        /* 153 */
-        array(1,),
-        /* 154 */
-        array(1,),
-        /* 155 */
-        array(1,),
-        /* 156 */
-        array(1,),
-        /* 157 */
-        array(),
-        /* 158 */
-        array(18, 20, 63,),
-        /* 159 */
-        array(18, 19, 20,),
-        /* 160 */
-        array(30, 36,),
-        /* 161 */
-        array(30, 36,),
-        /* 162 */
-        array(30, 36,),
-        /* 163 */
-        array(30, 36,),
-        /* 164 */
-        array(30, 36,),
-        /* 165 */
-        array(30, 36,),
-        /* 166 */
-        array(30, 36,),
-        /* 167 */
-        array(30, 36,),
-        /* 168 */
-        array(60, 65,),
-        /* 169 */
-        array(60, 65,),
-        /* 170 */
-        array(60, 65,),
-        /* 171 */
-        array(60, 65,),
-        /* 172 */
-        array(60, 65,),
-        /* 173 */
-        array(30, 36,),
-        /* 174 */
-        array(30, 36,),
-        /* 175 */
-        array(30, 36,),
-        /* 176 */
-        array(30, 36,),
-        /* 177 */
-        array(30, 36,),
-        /* 178 */
-        array(30, 36,),
-        /* 179 */
-        array(60, 65,),
-        /* 180 */
-        array(60, 65,),
-        /* 181 */
-        array(60, 65,),
-        /* 182 */
-        array(18, 39,),
-        /* 183 */
-        array(30, 36,),
-        /* 184 */
-        array(30, 36,),
-        /* 185 */
-        array(30, 36,),
-        /* 186 */
-        array(60, 65,),
-        /* 187 */
-        array(30, 36,),
-        /* 188 */
-        array(30, 36,),
-        /* 189 */
-        array(30, 36,),
-        /* 190 */
-        array(16,),
-        /* 191 */
-        array(22,),
-        /* 192 */
-        array(22,),
-        /* 193 */
-        array(1,),
-        /* 194 */
-        array(30,),
-        /* 195 */
-        array(30,),
-        /* 196 */
-        array(2,),
-        /* 197 */
-        array(22,),
-        /* 198 */
-        array(1,),
-        /* 199 */
-        array(39,),
-        /* 200 */
-        array(1,),
-        /* 201 */
-        array(1,),
-        /* 202 */
-        array(2,),
-        /* 203 */
-        array(1,),
-        /* 204 */
-        array(),
-        /* 205 */
-        array(),
-        /* 206 */
-        array(),
-        /* 207 */
-        array(),
-        /* 208 */
-        array(),
-        /* 209 */
-        array(3, 25, 27, 28, 30, 31, 36, 38, 39, 40, 55, 62, 66, 80,),
-        /* 210 */
-        array(3, 21, 30, 36, 39, 62,),
-        /* 211 */
-        array(39, 60, 62, 66,),
-        /* 212 */
-        array(18, 19, 20, 37,),
-        /* 213 */
-        array(32, 39, 62,),
-        /* 214 */
-        array(26, 80,),
-        /* 215 */
-        array(38, 40,),
-        /* 216 */
-        array(38, 66,),
-        /* 217 */
-        array(38, 40,),
-        /* 218 */
-        array(25, 38,),
-        /* 219 */
-        array(21, 60,),
-        /* 220 */
-        array(3, 26,),
-        /* 221 */
-        array(38, 40,),
-        /* 222 */
-        array(39, 62,),
-        /* 223 */
-        array(2, 21,),
-        /* 224 */
-        array(39, 62,),
-        /* 225 */
-        array(20, 63,),
-        /* 226 */
-        array(20,),
-        /* 227 */
-        array(3,),
-        /* 228 */
-        array(20,),
-        /* 229 */
-        array(20,),
-        /* 230 */
-        array(20,),
-        /* 231 */
-        array(2,),
-        /* 232 */
-        array(19,),
-        /* 233 */
-        array(20,),
-        /* 234 */
-        array(19,),
-        /* 235 */
-        array(3,),
-        /* 236 */
-        array(20,),
-        /* 237 */
-        array(37,),
-        /* 238 */
-        array(37,),
-        /* 239 */
-        array(66,),
-        /* 240 */
-        array(20,),
-        /* 241 */
-        array(20,),
-        /* 242 */
-        array(3,),
-        /* 243 */
-        array(56,),
-        /* 244 */
-        array(39,),
-        /* 245 */
-        array(2,),
-        /* 246 */
-        array(60,),
-        /* 247 */
-        array(39,),
-        /* 248 */
-        array(19,),
-        /* 249 */
-        array(40,),
-        /* 250 */
-        array(20,),
-        /* 251 */
-        array(26,),
-        /* 252 */
-        array(19,),
-        /* 253 */
-        array(64,),
-        /* 254 */
-        array(20,),
-        /* 255 */
-        array(19,),
-        /* 256 */
-        array(20,),
-        /* 257 */
-        array(64,),
-        /* 258 */
-        array(27,),
-        /* 259 */
-        array(21,),
-        /* 260 */
-        array(),
-        /* 261 */
-        array(),
-        /* 262 */
-        array(),
-        /* 263 */
-        array(),
-        /* 264 */
-        array(),
-        /* 265 */
-        array(),
-        /* 266 */
-        array(),
-        /* 267 */
-        array(),
-        /* 268 */
-        array(),
-        /* 269 */
-        array(),
-        /* 270 */
-        array(),
-        /* 271 */
-        array(),
-        /* 272 */
-        array(),
-        /* 273 */
-        array(),
-        /* 274 */
-        array(),
-        /* 275 */
-        array(),
-        /* 276 */
-        array(),
-        /* 277 */
-        array(),
-        /* 278 */
-        array(),
-        /* 279 */
-        array(),
-        /* 280 */
-        array(),
-        /* 281 */
-        array(),
-        /* 282 */
-        array(),
-        /* 283 */
-        array(),
-        /* 284 */
-        array(),
-        /* 285 */
-        array(),
-        /* 286 */
-        array(),
-        /* 287 */
-        array(),
-        /* 288 */
-        array(),
-        /* 289 */
-        array(),
-        /* 290 */
-        array(),
-        /* 291 */
-        array(),
-        /* 292 */
-        array(),
-        /* 293 */
-        array(),
-        /* 294 */
-        array(),
-        /* 295 */
-        array(),
-        /* 296 */
-        array(),
-        /* 297 */
-        array(),
-        /* 298 */
-        array(),
-        /* 299 */
-        array(),
-        /* 300 */
-        array(),
-        /* 301 */
-        array(),
-        /* 302 */
-        array(),
-        /* 303 */
-        array(),
-        /* 304 */
-        array(),
-        /* 305 */
-        array(),
-        /* 306 */
-        array(),
-        /* 307 */
-        array(),
-        /* 308 */
-        array(),
-        /* 309 */
-        array(),
-        /* 310 */
-        array(),
-        /* 311 */
-        array(),
-        /* 312 */
-        array(),
-        /* 313 */
-        array(),
-        /* 314 */
-        array(),
-        /* 315 */
-        array(),
-        /* 316 */
-        array(),
-        /* 317 */
-        array(),
-        /* 318 */
-        array(),
-        /* 319 */
-        array(),
-        /* 320 */
-        array(),
-        /* 321 */
-        array(),
-        /* 322 */
-        array(),
-        /* 323 */
-        array(),
-        /* 324 */
-        array(),
-        /* 325 */
-        array(),
-        /* 326 */
-        array(),
-        /* 327 */
-        array(),
-        /* 328 */
-        array(),
-        /* 329 */
-        array(),
-        /* 330 */
-        array(),
-        /* 331 */
-        array(),
-        /* 332 */
-        array(),
-        /* 333 */
-        array(),
-        /* 334 */
-        array(),
-        /* 335 */
-        array(),
-        /* 336 */
-        array(),
-        /* 337 */
-        array(),
-        /* 338 */
-        array(),
-        /* 339 */
-        array(),
-        /* 340 */
-        array(),
-        /* 341 */
-        array(),
-        /* 342 */
-        array(),
-        /* 343 */
-        array(),
-        /* 344 */
-        array(),
-        /* 345 */
-        array(),
-        /* 346 */
-        array(),
-        /* 347 */
-        array(),
-        /* 348 */
-        array(),
-        /* 349 */
-        array(),
-        /* 350 */
-        array(),
-        /* 351 */
-        array(),
-        /* 352 */
-        array(),
-        /* 353 */
-        array(),
-        /* 354 */
-        array(),
-        /* 355 */
-        array(),
-        /* 356 */
-        array(),
-        /* 357 */
-        array(),
-    );
-    static public $yy_default = array(
-        /*     0 */
-        361, 541, 558, 558, 512, 558, 512, 512, 558, 558,
-        /*    10 */
-        558, 558, 558, 558, 558, 558, 558, 558, 558, 558,
-        /*    20 */
-        558, 558, 558, 558, 558, 558, 558, 558, 558, 558,
-        /*    30 */
-        558, 558, 558, 558, 558, 558, 558, 558, 558, 558,
-        /*    40 */
-        558, 558, 558, 558, 558, 558, 558, 558, 558, 558,
-        /*    50 */
-        558, 558, 558, 558, 418, 418, 418, 418, 387, 395,
-        /*    60 */
-        558, 558, 558, 558, 558, 558, 558, 558, 558, 423,
-        /*    70 */
-        558, 428, 425, 510, 423, 429, 511, 543, 444, 542,
-        /*    80 */
-        447, 448, 443, 442, 439, 452, 544, 420, 451, 400,
-        /*    90 */
-        456, 455, 467, 431, 418, 358, 558, 418, 418, 418,
-        /*   100 */
-        418, 438, 475, 418, 418, 558, 524, 409, 558, 558,
-        /*   110 */
-        431, 431, 431, 558, 485, 558, 476, 476, 431, 485,
-        /*   120 */
-        485, 431, 558, 558, 412, 558, 485, 558, 476, 558,
-        /*   130 */
-        558, 558, 558, 431, 558, 558, 558, 397, 558, 418,
-        /*   140 */
-        418, 558, 558, 558, 558, 558, 441, 476, 414, 434,
-        /*   150 */
-        521, 436, 435, 460, 459, 458, 454, 519, 486, 558,
-        /*   160 */
-        385, 384, 405, 404, 389, 406, 399, 388, 505, 483,
-        /*   170 */
-        482, 481, 480, 407, 408, 383, 398, 403, 402, 504,
-        /*   180 */
-        479, 502, 485, 393, 392, 390, 503, 382, 396, 394,
-        /*   190 */
-        378, 525, 522, 475, 557, 557, 513, 499, 438, 485,
-        /*   200 */
-        413, 410, 514, 415, 518, 485, 518, 485, 518, 433,
-        /*   210 */
-        467, 467, 558, 467, 457, 558, 558, 558, 558, 463,
-        /*   220 */
-        457, 558, 453, 497, 467, 558, 558, 558, 558, 558,
-        /*   230 */
-        558, 497, 558, 558, 558, 558, 558, 465, 558, 558,
-        /*   240 */
-        558, 558, 558, 469, 497, 497, 463, 523, 558, 558,
-        /*   250 */
-        558, 457, 558, 558, 558, 558, 558, 558, 426, 558,
-        /*   260 */
-        477, 520, 495, 507, 490, 508, 487, 374, 498, 484,
-        /*   270 */
-        556, 364, 363, 365, 461, 366, 472, 466, 360, 359,
-        /*   280 */
-        462, 362, 464, 367, 430, 401, 469, 372, 373, 419,
-        /*   290 */
-        432, 427, 368, 369, 370, 371, 433, 470, 445, 497,
-        /*   300 */
-        446, 496, 450, 449, 500, 517, 545, 474, 552, 411,
-        /*   310 */
-        501, 478, 553, 526, 534, 533, 535, 536, 437, 537,
-        /*   320 */
-        532, 417, 528, 527, 529, 530, 531, 546, 547, 515,
-        /*   330 */
-        506, 375, 376, 509, 377, 516, 468, 494, 489, 492,
-        /*   340 */
-        491, 493, 379, 380, 555, 548, 554, 551, 550, 549,
-        /*   350 */
-        440, 416, 473, 471, 539, 540, 538, 488,
-    );
-    const YYNOCODE = 125;
+
+    const TP_PHP = 3;
+
+    const TP_NOCACHE = 4;
+
+    const TP_TEXT = 5;
+
+    const TP_STRIPON = 6;
+
+    const TP_STRIPOFF = 7;
+
+    const TP_LITERALSTART = 8;
+
+    const TP_LITERALEND = 9;
+
+    const TP_LITERAL = 10;
+
+    const TP_RDEL = 11;
+
+    const TP_SIMPELOUTPUT = 12;
+
+    const TP_LDEL = 13;
+
+    const TP_DOLLARID = 14;
+
+    const TP_EQUAL = 15;
+
+    const TP_SIMPLETAG = 16;
+
+    const TP_ID = 17;
+
+    const TP_PTR = 18;
+
+    const TP_LDELIF = 19;
+
+    const TP_LDELFOR = 20;
+
+    const TP_SEMICOLON = 21;
+
+    const TP_INCDEC = 22;
+
+    const TP_TO = 23;
+
+    const TP_STEP = 24;
+
+    const TP_LDELFOREACH = 25;
+
+    const TP_SPACE = 26;
+
+    const TP_AS = 27;
+
+    const TP_APTR = 28;
+
+    const TP_LDELSETFILTER = 29;
+
+    const TP_SMARTYBLOCKCHILDPARENT = 30;
+
+    const TP_CLOSETAG = 31;
+
+    const TP_LDELSLASH = 32;
+
+    const TP_ATTR = 33;
+
+    const TP_INTEGER = 34;
+
+    const TP_COMMA = 35;
+
+    const TP_OPENP = 36;
+
+    const TP_CLOSEP = 37;
+
+    const TP_MATH = 38;
+
+    const TP_UNIMATH = 39;
+
+    const TP_ISIN = 40;
+
+    const TP_INSTANCEOF = 41;
+
+    const TP_QMARK = 42;
+
+    const TP_NOT = 43;
+
+    const TP_TYPECAST = 44;
+
+    const TP_HEX = 45;
+
+    const TP_DOT = 46;
+
+    const TP_SINGLEQUOTESTRING = 47;
+
+    const TP_DOUBLECOLON = 48;
+
+    const TP_NAMESPACE = 49;
+
+    const TP_AT = 50;
+
+    const TP_HATCH = 51;
+
+    const TP_OPENB = 52;
+
+    const TP_CLOSEB = 53;
+
+    const TP_DOLLAR = 54;
+
+    const TP_LOGOP = 55;
+
+    const TP_TLOGOP = 56;
+
+    const TP_SINGLECOND = 57;
+
+    const TP_QUOTE = 58;
+
+    const TP_BACKTICK = 59;
+
+    const YY_NO_ACTION = 535;
+
+    const YY_ACCEPT_ACTION = 534;
+
+    const YY_ERROR_ACTION = 533;
+
+    const YY_SZ_ACTTAB = 2082;
+
+    static public $yy_action = array(278, 8, 134, 451, 281, 68, 207, 7, 85, 248, 29, 98, 168, 114, 252, 451, 367, 230,
+                                     315, 245, 235, 249, 233, 36, 28, 145, 38, 42, 140, 36, 27, 39, 41, 322, 222, 300,
+                                     27, 213, 195, 82, 1, 31, 265, 92, 164, 181, 53, 278, 8, 133, 97, 281, 201, 249, 7,
+                                     85, 35, 307, 35, 307, 114, 226, 227, 215, 230, 108, 245, 235, 265, 208, 195, 28,
+                                     195, 5, 42, 184, 268, 277, 39, 41, 322, 222, 218, 258, 213, 120, 82, 1, 333, 265,
+                                     181, 175, 3, 53, 278, 8, 135, 105, 281, 206, 249, 7, 85, 35, 307, 207, 24, 114, 16,
+                                     103, 305, 230, 17, 245, 235, 404, 233, 195, 28, 288, 15, 42, 96, 265, 20, 39, 41,
+                                     322, 222, 300, 404, 213, 450, 82, 1, 6, 265, 404, 52, 113, 53, 278, 8, 135, 450,
+                                     281, 206, 289, 7, 85, 261, 463, 228, 244, 114, 122, 296, 463, 230, 102, 245, 235,
+                                     236, 198, 182, 28, 262, 122, 42, 143, 274, 102, 39, 41, 322, 222, 300, 33, 213,
+                                     314, 82, 1, 274, 265, 207, 86, 311, 53, 278, 8, 136, 195, 281, 206, 362, 7, 85,
+                                     283, 285, 287, 229, 114, 33, 228, 309, 230, 326, 245, 235, 36, 233, 291, 28, 479,
+                                     479, 42, 27, 147, 479, 39, 41, 322, 222, 300, 159, 213, 249, 82, 1, 193, 265, 94,
+                                     169, 249, 53, 278, 8, 135, 251, 281, 197, 249, 7, 85, 248, 29, 91, 150, 114, 252,
+                                     193, 479, 230, 207, 245, 235, 249, 233, 195, 28, 288, 191, 42, 407, 450, 207, 39,
+                                     41, 322, 222, 300, 179, 213, 195, 82, 1, 450, 265, 407, 52, 249, 53, 278, 8, 135,
+                                     407, 281, 204, 195, 7, 85, 313, 251, 93, 155, 114, 226, 225, 12, 230, 108, 245,
+                                     235, 249, 233, 247, 28, 479, 479, 42, 282, 189, 479, 39, 41, 322, 222, 300, 161,
+                                     213, 195, 82, 1, 25, 265, 103, 177, 249, 53, 278, 8, 132, 142, 281, 206, 249, 7,
+                                     85, 195, 244, 34, 249, 114, 103, 193, 103, 230, 251, 245, 235, 207, 233, 289, 4,
+                                     237, 113, 42, 228, 146, 138, 39, 41, 322, 222, 300, 10, 213, 249, 82, 1, 148, 265,
+                                     251, 113, 99, 53, 278, 8, 137, 251, 281, 206, 288, 7, 85, 294, 103, 186, 246, 114,
+                                     237, 335, 33, 230, 319, 245, 235, 329, 233, 255, 23, 52, 331, 42, 188, 246, 264,
+                                     39, 41, 322, 222, 300, 167, 213, 138, 82, 1, 34, 265, 288, 10, 249, 53, 278, 8,
+                                     135, 153, 281, 199, 207, 7, 85, 234, 226, 250, 249, 114, 108, 193, 190, 230, 308,
+                                     245, 235, 337, 209, 232, 28, 128, 160, 42, 128, 193, 207, 39, 41, 322, 222, 300,
+                                     11, 213, 463, 82, 1, 158, 265, 27, 463, 108, 53, 278, 8, 137, 176, 281, 206, 180,
+                                     7, 85, 220, 14, 276, 249, 114, 269, 207, 172, 230, 251, 245, 235, 106, 233, 286,
+                                     23, 407, 115, 42, 259, 193, 141, 39, 41, 322, 222, 300, 267, 213, 312, 82, 407,
+                                     144, 265, 207, 207, 38, 53, 407, 187, 246, 272, 273, 271, 270, 266, 184, 318, 207,
+                                     13, 278, 8, 22, 242, 281, 2, 173, 7, 85, 36, 84, 265, 19, 114, 6, 156, 27, 230,
+                                     137, 245, 235, 223, 217, 304, 249, 237, 248, 29, 228, 214, 163, 252, 119, 66, 112,
+                                     40, 43, 37, 102, 249, 126, 298, 260, 265, 192, 212, 297, 301, 284, 274, 295, 170,
+                                     324, 257, 256, 82, 304, 185, 265, 211, 302, 228, 214, 336, 221, 123, 73, 112, 166,
+                                     334, 183, 102, 248, 29, 298, 260, 253, 252, 212, 297, 301, 275, 274, 279, 195, 304,
+                                     36, 294, 165, 205, 228, 214, 171, 27, 123, 58, 109, 225, 117, 251, 102, 139, 149,
+                                     298, 260, 89, 151, 212, 297, 301, 304, 274, 301, 181, 157, 228, 214, 248, 29, 123,
+                                     73, 112, 252, 249, 87, 102, 35, 307, 298, 260, 88, 36, 212, 297, 301, 174, 274, 90,
+                                     27, 304, 195, 95, 301, 216, 228, 214, 301, 301, 123, 46, 109, 110, 301, 301, 102,
+                                     301, 207, 298, 260, 450, 405, 212, 297, 301, 231, 274, 401, 301, 304, 238, 301,
+                                     450, 301, 228, 214, 405, 327, 119, 66, 112, 301, 36, 405, 102, 301, 450, 298, 260,
+                                     27, 301, 212, 297, 301, 304, 274, 301, 301, 450, 228, 214, 301, 301, 123, 73, 112,
+                                     303, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 137, 274, 301,
+                                     254, 304, 301, 301, 301, 210, 228, 214, 248, 29, 123, 75, 112, 252, 301, 301, 102,
+                                     301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 301, 301, 304, 301, 243,
+                                     301, 82, 228, 214, 265, 301, 123, 60, 112, 301, 301, 301, 102, 241, 301, 298, 260,
+                                     301, 301, 212, 297, 301, 304, 274, 301, 301, 301, 228, 214, 301, 301, 104, 71, 112,
+                                     301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 301,
+                                     301, 304, 301, 301, 301, 301, 228, 81, 301, 301, 83, 47, 107, 301, 301, 301, 102,
+                                     301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 301, 301, 304, 301, 301,
+                                     301, 301, 228, 214, 301, 301, 123, 76, 112, 301, 301, 301, 102, 301, 301, 298, 260,
+                                     301, 301, 212, 297, 301, 304, 274, 301, 301, 301, 228, 214, 301, 301, 123, 67, 112,
+                                     301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 301,
+                                     301, 304, 301, 301, 301, 301, 228, 214, 301, 301, 123, 64, 112, 301, 301, 301, 102,
+                                     301, 301, 298, 260, 301, 310, 212, 297, 301, 301, 274, 301, 278, 9, 299, 301, 281,
+                                     301, 301, 7, 85, 301, 301, 301, 301, 114, 310, 301, 301, 230, 301, 245, 235, 278,
+                                     9, 299, 301, 281, 301, 301, 7, 85, 301, 301, 301, 301, 114, 301, 301, 301, 230,
+                                     301, 245, 235, 301, 301, 181, 154, 316, 21, 301, 181, 152, 301, 301, 301, 249, 304,
+                                     301, 35, 307, 249, 228, 203, 35, 307, 123, 61, 112, 325, 21, 301, 102, 195, 301,
+                                     298, 260, 301, 195, 212, 297, 301, 301, 274, 304, 301, 301, 181, 162, 228, 214,
+                                     301, 301, 123, 62, 112, 301, 249, 301, 102, 35, 307, 298, 260, 301, 301, 212, 297,
+                                     301, 301, 274, 301, 301, 304, 195, 207, 301, 301, 228, 214, 301, 301, 123, 65, 112,
+                                     196, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304,
+                                     301, 301, 301, 301, 228, 214, 301, 301, 123, 48, 112, 40, 43, 37, 102, 301, 301,
+                                     298, 260, 301, 301, 212, 297, 301, 301, 274, 304, 301, 324, 257, 256, 228, 214,
+                                     301, 301, 123, 63, 112, 301, 301, 301, 102, 18, 200, 298, 260, 292, 301, 212, 297,
+                                     301, 301, 274, 301, 301, 304, 301, 207, 301, 301, 228, 202, 301, 293, 116, 59, 112,
+                                     320, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304,
+                                     265, 301, 301, 301, 228, 79, 301, 301, 83, 45, 107, 40, 43, 37, 102, 301, 301, 298,
+                                     260, 301, 301, 212, 297, 301, 301, 274, 304, 301, 324, 257, 256, 228, 214, 301,
+                                     301, 123, 58, 112, 301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301,
+                                     301, 274, 301, 301, 304, 301, 207, 301, 301, 228, 214, 301, 301, 123, 72, 112, 40,
+                                     43, 37, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304, 178, 324,
+                                     257, 256, 228, 214, 301, 301, 123, 55, 112, 40, 43, 37, 102, 301, 301, 298, 260,
+                                     301, 301, 212, 297, 301, 301, 274, 304, 301, 324, 257, 256, 228, 214, 301, 301,
+                                     123, 54, 112, 301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301,
+                                     274, 301, 301, 304, 301, 207, 301, 301, 228, 214, 301, 301, 101, 77, 112, 280, 301,
+                                     301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304, 301, 301,
+                                     301, 301, 228, 214, 301, 301, 123, 80, 112, 40, 43, 37, 102, 301, 301, 298, 260,
+                                     301, 301, 212, 297, 301, 301, 274, 304, 301, 324, 257, 256, 228, 214, 301, 301,
+                                     123, 56, 112, 301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301,
+                                     274, 301, 301, 304, 301, 207, 301, 301, 228, 214, 301, 301, 123, 70, 112, 194, 301,
+                                     301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304, 301, 301,
+                                     301, 301, 228, 214, 301, 301, 123, 74, 112, 40, 43, 37, 102, 301, 301, 298, 260,
+                                     301, 301, 212, 297, 301, 301, 274, 304, 301, 324, 257, 256, 228, 214, 301, 301,
+                                     123, 49, 112, 301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301,
+                                     274, 301, 301, 304, 301, 207, 301, 301, 228, 214, 301, 301, 100, 57, 112, 301, 301,
+                                     301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304, 301, 301,
+                                     301, 301, 228, 214, 301, 301, 123, 44, 112, 40, 43, 37, 102, 301, 301, 298, 260,
+                                     301, 301, 212, 297, 301, 301, 274, 304, 301, 324, 257, 256, 228, 214, 301, 301,
+                                     123, 69, 112, 301, 301, 301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301,
+                                     274, 301, 301, 304, 301, 301, 301, 301, 228, 214, 301, 301, 118, 50, 112, 301, 301,
+                                     301, 102, 301, 301, 298, 260, 301, 301, 212, 297, 301, 301, 274, 304, 301, 301,
+                                     301, 301, 228, 214, 301, 301, 123, 78, 112, 301, 301, 301, 102, 301, 301, 298, 260,
+                                     207, 301, 212, 297, 301, 301, 274, 304, 301, 301, 359, 301, 228, 224, 301, 301,
+                                     121, 301, 112, 301, 301, 288, 102, 301, 301, 36, 306, 301, 301, 212, 297, 301, 27,
+                                     274, 301, 301, 304, 301, 301, 301, 52, 228, 224, 301, 301, 131, 301, 112, 301, 301,
+                                     301, 102, 301, 301, 219, 321, 301, 301, 212, 297, 301, 301, 274, 219, 479, 479,
+                                     301, 301, 301, 479, 463, 301, 301, 479, 479, 301, 30, 301, 479, 463, 417, 417, 301,
+                                     301, 301, 301, 479, 479, 301, 207, 301, 479, 463, 301, 301, 301, 301, 301, 463,
+                                     328, 463, 301, 479, 301, 463, 332, 207, 463, 301, 463, 288, 479, 301, 463, 36, 450,
+                                     290, 417, 417, 417, 463, 27, 463, 301, 479, 301, 463, 450, 301, 52, 301, 36, 301,
+                                     301, 417, 417, 417, 301, 27, 301, 301, 304, 301, 40, 43, 37, 228, 224, 301, 301,
+                                     127, 301, 112, 301, 301, 301, 102, 301, 301, 301, 324, 257, 256, 212, 297, 301,
+                                     301, 274, 301, 301, 304, 301, 301, 219, 301, 228, 224, 301, 301, 125, 301, 112,
+                                     301, 479, 479, 102, 15, 301, 479, 463, 301, 301, 212, 297, 301, 301, 274, 534, 51,
+                                     263, 285, 287, 229, 304, 301, 228, 301, 301, 228, 224, 207, 301, 124, 301, 112,
+                                     301, 301, 463, 102, 463, 207, 479, 301, 463, 301, 212, 297, 301, 304, 274, 207,
+                                     301, 301, 228, 224, 36, 301, 130, 301, 112, 301, 301, 27, 102, 301, 301, 301, 40,
+                                     43, 37, 212, 297, 301, 32, 274, 36, 239, 40, 43, 37, 301, 301, 27, 301, 324, 257,
+                                     256, 40, 43, 37, 301, 301, 301, 301, 324, 257, 256, 301, 301, 301, 301, 301, 304,
+                                     301, 324, 257, 256, 228, 224, 301, 301, 129, 301, 112, 301, 301, 301, 102, 301,
+                                     301, 26, 301, 301, 219, 212, 297, 301, 301, 274, 301, 479, 479, 301, 479, 479, 479,
+                                     463, 207, 479, 463, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301,
+                                     301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 463, 301, 463, 463,
+                                     479, 463, 463, 479, 207, 463, 40, 43, 37, 301, 301, 301, 301, 301, 301, 301, 301,
+                                     301, 301, 301, 301, 301, 301, 324, 257, 256, 301, 330, 301, 301, 301, 301, 301,
+                                     301, 301, 301, 301, 301, 301, 411, 301, 40, 43, 37, 207, 301, 301, 301, 301, 411,
+                                     301, 411, 301, 207, 411, 301, 317, 301, 324, 257, 256, 411, 301, 411, 301, 411,
+                                     301, 301, 301, 301, 301, 301, 301, 111, 237, 301, 301, 301, 301, 301, 323, 40, 43,
+                                     37, 301, 207, 301, 301, 301, 301, 40, 43, 37, 301, 301, 373, 301, 301, 324, 257,
+                                     256, 301, 240, 301, 301, 301, 301, 324, 257, 256, 36, 301, 301, 301, 301, 301, 301,
+                                     27, 301, 301, 450, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, 450,);
+
+    static public $yy_lookahead = array(12, 13, 14, 36, 16, 17, 1, 19, 20, 12, 13, 71, 72, 25, 17, 48, 11, 29, 30, 31,
+                                        32, 81, 34, 26, 36, 28, 2, 39, 14, 26, 33, 43, 44, 45, 46, 47, 33, 49, 98, 51,
+                                        52, 23, 54, 71, 72, 71, 58, 12, 13, 14, 36, 16, 17, 81, 19, 20, 84, 85, 84, 85,
+                                        25, 75, 76, 77, 29, 79, 31, 32, 54, 34, 98, 36, 98, 36, 39, 8, 9, 10, 43, 44,
+                                        45, 46, 47, 14, 49, 48, 51, 52, 53, 54, 71, 72, 35, 58, 12, 13, 14, 67, 16, 17,
+                                        81, 19, 20, 84, 85, 1, 15, 25, 21, 18, 53, 29, 13, 31, 32, 11, 34, 98, 36, 22,
+                                        15, 39, 35, 54, 28, 43, 44, 45, 46, 47, 26, 49, 36, 51, 52, 36, 54, 33, 41, 48,
+                                        58, 12, 13, 14, 48, 16, 17, 64, 19, 20, 70, 46, 69, 99, 25, 75, 59, 52, 29, 79,
+                                        31, 32, 70, 34, 71, 36, 86, 75, 39, 51, 90, 79, 43, 44, 45, 46, 47, 35, 49, 37,
+                                        51, 52, 90, 54, 1, 102, 103, 58, 12, 13, 14, 98, 16, 17, 11, 19, 20, 63, 64, 65,
+                                        66, 25, 35, 69, 37, 29, 34, 31, 32, 26, 34, 17, 36, 12, 13, 39, 33, 72, 17, 43,
+                                        44, 45, 46, 47, 72, 49, 81, 51, 52, 98, 54, 71, 72, 81, 58, 12, 13, 14, 93, 16,
+                                        17, 81, 19, 20, 12, 13, 71, 72, 25, 17, 98, 50, 29, 1, 31, 32, 81, 34, 98, 36,
+                                        22, 71, 39, 11, 36, 1, 43, 44, 45, 46, 47, 72, 49, 98, 51, 52, 48, 54, 26, 41,
+                                        81, 58, 12, 13, 14, 33, 16, 17, 98, 19, 20, 53, 93, 71, 72, 25, 75, 76, 15, 29,
+                                        79, 31, 32, 81, 34, 22, 36, 12, 13, 39, 11, 71, 17, 43, 44, 45, 46, 47, 72, 49,
+                                        98, 51, 52, 15, 54, 18, 72, 81, 58, 12, 13, 14, 72, 16, 17, 81, 19, 20, 98, 99,
+                                        15, 81, 25, 18, 98, 18, 29, 93, 31, 32, 1, 34, 64, 36, 46, 48, 39, 69, 72, 46,
+                                        43, 44, 45, 46, 47, 52, 49, 81, 51, 52, 91, 54, 93, 48, 80, 58, 12, 13, 14, 93,
+                                        16, 17, 22, 19, 20, 92, 18, 94, 95, 25, 46, 103, 35, 29, 37, 31, 32, 53, 34, 17,
+                                        36, 41, 53, 39, 94, 95, 95, 43, 44, 45, 46, 47, 72, 49, 46, 51, 52, 15, 54, 22,
+                                        52, 81, 58, 12, 13, 14, 72, 16, 17, 1, 19, 20, 50, 75, 76, 81, 25, 79, 98, 80,
+                                        29, 89, 31, 32, 89, 34, 18, 36, 96, 51, 39, 96, 98, 1, 43, 44, 45, 46, 47, 26,
+                                        49, 46, 51, 52, 75, 54, 33, 52, 79, 58, 12, 13, 14, 72, 16, 17, 14, 19, 20, 17,
+                                        28, 65, 81, 25, 68, 1, 91, 29, 93, 31, 32, 79, 34, 37, 36, 11, 17, 39, 17, 98,
+                                        14, 43, 44, 45, 46, 47, 9, 49, 96, 51, 26, 27, 54, 1, 1, 2, 58, 33, 94, 95, 3,
+                                        4, 5, 6, 7, 8, 34, 1, 2, 12, 13, 13, 14, 16, 36, 17, 19, 20, 26, 17, 54, 42, 25,
+                                        36, 72, 33, 29, 14, 31, 32, 17, 17, 64, 81, 46, 12, 13, 69, 70, 72, 17, 73, 74,
+                                        75, 38, 39, 40, 79, 81, 17, 82, 83, 54, 17, 86, 87, 88, 17, 90, 17, 91, 55, 56,
+                                        57, 51, 64, 71, 54, 100, 101, 69, 70, 53, 50, 73, 74, 75, 91, 53, 80, 79, 12,
+                                        13, 82, 83, 17, 17, 86, 87, 88, 5, 90, 81, 98, 64, 26, 92, 28, 97, 69, 70, 91,
+                                        33, 73, 74, 75, 76, 78, 93, 79, 79, 91, 82, 83, 79, 91, 86, 87, 88, 64, 90, 104,
+                                        71, 72, 69, 70, 12, 13, 73, 74, 75, 17, 81, 79, 79, 84, 85, 82, 83, 79, 26, 86,
+                                        87, 88, 91, 90, 79, 33, 64, 98, 91, 104, 97, 69, 70, 104, 104, 73, 74, 75, 76,
+                                        104, 104, 79, 104, 1, 82, 83, 36, 11, 86, 87, 88, 15, 90, 11, 104, 64, 46, 104,
+                                        48, 104, 69, 70, 26, 53, 73, 74, 75, 104, 26, 33, 79, 104, 36, 82, 83, 33, 104,
+                                        86, 87, 88, 64, 90, 104, 104, 48, 69, 70, 104, 104, 73, 74, 75, 101, 104, 104,
+                                        79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 14, 90, 104, 17, 64, 104, 104, 104,
+                                        97, 69, 70, 12, 13, 73, 74, 75, 17, 104, 104, 79, 104, 104, 82, 83, 104, 104,
+                                        86, 87, 88, 104, 90, 104, 104, 64, 104, 49, 104, 51, 69, 70, 54, 104, 73, 74,
+                                        75, 104, 104, 104, 79, 50, 104, 82, 83, 104, 104, 86, 87, 88, 64, 90, 104, 104,
+                                        104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104,
+                                        104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104,
+                                        73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90,
+                                        104, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104,
+                                        79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 64, 90, 104, 104, 104, 69, 70, 104,
+                                        104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104,
+                                        90, 104, 104, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104,
+                                        104, 79, 104, 104, 82, 83, 104, 5, 86, 87, 88, 104, 90, 104, 12, 13, 14, 104,
+                                        16, 104, 104, 19, 20, 104, 104, 104, 104, 25, 5, 104, 104, 29, 104, 31, 32, 12,
+                                        13, 14, 104, 16, 104, 104, 19, 20, 104, 104, 104, 104, 25, 104, 104, 104, 29,
+                                        104, 31, 32, 104, 104, 71, 72, 58, 59, 104, 71, 72, 104, 104, 104, 81, 64, 104,
+                                        84, 85, 81, 69, 70, 84, 85, 73, 74, 75, 58, 59, 104, 79, 98, 104, 82, 83, 104,
+                                        98, 86, 87, 88, 104, 90, 64, 104, 104, 71, 72, 69, 70, 104, 104, 73, 74, 75,
+                                        104, 81, 104, 79, 84, 85, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64,
+                                        98, 1, 104, 104, 69, 70, 104, 104, 73, 74, 75, 11, 104, 104, 79, 104, 104, 82,
+                                        83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73,
+                                        74, 75, 38, 39, 40, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64,
+                                        104, 55, 56, 57, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 13, 14, 82,
+                                        83, 17, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 1, 104, 104, 69, 70, 104,
+                                        34, 73, 74, 75, 11, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104,
+                                        90, 64, 54, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 38, 39, 40, 79, 104,
+                                        104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 55, 56, 57, 69, 70, 104,
+                                        104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104,
+                                        90, 104, 104, 64, 104, 1, 104, 104, 69, 70, 104, 104, 73, 74, 75, 38, 39, 40,
+                                        79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 27, 55, 56, 57, 69, 70,
+                                        104, 104, 73, 74, 75, 38, 39, 40, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88,
+                                        104, 90, 64, 104, 55, 56, 57, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79,
+                                        104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 1, 104, 104,
+                                        69, 70, 104, 104, 73, 74, 75, 11, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86,
+                                        87, 88, 104, 90, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 38, 39,
+                                        40, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 55, 56, 57,
+                                        69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86,
+                                        87, 88, 104, 90, 104, 104, 64, 104, 1, 104, 104, 69, 70, 104, 104, 73, 74, 75,
+                                        11, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 104,
+                                        104, 104, 69, 70, 104, 104, 73, 74, 75, 38, 39, 40, 79, 104, 104, 82, 83, 104,
+                                        104, 86, 87, 88, 104, 90, 64, 104, 55, 56, 57, 69, 70, 104, 104, 73, 74, 75,
+                                        104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 104, 104,
+                                        64, 104, 1, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104,
+                                        82, 83, 104, 104, 86, 87, 88, 104, 90, 64, 104, 104, 104, 104, 69, 70, 104, 104,
+                                        73, 74, 75, 38, 39, 40, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88, 104, 90, 64,
+                                        104, 55, 56, 57, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82,
+                                        83, 104, 104, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 104, 104, 69, 70,
+                                        104, 104, 73, 74, 75, 104, 104, 104, 79, 104, 104, 82, 83, 104, 104, 86, 87, 88,
+                                        104, 90, 64, 104, 104, 104, 104, 69, 70, 104, 104, 73, 74, 75, 104, 104, 104,
+                                        79, 104, 104, 82, 83, 1, 104, 86, 87, 88, 104, 90, 64, 104, 104, 11, 104, 69,
+                                        70, 104, 104, 73, 104, 75, 104, 104, 22, 79, 104, 104, 26, 83, 104, 104, 86, 87,
+                                        88, 33, 90, 104, 104, 64, 104, 104, 104, 41, 69, 70, 104, 104, 73, 104, 75, 104,
+                                        104, 104, 79, 104, 104, 2, 83, 104, 104, 86, 87, 88, 104, 90, 2, 12, 13, 104,
+                                        104, 104, 17, 18, 104, 104, 12, 13, 104, 15, 104, 17, 18, 1, 2, 104, 104, 104,
+                                        104, 12, 13, 104, 1, 104, 17, 18, 104, 104, 104, 104, 104, 46, 11, 48, 104, 50,
+                                        104, 52, 53, 1, 46, 104, 48, 22, 50, 104, 52, 26, 36, 11, 38, 39, 40, 46, 33,
+                                        48, 104, 50, 104, 52, 48, 104, 41, 104, 26, 104, 104, 55, 56, 57, 104, 33, 104,
+                                        104, 64, 104, 38, 39, 40, 69, 70, 104, 104, 73, 104, 75, 104, 104, 104, 79, 104,
+                                        104, 104, 55, 56, 57, 86, 87, 88, 104, 90, 104, 104, 64, 104, 104, 2, 104, 69,
+                                        70, 104, 104, 73, 104, 75, 104, 12, 13, 79, 15, 104, 17, 18, 104, 104, 86, 87,
+                                        88, 104, 90, 61, 62, 63, 64, 65, 66, 64, 104, 69, 104, 104, 69, 70, 1, 104, 73,
+                                        104, 75, 104, 104, 46, 79, 48, 1, 50, 104, 52, 104, 86, 87, 88, 64, 90, 1, 104,
+                                        104, 69, 70, 26, 104, 73, 104, 75, 104, 104, 33, 79, 104, 104, 104, 38, 39, 40,
+                                        86, 87, 88, 24, 90, 26, 37, 38, 39, 40, 104, 104, 33, 104, 55, 56, 57, 38, 39,
+                                        40, 104, 104, 104, 104, 55, 56, 57, 104, 104, 104, 104, 104, 64, 104, 55, 56,
+                                        57, 69, 70, 104, 104, 73, 104, 75, 104, 104, 104, 79, 104, 104, 2, 104, 104, 2,
+                                        86, 87, 88, 104, 90, 104, 12, 13, 104, 12, 13, 17, 18, 1, 17, 18, 104, 104, 104,
+                                        104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+                                        104, 104, 104, 104, 104, 46, 104, 48, 46, 50, 48, 52, 50, 1, 52, 38, 39, 40,
+                                        104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 55, 56,
+                                        57, 104, 59, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 11, 104, 38,
+                                        39, 40, 1, 104, 104, 104, 104, 21, 104, 23, 104, 1, 26, 104, 53, 104, 55, 56,
+                                        57, 33, 104, 35, 104, 37, 104, 104, 104, 104, 104, 104, 104, 21, 46, 104, 104,
+                                        104, 104, 104, 37, 38, 39, 40, 104, 1, 104, 104, 104, 104, 38, 39, 40, 104, 104,
+                                        11, 104, 104, 55, 56, 57, 104, 18, 104, 104, 104, 104, 55, 56, 57, 26, 104, 104,
+                                        104, 104, 104, 104, 33, 104, 104, 36, 104, 104, 104, 104, 104, 104, 104, 104,
+                                        104, 104, 104, 48,);
+
+    const YY_SHIFT_USE_DFLT = - 34;
+
+    const YY_SHIFT_MAX = 242;
+
+    static public $yy_shift_ofst = array(517, 270, 82, 270, 317, 82, 82, 317, - 12, - 12, 35, 411, 82, 82, 82, 129, 82,
+                                         82, 82, 176, 82, 82, 82, 82, 82, 82, 223, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+                                         411, 364, 364, 458, 458, 458, 458, 458, 1830, 1706, 1810, 1810, 1810, 1810,
+                                         1810, 517, 733, 933, 2001, 1306, 1389, 1223, 1820, 1952, 526, 1917, 1992, 1140,
+                                         1057, 1472, 1472, 1472, 2033, 1472, 1472, 1472, 1472, 1472, 1472, 1472, 1472,
+                                         1472, 1196, 1689, 1196, 1600, 533, 183, 512, 14, 954, - 3, 589, 634, 634, 684,
+                                         684, 512, 512, 368, 14, 14, 512, 513, 484, 104, 746, 518, 252, 67, 232, 91,
+                                         232, 325, 3, 486, 307, 462, 433, 428, 349, 3, 5, 452, 462, 264, 327, 264, 264,
+                                         264, 264, 264, 327, 264, 264, - 34, 1772, 1653, 1662, 1902, 1899, 1675, 1113,
+                                         543, 105, 295, 3, 415, 69, 69, 3, 3, 313, 313, 3, 313, 3, 3, 3, 3, 3, 3, 283,
+                                         3, 415, 3, 3, 3, 3, 69, 313, 3, 3, 3, 313, 313, 313, 99, 313, 3, 3, 3, 69, 3,
+                                         498, 264, 264, 24, 497, 264, 327, 327, 327, 264, 24, 264, - 34, - 34, - 34,
+                                         - 34, - 34, 1680, 1977, 678, 201, 652, 238, 97, 96, 357, 228, 382, 344, 308,
+                                         142, 57, 37, - 33, 360, 87, 167, 539, 545, 562, 507, 194, 172, 118, 397, 456,
+                                         402, 18, 299, 605, 556, 588, 552, 508, 481, 479, 398, 492, 534, 499, 522, 560,
+                                         498,);
+
+    const YY_REDUCE_USE_DFLT = - 61;
+
+    const YY_REDUCE_MAX = 196;
+
+    static public $yy_reduce_ofst = array(1737, 488, 575, 633, 550, 658, 521, 604, 770, 1102, 1075, 1407, 1461, 1517,
+                                          1351, 1158, 1212, 1295, 1046, 716, 992, 936, 853, 963, 1019, 687, 1268, 1241,
+                                          1129, 1185, 1490, 1434, 1378, 1324, 799, 824, 741, 1544, 1573, 1819, 1678,
+                                          1740, 1707, 1765, 923, - 28, 571, - 28, 19, 918, 959, 134, 80, 83, - 26, - 26,
+                                          - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, 160,
+                                          - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, - 26, 222, - 26, 222,
+                                          92, 175, - 60, - 14, 288, 145, 199, 286, 254, 152, 246, 354, 401, 293, 358,
+                                          221, 340, 240, 190, 190, 279, 412, 190, 416, 395, 310, 279, 310, 472, 389,
+                                          310, 352, 260, 93, 190, 487, 190, 190, 355, 190, 310, 190, 190, 190, 515, 190,
+                                          424, 190, 190, 190, 530, 530, 530, 530, 530, 530, 551, 535, 530, 530, 531,
+                                          540, 574, 555, 531, 531, 524, 524, 531, 524, 531, 531, 531, 531, 531, 531,
+                                          549, 531, 544, 531, 531, 531, 531, 587, 524, 531, 531, 531, 524, 524, 524,
+                                          573, 524, 531, 531, 531, 580, 531, 579, 131, 131, 54, 30, 131, 311, 311, 311,
+                                          131, 54, 131, 294, 519, 489, 359, 506,);
+
+    static public $yyExpectedTokens = array(array(3, 4, 5, 6, 7, 8, 12, 13, 16, 19, 20, 25, 29, 31, 32,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 30, 31, 32, 34, 36, 39, 43, 44,
+                                                  45, 46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 30, 31, 32, 34, 36, 39, 43, 44,
+                                                  45, 46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 53, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 52, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 54, 58,),
+                                            array(12, 13, 14, 16, 17, 19, 20, 25, 29, 31, 32, 34, 36, 39, 43, 44, 45,
+                                                  46, 47, 49, 51, 54, 58,),
+                                            array(1, 24, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 11, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 26, 33, 38, 39, 40, 55, 56, 57,),
+                                            array(3, 4, 5, 6, 7, 8, 12, 13, 16, 19, 20, 25, 29, 31, 32,),
+                                            array(14, 17, 49, 51, 54,),
+                                            array(5, 12, 13, 14, 16, 19, 20, 25, 29, 31, 32, 58, 59,),
+                                            array(1, 21, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 11, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 11, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 27, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 37, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 53, 55, 56, 57,), array(1, 2, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 55, 56, 57, 59,),
+                                            array(1, 37, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 11, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 11, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 11, 18, 26, 33, 36, 48,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(1, 38, 39, 40, 55, 56, 57,), array(1, 38, 39, 40, 55, 56, 57,),
+                                            array(38, 39, 40, 55, 56, 57,), array(1, 11, 22, 26, 33, 41,),
+                                            array(38, 39, 40, 55, 56, 57,), array(1, 11, 22, 26, 33, 41,),
+                                            array(14, 17, 51, 54,), array(1, 11, 26, 33,), array(1, 26, 33,),
+                                            array(14, 36, 54,),
+                                            array(5, 12, 13, 14, 16, 19, 20, 25, 29, 31, 32, 58, 59,),
+                                            array(12, 13, 17, 26, 28, 33,), array(12, 13, 17, 26, 28, 33,),
+                                            array(12, 13, 17, 26, 33,), array(12, 13, 17, 26, 33,),
+                                            array(1, 11, 26, 33,), array(1, 11, 26, 33,), array(1, 26, 33,),
+                                            array(1, 26, 33,), array(18, 46, 52,), array(14, 36, 54,),
+                                            array(14, 36, 54,), array(1, 26, 33,), array(1, 2,),
+                                            array(1, 11, 26, 27, 33,), array(1, 11, 26, 33,), array(12, 13, 17, 50,),
+                                            array(13, 14, 17, 54,), array(1, 11, 26, 33,), array(8, 9, 10,),
+                                            array(12, 13, 17,), array(15, 18, 48,), array(12, 13, 17,),
+                                            array(15, 18, 48,), array(26, 33,), array(14, 54,), array(18, 48,),
+                                            array(14, 17,), array(26, 33,), array(1, 18,), array(1, 53,),
+                                            array(26, 33,), array(1, 11,), array(1, 28,), array(14, 17,), array(1,),
+                                            array(18,), array(1,), array(1,), array(1,), array(1,), array(1,),
+                                            array(18,), array(1,), array(1,), array(),
+                                            array(2, 12, 13, 15, 17, 18, 46, 48, 50, 52,),
+                                            array(2, 12, 13, 17, 18, 46, 48, 50, 52, 53,),
+                                            array(2, 12, 13, 15, 17, 18, 46, 48, 50, 52,),
+                                            array(2, 12, 13, 17, 18, 46, 48, 50, 52,),
+                                            array(2, 12, 13, 17, 18, 46, 48, 50, 52,),
+                                            array(12, 13, 17, 18, 46, 48, 50, 52,), array(13, 14, 17, 34, 54,),
+                                            array(12, 13, 17, 50,), array(15, 46, 52,), array(12, 13, 17,),
+                                            array(26, 33,), array(46, 52,), array(14, 54,), array(14, 54,),
+                                            array(26, 33,), array(26, 33,), array(46, 52,), array(46, 52,),
+                                            array(26, 33,), array(46, 52,), array(26, 33,), array(26, 33,),
+                                            array(26, 33,), array(26, 33,), array(26, 33,), array(26, 33,),
+                                            array(15, 22,), array(26, 33,), array(46, 52,), array(26, 33,),
+                                            array(26, 33,), array(26, 33,), array(26, 33,), array(14, 54,),
+                                            array(46, 52,), array(26, 33,), array(26, 33,), array(26, 33,),
+                                            array(46, 52,), array(46, 52,), array(46, 52,), array(13, 36,),
+                                            array(46, 52,), array(26, 33,), array(26, 33,), array(26, 33,),
+                                            array(14, 54,), array(26, 33,), array(36,), array(1,), array(1,), array(2,),
+                                            array(9,), array(1,), array(18,), array(18,), array(18,), array(1,),
+                                            array(2,), array(1,), array(), array(), array(), array(), array(),
+                                            array(1, 2, 36, 38, 39, 40, 48, 55, 56, 57,),
+                                            array(11, 21, 23, 26, 33, 35, 37, 46,), array(11, 15, 26, 33, 36, 48,),
+                                            array(12, 13, 17, 50,), array(36, 46, 48, 53,), array(22, 41, 53,),
+                                            array(22, 41, 59,), array(28, 36, 48,), array(35, 37,), array(36, 48,),
+                                            array(17, 50,), array(46, 53,), array(15, 46,), array(35, 37,),
+                                            array(35, 53,), array(36, 48,), array(36, 48,), array(22, 41,),
+                                            array(21, 35,), array(35, 37,), array(53,), array(53,), array(17,),
+                                            array(36,), array(17,), array(34,), array(51,), array(22,), array(37,),
+                                            array(15,), array(23,), array(11,), array(5,), array(17,), array(17,),
+                                            array(17,), array(46,), array(17,), array(17,), array(51,), array(34,),
+                                            array(17,), array(42,), array(17,), array(17,), array(36,), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(), array(), array(),
+                                            array(), array(), array(), array(), array(), array(),);
+
+    static public $yy_default = array(341, 518, 498, 533, 533, 498, 498, 533, 533, 533, 533, 533, 533, 533, 533, 533,
+                                      533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533,
+                                      533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, 401, 533, 377, 401,
+                                      401, 401, 368, 338, 533, 533, 533, 533, 533, 406, 533, 533, 533, 533, 533, 533,
+                                      533, 520, 521, 422, 440, 382, 496, 406, 412, 497, 519, 408, 413, 403, 429, 430,
+                                      428, 430, 533, 415, 401, 533, 533, 401, 401, 401, 401, 447, 421, 401, 401, 510,
+                                      533, 533, 401, 391, 415, 415, 463, 533, 415, 533, 463, 453, 463, 453, 379, 533,
+                                      453, 533, 401, 395, 415, 401, 415, 415, 533, 425, 453, 415, 433, 431, 397, 418,
+                                      507, 432, 419, 505, 452, 452, 452, 452, 452, 452, 533, 465, 479, 463, 386, 456,
+                                      533, 533, 388, 387, 461, 457, 364, 459, 384, 360, 385, 361, 380, 378, 533, 363,
+                                      458, 365, 369, 381, 366, 533, 490, 376, 375, 372, 491, 460, 489, 463, 488, 370,
+                                      374, 390, 533, 389, 463, 421, 396, 499, 354, 398, 511, 508, 485, 392, 500, 447,
+                                      504, 504, 463, 504, 463, 440, 436, 440, 464, 440, 430, 430, 440, 533, 440, 533,
+                                      436, 436, 533, 533, 533, 448, 430, 533, 533, 533, 443, 533, 509, 533, 533, 533,
+                                      430, 533, 533, 409, 533, 346, 533, 533, 533, 436, 533, 533, 533, 438, 533, 442,
+                                      533, 533, 479, 451, 503, 394, 486, 383, 483, 400, 410, 481, 482, 402, 450, 502,
+                                      514, 513, 479, 501, 420, 427, 426, 339, 487, 480, 350, 351, 352, 353, 349, 347,
+                                      344, 345, 455, 348, 355, 356, 358, 399, 484, 371, 357, 340, 454, 342, 414, 343,
+                                      434, 531, 530, 466, 467, 468, 462, 417, 526, 441, 416, 528, 443, 444, 516, 517,
+                                      446, 515, 424, 423, 445, 495, 532, 525, 492, 475, 493, 393, 522, 477, 437, 494,
+                                      469, 506, 435, 442, 512, 523, 439, 470, 529, 473, 527, 476, 474, 478, 472, 524,
+                                      471, 449,);
+
+    const YYNOCODE = 105;
+
     const YYSTACKDEPTH = 500;
-    const YYNSTATE = 358;
-    const YYNRULE = 200;
-    const YYERRORSYMBOL = 82;
+
+    const YYNSTATE = 338;
+
+    const YYNRULE = 195;
+
+    const YYERRORSYMBOL = 60;
+
     const YYERRSYMDT = 'yy0';
+
     const YYFALLBACK = 0;
+
     public static $yyFallback = array();
 
     public function Trace($TraceFILE, $zTracePrompt)
@@ -2171,447 +899,134 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
     }
 
     public $yyTraceFILE;
+
     public $yyTracePrompt;
+
     public $yyidx;                    /* Index of top element in stack */
     public $yyerrcnt;                 /* Shifts left before out of the error */
     public $yystack = array();  /* The parser's stack */
 
-    public $yyTokenName = array(
-        '$', 'VERT', 'COLON', 'RDEL',
-        'COMMENT', 'PHPSTARTTAG', 'PHPENDTAG', 'PHPENDSCRIPT',
-        'ASPSTARTTAG', 'ASPENDTAG', 'XMLTAG', 'TEXT',
-        'STRIPON', 'STRIPOFF', 'BLOCKSOURCE', 'LITERALSTART',
-        'LITERALEND', 'LITERAL', 'LDEL', 'DOLLAR',
-        'ID', 'EQUAL', 'PTR', 'LDELIF',
-        'LDELFOR', 'SEMICOLON', 'INCDEC', 'TO',
-        'STEP', 'LDELFOREACH', 'SPACE', 'AS',
-        'APTR', 'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT', 'LDELSLASH',
-        'ATTR', 'INTEGER', 'COMMA', 'OPENP',
-        'CLOSEP', 'MATH', 'UNIMATH', 'ANDSYM',
-        'ISIN', 'ISDIVBY', 'ISNOTDIVBY', 'ISEVEN',
-        'ISNOTEVEN', 'ISEVENBY', 'ISNOTEVENBY', 'ISODD',
-        'ISNOTODD', 'ISODDBY', 'ISNOTODDBY', 'INSTANCEOF',
-        'QMARK', 'NOT', 'TYPECAST', 'HEX',
-        'DOT', 'SINGLEQUOTESTRING', 'DOUBLECOLON', 'AT',
-        'HATCH', 'OPENB', 'CLOSEB', 'EQUALS',
-        'NOTEQUALS', 'GREATERTHAN', 'LESSTHAN', 'GREATEREQUAL',
-        'LESSEQUAL', 'IDENTITY', 'NONEIDENTITY', 'MOD',
-        'LAND', 'LOR', 'LXOR', 'QUOTE',
-        'BACKTICK', 'DOLLARID', 'error', 'start',
-        'template', 'template_element', 'smartytag', 'literal',
-        'literal_elements', 'literal_element', 'value', 'modifierlist',
-        'attributes', 'expr', 'varindexed', 'statement',
-        'statements', 'optspace', 'varvar', 'foraction',
-        'modparameters', 'attribute', 'ternary', 'array',
-        'ifcond', 'lop', 'variable', 'function',
-        'doublequoted_with_quotes', 'static_class_access', 'object', 'arrayindex',
-        'indexdef', 'varvarele', 'objectchain', 'objectelement',
-        'method', 'params', 'modifier', 'modparameter',
-        'arrayelements', 'arrayelement', 'doublequoted', 'doublequotedcontent',
-    );
-
-    public static $yyRuleName = array(
-        /*   0 */
-        "start ::= template",
-        /*   1 */
-        "template ::= template_element",
-        /*   2 */
-        "template ::= template template_element",
-        /*   3 */
-        "template ::=",
-        /*   4 */
-        "template_element ::= smartytag RDEL",
-        /*   5 */
-        "template_element ::= COMMENT",
-        /*   6 */
-        "template_element ::= literal",
-        /*   7 */
-        "template_element ::= PHPSTARTTAG",
-        /*   8 */
-        "template_element ::= PHPENDTAG",
-        /*   9 */
-        "template_element ::= PHPENDSCRIPT",
-        /*  10 */
-        "template_element ::= ASPSTARTTAG",
-        /*  11 */
-        "template_element ::= ASPENDTAG",
-        /*  12 */
-        "template_element ::= XMLTAG",
-        /*  13 */
-        "template_element ::= TEXT",
-        /*  14 */
-        "template_element ::= STRIPON",
-        /*  15 */
-        "template_element ::= STRIPOFF",
-        /*  16 */
-        "template_element ::= BLOCKSOURCE",
-        /*  17 */
-        "literal ::= LITERALSTART LITERALEND",
-        /*  18 */
-        "literal ::= LITERALSTART literal_elements LITERALEND",
-        /*  19 */
-        "literal_elements ::= literal_elements literal_element",
-        /*  20 */
-        "literal_elements ::=",
-        /*  21 */
-        "literal_element ::= literal",
-        /*  22 */
-        "literal_element ::= LITERAL",
-        /*  23 */
-        "smartytag ::= LDEL value",
-        /*  24 */
-        "smartytag ::= LDEL value modifierlist attributes",
-        /*  25 */
-        "smartytag ::= LDEL value attributes",
-        /*  26 */
-        "smartytag ::= LDEL expr modifierlist attributes",
-        /*  27 */
-        "smartytag ::= LDEL expr attributes",
-        /*  28 */
-        "smartytag ::= LDEL DOLLAR ID EQUAL value",
-        /*  29 */
-        "smartytag ::= LDEL DOLLAR ID EQUAL expr",
-        /*  30 */
-        "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes",
-        /*  31 */
-        "smartytag ::= LDEL varindexed EQUAL expr attributes",
-        /*  32 */
-        "smartytag ::= LDEL ID attributes",
-        /*  33 */
-        "smartytag ::= LDEL ID",
-        /*  34 */
-        "smartytag ::= LDEL ID PTR ID attributes",
-        /*  35 */
-        "smartytag ::= LDEL ID modifierlist attributes",
-        /*  36 */
-        "smartytag ::= LDEL ID PTR ID modifierlist attributes",
-        /*  37 */
-        "smartytag ::= LDELIF expr",
-        /*  38 */
-        "smartytag ::= LDELIF expr attributes",
-        /*  39 */
-        "smartytag ::= LDELIF statement",
-        /*  40 */
-        "smartytag ::= LDELIF statement attributes",
-        /*  41 */
-        "smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes",
-        /*  42 */
-        "foraction ::= EQUAL expr",
-        /*  43 */
-        "foraction ::= INCDEC",
-        /*  44 */
-        "smartytag ::= LDELFOR statement TO expr attributes",
-        /*  45 */
-        "smartytag ::= LDELFOR statement TO expr STEP expr attributes",
-        /*  46 */
-        "smartytag ::= LDELFOREACH attributes",
-        /*  47 */
-        "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes",
-        /*  48 */
-        "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes",
-        /*  49 */
-        "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes",
-        /*  50 */
-        "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes",
-        /*  51 */
-        "smartytag ::= LDELSETFILTER ID modparameters",
-        /*  52 */
-        "smartytag ::= LDELSETFILTER ID modparameters modifierlist",
-        /*  53 */
-        "smartytag ::= LDEL SMARTYBLOCKCHILDPARENT",
-        /*  54 */
-        "smartytag ::= LDELSLASH ID",
-        /*  55 */
-        "smartytag ::= LDELSLASH ID modifierlist",
-        /*  56 */
-        "smartytag ::= LDELSLASH ID PTR ID",
-        /*  57 */
-        "smartytag ::= LDELSLASH ID PTR ID modifierlist",
-        /*  58 */
-        "attributes ::= attributes attribute",
-        /*  59 */
-        "attributes ::= attribute",
-        /*  60 */
-        "attributes ::=",
-        /*  61 */
-        "attribute ::= SPACE ID EQUAL ID",
-        /*  62 */
-        "attribute ::= ATTR expr",
-        /*  63 */
-        "attribute ::= ATTR value",
-        /*  64 */
-        "attribute ::= SPACE ID",
-        /*  65 */
-        "attribute ::= SPACE expr",
-        /*  66 */
-        "attribute ::= SPACE value",
-        /*  67 */
-        "attribute ::= SPACE INTEGER EQUAL expr",
-        /*  68 */
-        "statements ::= statement",
-        /*  69 */
-        "statements ::= statements COMMA statement",
-        /*  70 */
-        "statement ::= DOLLAR varvar EQUAL expr",
-        /*  71 */
-        "statement ::= varindexed EQUAL expr",
-        /*  72 */
-        "statement ::= OPENP statement CLOSEP",
-        /*  73 */
-        "expr ::= value",
-        /*  74 */
-        "expr ::= ternary",
-        /*  75 */
-        "expr ::= DOLLAR ID COLON ID",
-        /*  76 */
-        "expr ::= expr MATH value",
-        /*  77 */
-        "expr ::= expr UNIMATH value",
-        /*  78 */
-        "expr ::= expr ANDSYM value",
-        /*  79 */
-        "expr ::= array",
-        /*  80 */
-        "expr ::= expr modifierlist",
-        /*  81 */
-        "expr ::= expr ifcond expr",
-        /*  82 */
-        "expr ::= expr ISIN array",
-        /*  83 */
-        "expr ::= expr ISIN value",
-        /*  84 */
-        "expr ::= expr lop expr",
-        /*  85 */
-        "expr ::= expr ISDIVBY expr",
-        /*  86 */
-        "expr ::= expr ISNOTDIVBY expr",
-        /*  87 */
-        "expr ::= expr ISEVEN",
-        /*  88 */
-        "expr ::= expr ISNOTEVEN",
-        /*  89 */
-        "expr ::= expr ISEVENBY expr",
-        /*  90 */
-        "expr ::= expr ISNOTEVENBY expr",
-        /*  91 */
-        "expr ::= expr ISODD",
-        /*  92 */
-        "expr ::= expr ISNOTODD",
-        /*  93 */
-        "expr ::= expr ISODDBY expr",
-        /*  94 */
-        "expr ::= expr ISNOTODDBY expr",
-        /*  95 */
-        "expr ::= value INSTANCEOF ID",
-        /*  96 */
-        "expr ::= value INSTANCEOF value",
-        /*  97 */
-        "ternary ::= OPENP expr CLOSEP QMARK DOLLAR ID COLON expr",
-        /*  98 */
-        "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
-        /*  99 */
-        "value ::= variable",
-        /* 100 */
-        "value ::= UNIMATH value",
-        /* 101 */
-        "value ::= NOT value",
-        /* 102 */
-        "value ::= TYPECAST value",
-        /* 103 */
-        "value ::= variable INCDEC",
-        /* 104 */
-        "value ::= HEX",
-        /* 105 */
-        "value ::= INTEGER",
-        /* 106 */
-        "value ::= INTEGER DOT INTEGER",
-        /* 107 */
-        "value ::= INTEGER DOT",
-        /* 108 */
-        "value ::= DOT INTEGER",
-        /* 109 */
-        "value ::= ID",
-        /* 110 */
-        "value ::= function",
-        /* 111 */
-        "value ::= OPENP expr CLOSEP",
-        /* 112 */
-        "value ::= SINGLEQUOTESTRING",
-        /* 113 */
-        "value ::= doublequoted_with_quotes",
-        /* 114 */
-        "value ::= ID DOUBLECOLON static_class_access",
-        /* 115 */
-        "value ::= varindexed DOUBLECOLON static_class_access",
-        /* 116 */
-        "value ::= smartytag RDEL",
-        /* 117 */
-        "value ::= value modifierlist",
-        /* 118 */
-        "variable ::= varindexed",
-        /* 119 */
-        "variable ::= DOLLAR varvar AT ID",
-        /* 120 */
-        "variable ::= object",
-        /* 121 */
-        "variable ::= HATCH ID HATCH",
-        /* 122 */
-        "variable ::= HATCH ID HATCH arrayindex",
-        /* 123 */
-        "variable ::= HATCH variable HATCH",
-        /* 124 */
-        "variable ::= HATCH variable HATCH arrayindex",
-        /* 125 */
-        "varindexed ::= DOLLAR varvar arrayindex",
-        /* 126 */
-        "arrayindex ::= arrayindex indexdef",
-        /* 127 */
-        "arrayindex ::=",
-        /* 128 */
-        "indexdef ::= DOT DOLLAR varvar",
-        /* 129 */
-        "indexdef ::= DOT DOLLAR varvar AT ID",
-        /* 130 */
-        "indexdef ::= DOT ID",
-        /* 131 */
-        "indexdef ::= DOT INTEGER",
-        /* 132 */
-        "indexdef ::= DOT LDEL expr RDEL",
-        /* 133 */
-        "indexdef ::= OPENB ID CLOSEB",
-        /* 134 */
-        "indexdef ::= OPENB ID DOT ID CLOSEB",
-        /* 135 */
-        "indexdef ::= OPENB expr CLOSEB",
-        /* 136 */
-        "indexdef ::= OPENB CLOSEB",
-        /* 137 */
-        "varvar ::= varvarele",
-        /* 138 */
-        "varvar ::= varvar varvarele",
-        /* 139 */
-        "varvarele ::= ID",
-        /* 140 */
-        "varvarele ::= LDEL expr RDEL",
-        /* 141 */
-        "object ::= varindexed objectchain",
-        /* 142 */
-        "objectchain ::= objectelement",
-        /* 143 */
-        "objectchain ::= objectchain objectelement",
-        /* 144 */
-        "objectelement ::= PTR ID arrayindex",
-        /* 145 */
-        "objectelement ::= PTR DOLLAR varvar arrayindex",
-        /* 146 */
-        "objectelement ::= PTR LDEL expr RDEL arrayindex",
-        /* 147 */
-        "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
-        /* 148 */
-        "objectelement ::= PTR method",
-        /* 149 */
-        "function ::= ID OPENP params CLOSEP",
-        /* 150 */
-        "method ::= ID OPENP params CLOSEP",
-        /* 151 */
-        "method ::= DOLLAR ID OPENP params CLOSEP",
-        /* 152 */
-        "params ::= params COMMA expr",
-        /* 153 */
-        "params ::= expr",
-        /* 154 */
-        "params ::=",
-        /* 155 */
-        "modifierlist ::= modifierlist modifier modparameters",
-        /* 156 */
-        "modifierlist ::= modifier modparameters",
-        /* 157 */
-        "modifier ::= VERT AT ID",
-        /* 158 */
-        "modifier ::= VERT ID",
-        /* 159 */
-        "modparameters ::= modparameters modparameter",
-        /* 160 */
-        "modparameters ::=",
-        /* 161 */
-        "modparameter ::= COLON value",
-        /* 162 */
-        "modparameter ::= COLON array",
-        /* 163 */
-        "static_class_access ::= method",
-        /* 164 */
-        "static_class_access ::= method objectchain",
-        /* 165 */
-        "static_class_access ::= ID",
-        /* 166 */
-        "static_class_access ::= DOLLAR ID arrayindex",
-        /* 167 */
-        "static_class_access ::= DOLLAR ID arrayindex objectchain",
-        /* 168 */
-        "ifcond ::= EQUALS",
-        /* 169 */
-        "ifcond ::= NOTEQUALS",
-        /* 170 */
-        "ifcond ::= GREATERTHAN",
-        /* 171 */
-        "ifcond ::= LESSTHAN",
-        /* 172 */
-        "ifcond ::= GREATEREQUAL",
-        /* 173 */
-        "ifcond ::= LESSEQUAL",
-        /* 174 */
-        "ifcond ::= IDENTITY",
-        /* 175 */
-        "ifcond ::= NONEIDENTITY",
-        /* 176 */
-        "ifcond ::= MOD",
-        /* 177 */
-        "lop ::= LAND",
-        /* 178 */
-        "lop ::= LOR",
-        /* 179 */
-        "lop ::= LXOR",
-        /* 180 */
-        "array ::= OPENB arrayelements CLOSEB",
-        /* 181 */
-        "arrayelements ::= arrayelement",
-        /* 182 */
-        "arrayelements ::= arrayelements COMMA arrayelement",
-        /* 183 */
-        "arrayelements ::=",
-        /* 184 */
-        "arrayelement ::= value APTR expr",
-        /* 185 */
-        "arrayelement ::= ID APTR expr",
-        /* 186 */
-        "arrayelement ::= expr",
-        /* 187 */
-        "doublequoted_with_quotes ::= QUOTE QUOTE",
-        /* 188 */
-        "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE",
-        /* 189 */
-        "doublequoted ::= doublequoted doublequotedcontent",
-        /* 190 */
-        "doublequoted ::= doublequotedcontent",
-        /* 191 */
-        "doublequotedcontent ::= BACKTICK variable BACKTICK",
-        /* 192 */
-        "doublequotedcontent ::= BACKTICK expr BACKTICK",
-        /* 193 */
-        "doublequotedcontent ::= DOLLARID",
-        /* 194 */
-        "doublequotedcontent ::= LDEL variable RDEL",
-        /* 195 */
-        "doublequotedcontent ::= LDEL expr RDEL",
-        /* 196 */
-        "doublequotedcontent ::= smartytag RDEL",
-        /* 197 */
-        "doublequotedcontent ::= TEXT",
-        /* 198 */
-        "optspace ::= SPACE",
-        /* 199 */
-        "optspace ::=",
-    );
+    public $yyTokenName = array('$', 'VERT', 'COLON', 'PHP', 'NOCACHE', 'TEXT', 'STRIPON', 'STRIPOFF', 'LITERALSTART',
+                                'LITERALEND', 'LITERAL', 'RDEL', 'SIMPELOUTPUT', 'LDEL', 'DOLLARID', 'EQUAL',
+                                'SIMPLETAG', 'ID', 'PTR', 'LDELIF', 'LDELFOR', 'SEMICOLON', 'INCDEC', 'TO', 'STEP',
+                                'LDELFOREACH', 'SPACE', 'AS', 'APTR', 'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT',
+                                'CLOSETAG', 'LDELSLASH', 'ATTR', 'INTEGER', 'COMMA', 'OPENP', 'CLOSEP', 'MATH',
+                                'UNIMATH', 'ISIN', 'INSTANCEOF', 'QMARK', 'NOT', 'TYPECAST', 'HEX', 'DOT',
+                                'SINGLEQUOTESTRING', 'DOUBLECOLON', 'NAMESPACE', 'AT', 'HATCH', 'OPENB', 'CLOSEB',
+                                'DOLLAR', 'LOGOP', 'TLOGOP', 'SINGLECOND', 'QUOTE', 'BACKTICK', 'error', 'start',
+                                'template', 'template_element', 'smartytag', 'literal', 'text_content',
+                                'literal_elements', 'literal_element', 'tag', 'variable', 'modifierlist', 'attributes',
+                                'value', 'expr', 'varindexed', 'statement', 'statements', 'foraction', 'varvar',
+                                'modparameters', 'attribute', 'ternary', 'array', 'lop', 'scond', 'ns1', 'function',
+                                'doublequoted_with_quotes', 'static_class_access', 'object', 'arrayindex', 'indexdef',
+                                'varvarele', 'objectchain', 'objectelement', 'method', 'params', 'modifier',
+                                'modparameter', 'arrayelements', 'arrayelement', 'doublequoted',
+                                'doublequotedcontent',);
+
+    public static $yyRuleName = array('start ::= template', 'template ::= template_element',
+                                      'template ::= template template_element', 'template ::=',
+                                      'template_element ::= smartytag', 'template_element ::= literal',
+                                      'template_element ::= PHP', 'template_element ::= NOCACHE',
+                                      'template_element ::= text_content', 'text_content ::= TEXT',
+                                      'text_content ::= text_content TEXT', 'template_element ::= STRIPON',
+                                      'template_element ::= STRIPOFF', 'literal ::= LITERALSTART LITERALEND',
+                                      'literal ::= LITERALSTART literal_elements LITERALEND',
+                                      'literal_elements ::= literal_elements literal_element', 'literal_elements ::=',
+                                      'literal_element ::= literal', 'literal_element ::= LITERAL',
+                                      'smartytag ::= tag RDEL', 'smartytag ::= SIMPELOUTPUT', 'tag ::= LDEL variable',
+                                      'tag ::= LDEL variable modifierlist attributes',
+                                      'tag ::= LDEL variable attributes', 'tag ::= LDEL value',
+                                      'tag ::= LDEL value modifierlist attributes', 'tag ::= LDEL value attributes',
+                                      'tag ::= LDEL expr modifierlist attributes', 'tag ::= LDEL expr attributes',
+                                      'tag ::= LDEL DOLLARID EQUAL value', 'tag ::= LDEL DOLLARID EQUAL expr',
+                                      'tag ::= LDEL DOLLARID EQUAL expr attributes',
+                                      'tag ::= LDEL varindexed EQUAL expr attributes', 'smartytag ::= SIMPLETAG',
+                                      'tag ::= LDEL ID attributes', 'tag ::= LDEL ID',
+                                      'tag ::= LDEL ID modifierlist attributes', 'tag ::= LDEL ID PTR ID attributes',
+                                      'tag ::= LDEL ID PTR ID modifierlist attributes', 'tag ::= LDELIF expr',
+                                      'tag ::= LDELIF expr attributes', 'tag ::= LDELIF statement',
+                                      'tag ::= LDELIF statement attributes',
+                                      'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
+                                      'foraction ::= EQUAL expr', 'foraction ::= INCDEC',
+                                      'tag ::= LDELFOR statement TO expr attributes',
+                                      'tag ::= LDELFOR statement TO expr STEP expr attributes',
+                                      'tag ::= LDELFOREACH attributes',
+                                      'tag ::= LDELFOREACH SPACE value AS varvar attributes',
+                                      'tag ::= LDELFOREACH SPACE value AS varvar APTR varvar attributes',
+                                      'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
+                                      'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
+                                      'tag ::= LDELSETFILTER ID modparameters',
+                                      'tag ::= LDELSETFILTER ID modparameters modifierlist',
+                                      'tag ::= LDEL SMARTYBLOCKCHILDPARENT', 'smartytag ::= CLOSETAG',
+                                      'tag ::= LDELSLASH ID', 'tag ::= LDELSLASH ID modifierlist',
+                                      'tag ::= LDELSLASH ID PTR ID', 'tag ::= LDELSLASH ID PTR ID modifierlist',
+                                      'attributes ::= attributes attribute', 'attributes ::= attribute',
+                                      'attributes ::=', 'attribute ::= SPACE ID EQUAL ID', 'attribute ::= ATTR expr',
+                                      'attribute ::= ATTR value', 'attribute ::= SPACE ID', 'attribute ::= SPACE expr',
+                                      'attribute ::= SPACE value', 'attribute ::= SPACE INTEGER EQUAL expr',
+                                      'statements ::= statement', 'statements ::= statements COMMA statement',
+                                      'statement ::= DOLLARID EQUAL INTEGER', 'statement ::= DOLLARID EQUAL expr',
+                                      'statement ::= varindexed EQUAL expr', 'statement ::= OPENP statement CLOSEP',
+                                      'expr ::= value', 'expr ::= ternary', 'expr ::= DOLLARID COLON ID',
+                                      'expr ::= expr MATH value', 'expr ::= expr UNIMATH value', 'expr ::= array',
+                                      'expr ::= expr modifierlist', 'expr ::= expr lop expr', 'expr ::= expr scond',
+                                      'expr ::= expr ISIN array', 'expr ::= expr ISIN value',
+                                      'expr ::= variable INSTANCEOF ns1', 'expr ::= variable INSTANCEOF variable',
+                                      'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
+                                      'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr', 'value ::= variable',
+                                      'value ::= UNIMATH value', 'value ::= NOT value', 'value ::= TYPECAST value',
+                                      'value ::= variable INCDEC', 'value ::= HEX', 'value ::= INTEGER',
+                                      'value ::= INTEGER DOT INTEGER', 'value ::= INTEGER DOT', 'value ::= DOT INTEGER',
+                                      'value ::= ID', 'value ::= function', 'value ::= OPENP expr CLOSEP',
+                                      'value ::= SINGLEQUOTESTRING', 'value ::= doublequoted_with_quotes',
+                                      'value ::= varindexed DOUBLECOLON static_class_access', 'value ::= smartytag',
+                                      'value ::= value modifierlist', 'value ::= NAMESPACE',
+                                      'value ::= ns1 DOUBLECOLON static_class_access', 'ns1 ::= ID',
+                                      'ns1 ::= NAMESPACE', 'variable ::= DOLLARID', 'variable ::= varindexed',
+                                      'variable ::= varvar AT ID', 'variable ::= object', 'variable ::= HATCH ID HATCH',
+                                      'variable ::= HATCH ID HATCH arrayindex', 'variable ::= HATCH variable HATCH',
+                                      'variable ::= HATCH variable HATCH arrayindex',
+                                      'varindexed ::= DOLLARID arrayindex', 'varindexed ::= varvar arrayindex',
+                                      'arrayindex ::= arrayindex indexdef', 'arrayindex ::=',
+                                      'indexdef ::= DOT DOLLARID', 'indexdef ::= DOT varvar',
+                                      'indexdef ::= DOT varvar AT ID', 'indexdef ::= DOT ID',
+                                      'indexdef ::= DOT INTEGER', 'indexdef ::= DOT LDEL expr RDEL',
+                                      'indexdef ::= OPENB ID CLOSEB', 'indexdef ::= OPENB ID DOT ID CLOSEB',
+                                      'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
+                                      'indexdef ::= OPENB INTEGER CLOSEB', 'indexdef ::= OPENB DOLLARID CLOSEB',
+                                      'indexdef ::= OPENB variable CLOSEB', 'indexdef ::= OPENB value CLOSEB',
+                                      'indexdef ::= OPENB expr CLOSEB', 'indexdef ::= OPENB CLOSEB',
+                                      'varvar ::= DOLLARID', 'varvar ::= DOLLAR', 'varvar ::= varvar varvarele',
+                                      'varvarele ::= ID', 'varvarele ::= SIMPELOUTPUT', 'varvarele ::= LDEL expr RDEL',
+                                      'object ::= varindexed objectchain', 'objectchain ::= objectelement',
+                                      'objectchain ::= objectchain objectelement',
+                                      'objectelement ::= PTR ID arrayindex', 'objectelement ::= PTR varvar arrayindex',
+                                      'objectelement ::= PTR LDEL expr RDEL arrayindex',
+                                      'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
+                                      'objectelement ::= PTR method', 'function ::= ns1 OPENP params CLOSEP',
+                                      'method ::= ID OPENP params CLOSEP', 'method ::= DOLLARID OPENP params CLOSEP',
+                                      'params ::= params COMMA expr', 'params ::= expr', 'params ::=',
+                                      'modifierlist ::= modifierlist modifier modparameters',
+                                      'modifierlist ::= modifier modparameters', 'modifier ::= VERT AT ID',
+                                      'modifier ::= VERT ID', 'modparameters ::= modparameters modparameter',
+                                      'modparameters ::=', 'modparameter ::= COLON value',
+                                      'modparameter ::= COLON array', 'static_class_access ::= method',
+                                      'static_class_access ::= method objectchain', 'static_class_access ::= ID',
+                                      'static_class_access ::= DOLLARID arrayindex',
+                                      'static_class_access ::= DOLLARID arrayindex objectchain', 'lop ::= LOGOP',
+                                      'lop ::= TLOGOP', 'scond ::= SINGLECOND', 'array ::= OPENB arrayelements CLOSEB',
+                                      'arrayelements ::= arrayelement',
+                                      'arrayelements ::= arrayelements COMMA arrayelement', 'arrayelements ::=',
+                                      'arrayelement ::= value APTR expr', 'arrayelement ::= ID APTR expr',
+                                      'arrayelement ::= expr', 'doublequoted_with_quotes ::= QUOTE QUOTE',
+                                      'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
+                                      'doublequoted ::= doublequoted doublequotedcontent',
+                                      'doublequoted ::= doublequotedcontent',
+                                      'doublequotedcontent ::= BACKTICK variable BACKTICK',
+                                      'doublequotedcontent ::= BACKTICK expr BACKTICK',
+                                      'doublequotedcontent ::= DOLLARID', 'doublequotedcontent ::= LDEL variable RDEL',
+                                      'doublequotedcontent ::= LDEL expr RDEL', 'doublequotedcontent ::= smartytag',
+                                      'doublequotedcontent ::= TEXT',);
 
     public function tokenName($tokenType)
     {
@@ -2635,14 +1050,12 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
 
     public function yy_pop_parser_stack()
     {
-        if (!count($this->yystack)) {
+        if (empty($this->yystack)) {
             return;
         }
         $yytos = array_pop($this->yystack);
         if ($this->yyTraceFILE && $this->yyidx >= 0) {
-            fwrite($this->yyTraceFILE,
-                   $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                   "\n");
+            fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . "\n");
         }
         $yymajor = $yytos->major;
         self::yy_destructor($yymajor, $yytos->minor);
@@ -2663,10 +1076,18 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
 
     public function yy_get_expected_tokens($token)
     {
+        static $res3 = array();
+        static $res4 = array();
         $state = $this->yystack[$this->yyidx]->stateno;
         $expected = self::$yyExpectedTokens[$state];
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return $expected;
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return $expected;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -2684,18 +1105,25 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
                         return array_unique($expected);
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno,
+                                                              self::$yyRuleInfo[$yyruleno][0]);
                     if (isset(self::$yyExpectedTokens[$nextstate])) {
                         $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                        if (in_array($token,
-                                     self::$yyExpectedTokens[$nextstate], true)) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-
-                            return array_unique($expected);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[$nextstate][$token] =
+                                in_array($token, self::$yyExpectedTokens[$nextstate], true)
+                            ) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
                         }
                     }
                     if ($nextstate < self::YYNSTATE) {
@@ -2703,7 +1131,7 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
                         $this->yyidx ++;
                         $x = new TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
                         $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
@@ -2733,12 +1161,20 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
 
     public function yy_is_expected_token($token)
     {
+        static $res = array();
+        static $res2 = array();
         if ($token === 0) {
             return true; // 0 is not part of this
         }
         $state = $this->yystack[$this->yyidx]->stateno;
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return true;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
+                return true;
+            }
+        } else {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return true;
+            }
         }
         $stack = $this->yystack;
         $yyidx = $this->yyidx;
@@ -2756,24 +1192,30 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
                         return true;
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                        in_array($token, self::$yyExpectedTokens[$nextstate], true)
-                    ) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-
-                        return true;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno,
+                                                              self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) &&
+                            in_array($token, self::$yyExpectedTokens[$nextstate], true))
+                        ) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
                         $this->yyidx ++;
                         $x = new TP_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
                         $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
@@ -2822,16 +1264,14 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-            self::$yy_lookahead[$i] != $iLookAhead
-        ) {
-            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                && ($iFallback = self::$yyFallback[$iLookAhead]) != 0
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) &&
+                ($iFallback = self::$yyFallback[$iLookAhead]) != 0
             ) {
                 if ($this->yyTraceFILE) {
-                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " .
-                        $this->yyTokenName[$iLookAhead] . " => " .
-                        $this->yyTokenName[$iFallback] . "\n");
+                    fwrite($this->yyTraceFILE,
+                           $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[$iLookAhead] . " => " .
+                           $this->yyTokenName[$iFallback] . "\n");
                 }
 
                 return $this->yy_find_shift_action($iFallback);
@@ -2858,9 +1298,7 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-            self::$yy_lookahead[$i] != $iLookAhead
-        ) {
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
             return self::$yy_default[$stateno];
         } else {
             return self::$yy_action[$i];
@@ -2878,11 +1316,10 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             while ($this->yyidx >= 0) {
                 $this->yy_pop_parser_stack();
             }
-            #line 82 "smarty_internal_templateparser.y"
+            #line 214 "../smarty/lexer/smarty_internal_templateparser.y"
 
             $this->internalError = true;
             $this->compiler->trigger_template_error("Stack overflow in template parser");
-            #line 1721 "smarty_internal_templateparser.php"
 
             return;
         }
@@ -2890,805 +1327,538 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         $yytos->stateno = $yyNewState;
         $yytos->major = $yyMajor;
         $yytos->minor = $yypMinor;
-        array_push($this->yystack, $yytos);
+        $this->yystack[] = $yytos;
         if ($this->yyTraceFILE && $this->yyidx > 0) {
-            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
-                    $yyNewState);
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState);
             fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
             for ($i = 1; $i <= $this->yyidx; $i ++) {
-                fprintf($this->yyTraceFILE, " %s",
-                        $this->yyTokenName[$this->yystack[$i]->major]);
+                fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[$this->yystack[$i]->major]);
             }
             fwrite($this->yyTraceFILE, "\n");
         }
     }
 
-    public static $yyRuleInfo = array(
-        array('lhs' => 83, 'rhs' => 1),
-        array('lhs' => 84, 'rhs' => 1),
-        array('lhs' => 84, 'rhs' => 2),
-        array('lhs' => 84, 'rhs' => 0),
-        array('lhs' => 85, 'rhs' => 2),
-        array('lhs' => 85, 'rhs' => 1),
-        array('lhs' => 85, 'rhs' => 1),
-        array('lhs' => 85, 'rhs' => 1),
-        array('lhs' => 85, 'rhs' => 1),
-        array('lhs' => 85, 'rhs' => 1),
-        array('lhs' => 85, 'rhs' => 1),
-        array('lhs' => 85, 'rhs' => 1),
-        array('lhs' => 85, 'rhs' => 1),
-        array('lhs' => 85, 'rhs' => 1),
-        array('lhs' => 85, 'rhs' => 1),
-        array('lhs' => 85, 'rhs' => 1),
-        array('lhs' => 85, 'rhs' => 1),
-        array('lhs' => 87, 'rhs' => 2),
-        array('lhs' => 87, 'rhs' => 3),
-        array('lhs' => 88, 'rhs' => 2),
-        array('lhs' => 88, 'rhs' => 0),
-        array('lhs' => 89, 'rhs' => 1),
-        array('lhs' => 89, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 2),
-        array('lhs' => 86, 'rhs' => 4),
-        array('lhs' => 86, 'rhs' => 3),
-        array('lhs' => 86, 'rhs' => 4),
-        array('lhs' => 86, 'rhs' => 3),
-        array('lhs' => 86, 'rhs' => 5),
-        array('lhs' => 86, 'rhs' => 5),
-        array('lhs' => 86, 'rhs' => 6),
-        array('lhs' => 86, 'rhs' => 5),
-        array('lhs' => 86, 'rhs' => 3),
-        array('lhs' => 86, 'rhs' => 2),
-        array('lhs' => 86, 'rhs' => 5),
-        array('lhs' => 86, 'rhs' => 4),
-        array('lhs' => 86, 'rhs' => 6),
-        array('lhs' => 86, 'rhs' => 2),
-        array('lhs' => 86, 'rhs' => 3),
-        array('lhs' => 86, 'rhs' => 2),
-        array('lhs' => 86, 'rhs' => 3),
-        array('lhs' => 86, 'rhs' => 11),
-        array('lhs' => 99, 'rhs' => 2),
-        array('lhs' => 99, 'rhs' => 1),
-        array('lhs' => 86, 'rhs' => 5),
-        array('lhs' => 86, 'rhs' => 7),
-        array('lhs' => 86, 'rhs' => 2),
-        array('lhs' => 86, 'rhs' => 7),
-        array('lhs' => 86, 'rhs' => 10),
-        array('lhs' => 86, 'rhs' => 7),
-        array('lhs' => 86, 'rhs' => 10),
-        array('lhs' => 86, 'rhs' => 3),
-        array('lhs' => 86, 'rhs' => 4),
-        array('lhs' => 86, 'rhs' => 2),
-        array('lhs' => 86, 'rhs' => 2),
-        array('lhs' => 86, 'rhs' => 3),
-        array('lhs' => 86, 'rhs' => 4),
-        array('lhs' => 86, 'rhs' => 5),
-        array('lhs' => 92, 'rhs' => 2),
-        array('lhs' => 92, 'rhs' => 1),
-        array('lhs' => 92, 'rhs' => 0),
-        array('lhs' => 101, 'rhs' => 4),
-        array('lhs' => 101, 'rhs' => 2),
-        array('lhs' => 101, 'rhs' => 2),
-        array('lhs' => 101, 'rhs' => 2),
-        array('lhs' => 101, 'rhs' => 2),
-        array('lhs' => 101, 'rhs' => 2),
-        array('lhs' => 101, 'rhs' => 4),
-        array('lhs' => 96, 'rhs' => 1),
-        array('lhs' => 96, 'rhs' => 3),
-        array('lhs' => 95, 'rhs' => 4),
-        array('lhs' => 95, 'rhs' => 3),
-        array('lhs' => 95, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 1),
-        array('lhs' => 93, 'rhs' => 1),
-        array('lhs' => 93, 'rhs' => 4),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 1),
-        array('lhs' => 93, 'rhs' => 2),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 2),
-        array('lhs' => 93, 'rhs' => 2),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 2),
-        array('lhs' => 93, 'rhs' => 2),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 93, 'rhs' => 3),
-        array('lhs' => 102, 'rhs' => 8),
-        array('lhs' => 102, 'rhs' => 7),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 2),
-        array('lhs' => 90, 'rhs' => 2),
-        array('lhs' => 90, 'rhs' => 2),
-        array('lhs' => 90, 'rhs' => 2),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 3),
-        array('lhs' => 90, 'rhs' => 2),
-        array('lhs' => 90, 'rhs' => 2),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 3),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 1),
-        array('lhs' => 90, 'rhs' => 3),
-        array('lhs' => 90, 'rhs' => 3),
-        array('lhs' => 90, 'rhs' => 2),
-        array('lhs' => 90, 'rhs' => 2),
-        array('lhs' => 106, 'rhs' => 1),
-        array('lhs' => 106, 'rhs' => 4),
-        array('lhs' => 106, 'rhs' => 1),
-        array('lhs' => 106, 'rhs' => 3),
-        array('lhs' => 106, 'rhs' => 4),
-        array('lhs' => 106, 'rhs' => 3),
-        array('lhs' => 106, 'rhs' => 4),
-        array('lhs' => 94, 'rhs' => 3),
-        array('lhs' => 111, 'rhs' => 2),
-        array('lhs' => 111, 'rhs' => 0),
-        array('lhs' => 112, 'rhs' => 3),
-        array('lhs' => 112, 'rhs' => 5),
-        array('lhs' => 112, 'rhs' => 2),
-        array('lhs' => 112, 'rhs' => 2),
-        array('lhs' => 112, 'rhs' => 4),
-        array('lhs' => 112, 'rhs' => 3),
-        array('lhs' => 112, 'rhs' => 5),
-        array('lhs' => 112, 'rhs' => 3),
-        array('lhs' => 112, 'rhs' => 2),
-        array('lhs' => 98, 'rhs' => 1),
-        array('lhs' => 98, 'rhs' => 2),
-        array('lhs' => 113, 'rhs' => 1),
-        array('lhs' => 113, 'rhs' => 3),
-        array('lhs' => 110, 'rhs' => 2),
-        array('lhs' => 114, 'rhs' => 1),
-        array('lhs' => 114, 'rhs' => 2),
-        array('lhs' => 115, 'rhs' => 3),
-        array('lhs' => 115, 'rhs' => 4),
-        array('lhs' => 115, 'rhs' => 5),
-        array('lhs' => 115, 'rhs' => 6),
-        array('lhs' => 115, 'rhs' => 2),
-        array('lhs' => 107, 'rhs' => 4),
-        array('lhs' => 116, 'rhs' => 4),
-        array('lhs' => 116, 'rhs' => 5),
-        array('lhs' => 117, 'rhs' => 3),
-        array('lhs' => 117, 'rhs' => 1),
-        array('lhs' => 117, 'rhs' => 0),
-        array('lhs' => 91, 'rhs' => 3),
-        array('lhs' => 91, 'rhs' => 2),
-        array('lhs' => 118, 'rhs' => 3),
-        array('lhs' => 118, 'rhs' => 2),
-        array('lhs' => 100, 'rhs' => 2),
-        array('lhs' => 100, 'rhs' => 0),
-        array('lhs' => 119, 'rhs' => 2),
-        array('lhs' => 119, 'rhs' => 2),
-        array('lhs' => 109, 'rhs' => 1),
-        array('lhs' => 109, 'rhs' => 2),
-        array('lhs' => 109, 'rhs' => 1),
-        array('lhs' => 109, 'rhs' => 3),
-        array('lhs' => 109, 'rhs' => 4),
-        array('lhs' => 104, 'rhs' => 1),
-        array('lhs' => 104, 'rhs' => 1),
-        array('lhs' => 104, 'rhs' => 1),
-        array('lhs' => 104, 'rhs' => 1),
-        array('lhs' => 104, 'rhs' => 1),
-        array('lhs' => 104, 'rhs' => 1),
-        array('lhs' => 104, 'rhs' => 1),
-        array('lhs' => 104, 'rhs' => 1),
-        array('lhs' => 104, 'rhs' => 1),
-        array('lhs' => 105, 'rhs' => 1),
-        array('lhs' => 105, 'rhs' => 1),
-        array('lhs' => 105, 'rhs' => 1),
-        array('lhs' => 103, 'rhs' => 3),
-        array('lhs' => 120, 'rhs' => 1),
-        array('lhs' => 120, 'rhs' => 3),
-        array('lhs' => 120, 'rhs' => 0),
-        array('lhs' => 121, 'rhs' => 3),
-        array('lhs' => 121, 'rhs' => 3),
-        array('lhs' => 121, 'rhs' => 1),
-        array('lhs' => 108, 'rhs' => 2),
-        array('lhs' => 108, 'rhs' => 3),
-        array('lhs' => 122, 'rhs' => 2),
-        array('lhs' => 122, 'rhs' => 1),
-        array('lhs' => 123, 'rhs' => 3),
-        array('lhs' => 123, 'rhs' => 3),
-        array('lhs' => 123, 'rhs' => 1),
-        array('lhs' => 123, 'rhs' => 3),
-        array('lhs' => 123, 'rhs' => 3),
-        array('lhs' => 123, 'rhs' => 2),
-        array('lhs' => 123, 'rhs' => 1),
-        array('lhs' => 97, 'rhs' => 1),
-        array('lhs' => 97, 'rhs' => 0),
-    );
-
-    public static $yyReduceMap = array(
-        0   => 0,
-        1   => 1,
-        2   => 2,
-        4   => 4,
-        5   => 5,
-        6   => 6,
-        7   => 7,
-        8   => 8,
-        9   => 9,
-        10  => 10,
-        11  => 11,
-        12  => 12,
-        13  => 13,
-        14  => 14,
-        15  => 15,
-        16  => 16,
-        17  => 17,
-        20  => 17,
-        199 => 17,
-        18  => 18,
-        72  => 18,
-        19  => 19,
-        100 => 19,
-        102 => 19,
-        103 => 19,
-        126 => 19,
-        164 => 19,
-        21  => 21,
-        22  => 21,
-        43  => 21,
-        65  => 21,
-        66  => 21,
-        73  => 21,
-        74  => 21,
-        79  => 21,
-        99  => 21,
-        104 => 21,
-        105 => 21,
-        110 => 21,
-        112 => 21,
-        113 => 21,
-        120 => 21,
-        137 => 21,
-        163 => 21,
-        165 => 21,
-        181 => 21,
-        186 => 21,
-        198 => 21,
-        23  => 23,
-        24  => 24,
-        25  => 25,
-        27  => 25,
-        26  => 26,
-        28  => 28,
-        29  => 28,
-        30  => 30,
-        31  => 31,
-        32  => 32,
-        33  => 33,
-        34  => 34,
-        35  => 35,
-        36  => 36,
-        37  => 37,
-        38  => 38,
-        40  => 38,
-        39  => 39,
-        41  => 41,
-        42  => 42,
-        44  => 44,
-        45  => 45,
-        46  => 46,
-        47  => 47,
-        49  => 47,
-        48  => 48,
-        50  => 48,
-        51  => 51,
-        52  => 52,
-        53  => 53,
-        54  => 54,
-        55  => 55,
-        56  => 56,
-        57  => 57,
-        58  => 58,
-        59  => 59,
-        68  => 59,
-        153 => 59,
-        157 => 59,
-        161 => 59,
-        162 => 59,
-        60  => 60,
-        154 => 60,
-        160 => 60,
-        61  => 61,
-        62  => 62,
-        63  => 62,
-        64  => 64,
-        67  => 67,
-        69  => 69,
-        70  => 70,
-        71  => 70,
-        75  => 75,
-        76  => 76,
-        77  => 76,
-        78  => 76,
-        80  => 80,
-        117 => 80,
-        81  => 81,
-        84  => 81,
-        95  => 81,
-        82  => 82,
-        83  => 83,
-        85  => 85,
-        86  => 86,
-        87  => 87,
-        92  => 87,
-        88  => 88,
-        91  => 88,
-        89  => 89,
-        94  => 89,
-        90  => 90,
-        93  => 90,
-        96  => 96,
-        97  => 97,
-        98  => 98,
-        101 => 101,
-        106 => 106,
-        107 => 107,
-        108 => 108,
-        109 => 109,
-        111 => 111,
-        114 => 114,
-        115 => 115,
-        116 => 116,
-        118 => 118,
-        119 => 119,
-        121 => 121,
-        122 => 122,
-        123 => 123,
-        124 => 124,
-        125 => 125,
-        127 => 127,
-        183 => 127,
-        128 => 128,
-        129 => 129,
-        130 => 130,
-        131 => 131,
-        132 => 132,
-        135 => 132,
-        133 => 133,
-        134 => 134,
-        136 => 136,
-        138 => 138,
-        139 => 139,
-        140 => 140,
-        141 => 141,
-        142 => 142,
-        143 => 143,
-        144 => 144,
-        145 => 145,
-        146 => 146,
-        147 => 147,
-        148 => 148,
-        149 => 149,
-        150 => 150,
-        151 => 151,
-        152 => 152,
-        155 => 155,
-        156 => 156,
-        158 => 158,
-        159 => 159,
-        166 => 166,
-        167 => 167,
-        168 => 168,
-        169 => 169,
-        170 => 170,
-        171 => 171,
-        172 => 172,
-        173 => 173,
-        174 => 174,
-        175 => 175,
-        176 => 176,
-        177 => 177,
-        178 => 178,
-        179 => 179,
-        180 => 180,
-        182 => 182,
-        184 => 184,
-        185 => 185,
-        187 => 187,
-        188 => 188,
-        189 => 189,
-        190 => 190,
-        191 => 191,
-        192 => 191,
-        194 => 191,
-        193 => 193,
-        195 => 195,
-        196 => 196,
-        197 => 197,
-    );
-
-    #line 93 "smarty_internal_templateparser.y"
+    public static $yyRuleInfo = array(array(0 => 61, 1 => 1), array(0 => 62, 1 => 1), array(0 => 62, 1 => 2),
+                                      array(0 => 62, 1 => 0), array(0 => 63, 1 => 1), array(0 => 63, 1 => 1),
+                                      array(0 => 63, 1 => 1), array(0 => 63, 1 => 1), array(0 => 63, 1 => 1),
+                                      array(0 => 66, 1 => 1), array(0 => 66, 1 => 2), array(0 => 63, 1 => 1),
+                                      array(0 => 63, 1 => 1), array(0 => 65, 1 => 2), array(0 => 65, 1 => 3),
+                                      array(0 => 67, 1 => 2), array(0 => 67, 1 => 0), array(0 => 68, 1 => 1),
+                                      array(0 => 68, 1 => 1), array(0 => 64, 1 => 2), array(0 => 64, 1 => 1),
+                                      array(0 => 69, 1 => 2), array(0 => 69, 1 => 4), array(0 => 69, 1 => 3),
+                                      array(0 => 69, 1 => 2), array(0 => 69, 1 => 4), array(0 => 69, 1 => 3),
+                                      array(0 => 69, 1 => 4), array(0 => 69, 1 => 3), array(0 => 69, 1 => 4),
+                                      array(0 => 69, 1 => 4), array(0 => 69, 1 => 5), array(0 => 69, 1 => 5),
+                                      array(0 => 64, 1 => 1), array(0 => 69, 1 => 3), array(0 => 69, 1 => 2),
+                                      array(0 => 69, 1 => 4), array(0 => 69, 1 => 5), array(0 => 69, 1 => 6),
+                                      array(0 => 69, 1 => 2), array(0 => 69, 1 => 3), array(0 => 69, 1 => 2),
+                                      array(0 => 69, 1 => 3), array(0 => 69, 1 => 8), array(0 => 78, 1 => 2),
+                                      array(0 => 78, 1 => 1), array(0 => 69, 1 => 5), array(0 => 69, 1 => 7),
+                                      array(0 => 69, 1 => 2), array(0 => 69, 1 => 6), array(0 => 69, 1 => 8),
+                                      array(0 => 69, 1 => 6), array(0 => 69, 1 => 8), array(0 => 69, 1 => 3),
+                                      array(0 => 69, 1 => 4), array(0 => 69, 1 => 2), array(0 => 64, 1 => 1),
+                                      array(0 => 69, 1 => 2), array(0 => 69, 1 => 3), array(0 => 69, 1 => 4),
+                                      array(0 => 69, 1 => 5), array(0 => 72, 1 => 2), array(0 => 72, 1 => 1),
+                                      array(0 => 72, 1 => 0), array(0 => 81, 1 => 4), array(0 => 81, 1 => 2),
+                                      array(0 => 81, 1 => 2), array(0 => 81, 1 => 2), array(0 => 81, 1 => 2),
+                                      array(0 => 81, 1 => 2), array(0 => 81, 1 => 4), array(0 => 77, 1 => 1),
+                                      array(0 => 77, 1 => 3), array(0 => 76, 1 => 3), array(0 => 76, 1 => 3),
+                                      array(0 => 76, 1 => 3), array(0 => 76, 1 => 3), array(0 => 74, 1 => 1),
+                                      array(0 => 74, 1 => 1), array(0 => 74, 1 => 3), array(0 => 74, 1 => 3),
+                                      array(0 => 74, 1 => 3), array(0 => 74, 1 => 1), array(0 => 74, 1 => 2),
+                                      array(0 => 74, 1 => 3), array(0 => 74, 1 => 2), array(0 => 74, 1 => 3),
+                                      array(0 => 74, 1 => 3), array(0 => 74, 1 => 3), array(0 => 74, 1 => 3),
+                                      array(0 => 82, 1 => 7), array(0 => 82, 1 => 7), array(0 => 73, 1 => 1),
+                                      array(0 => 73, 1 => 2), array(0 => 73, 1 => 2), array(0 => 73, 1 => 2),
+                                      array(0 => 73, 1 => 2), array(0 => 73, 1 => 1), array(0 => 73, 1 => 1),
+                                      array(0 => 73, 1 => 3), array(0 => 73, 1 => 2), array(0 => 73, 1 => 2),
+                                      array(0 => 73, 1 => 1), array(0 => 73, 1 => 1), array(0 => 73, 1 => 3),
+                                      array(0 => 73, 1 => 1), array(0 => 73, 1 => 1), array(0 => 73, 1 => 3),
+                                      array(0 => 73, 1 => 1), array(0 => 73, 1 => 2), array(0 => 73, 1 => 1),
+                                      array(0 => 73, 1 => 3), array(0 => 86, 1 => 1), array(0 => 86, 1 => 1),
+                                      array(0 => 70, 1 => 1), array(0 => 70, 1 => 1), array(0 => 70, 1 => 3),
+                                      array(0 => 70, 1 => 1), array(0 => 70, 1 => 3), array(0 => 70, 1 => 4),
+                                      array(0 => 70, 1 => 3), array(0 => 70, 1 => 4), array(0 => 75, 1 => 2),
+                                      array(0 => 75, 1 => 2), array(0 => 91, 1 => 2), array(0 => 91, 1 => 0),
+                                      array(0 => 92, 1 => 2), array(0 => 92, 1 => 2), array(0 => 92, 1 => 4),
+                                      array(0 => 92, 1 => 2), array(0 => 92, 1 => 2), array(0 => 92, 1 => 4),
+                                      array(0 => 92, 1 => 3), array(0 => 92, 1 => 5), array(0 => 92, 1 => 3),
+                                      array(0 => 92, 1 => 3), array(0 => 92, 1 => 3), array(0 => 92, 1 => 3),
+                                      array(0 => 92, 1 => 3), array(0 => 92, 1 => 3), array(0 => 92, 1 => 2),
+                                      array(0 => 79, 1 => 1), array(0 => 79, 1 => 1), array(0 => 79, 1 => 2),
+                                      array(0 => 93, 1 => 1), array(0 => 93, 1 => 1), array(0 => 93, 1 => 3),
+                                      array(0 => 90, 1 => 2), array(0 => 94, 1 => 1), array(0 => 94, 1 => 2),
+                                      array(0 => 95, 1 => 3), array(0 => 95, 1 => 3), array(0 => 95, 1 => 5),
+                                      array(0 => 95, 1 => 6), array(0 => 95, 1 => 2), array(0 => 87, 1 => 4),
+                                      array(0 => 96, 1 => 4), array(0 => 96, 1 => 4), array(0 => 97, 1 => 3),
+                                      array(0 => 97, 1 => 1), array(0 => 97, 1 => 0), array(0 => 71, 1 => 3),
+                                      array(0 => 71, 1 => 2), array(0 => 98, 1 => 3), array(0 => 98, 1 => 2),
+                                      array(0 => 80, 1 => 2), array(0 => 80, 1 => 0), array(0 => 99, 1 => 2),
+                                      array(0 => 99, 1 => 2), array(0 => 89, 1 => 1), array(0 => 89, 1 => 2),
+                                      array(0 => 89, 1 => 1), array(0 => 89, 1 => 2), array(0 => 89, 1 => 3),
+                                      array(0 => 84, 1 => 1), array(0 => 84, 1 => 1), array(0 => 85, 1 => 1),
+                                      array(0 => 83, 1 => 3), array(0 => 100, 1 => 1), array(0 => 100, 1 => 3),
+                                      array(0 => 100, 1 => 0), array(0 => 101, 1 => 3), array(0 => 101, 1 => 3),
+                                      array(0 => 101, 1 => 1), array(0 => 88, 1 => 2), array(0 => 88, 1 => 3),
+                                      array(0 => 102, 1 => 2), array(0 => 102, 1 => 1), array(0 => 103, 1 => 3),
+                                      array(0 => 103, 1 => 3), array(0 => 103, 1 => 1), array(0 => 103, 1 => 3),
+                                      array(0 => 103, 1 => 3), array(0 => 103, 1 => 1), array(0 => 103, 1 => 1),);
+
+    public static $yyReduceMap = array(0   => 0, 1 => 1, 2 => 2, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9,
+                                       17  => 9, 18 => 9, 45 => 9, 68 => 9, 69 => 9, 77 => 9, 78 => 9, 82 => 9, 92 => 9,
+                                       97  => 9, 98 => 9, 103 => 9, 105 => 9, 106 => 9, 110 => 9, 112 => 9, 117 => 9,
+                                       178 => 9, 183 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 16 => 13, 14 => 14,
+                                       76  => 14, 15 => 15, 93 => 15, 95 => 15, 96 => 15, 124 => 15, 19 => 19, 20 => 20,
+                                       21  => 21, 24 => 21, 22 => 22, 25 => 22, 23 => 23, 26 => 23, 28 => 23, 27 => 27,
+                                       29  => 29, 30 => 29, 31 => 31, 32 => 32, 33 => 33, 34 => 34, 35 => 35, 36 => 36,
+                                       37  => 37, 38 => 38, 39 => 39, 40 => 40, 42 => 40, 41 => 41, 43 => 43, 44 => 44,
+                                       46  => 46, 47 => 47, 48 => 48, 49 => 49, 51 => 49, 50 => 50, 52 => 50, 53 => 53,
+                                       54  => 54, 55 => 55, 56 => 56, 57 => 57, 58 => 58, 59 => 59, 60 => 60, 61 => 61,
+                                       62  => 62, 71 => 62, 159 => 62, 163 => 62, 167 => 62, 168 => 62, 63 => 63,
+                                       160 => 63, 166 => 63, 64 => 64, 65 => 65, 66 => 65, 67 => 67, 144 => 67,
+                                       70  => 70, 72 => 72, 73 => 73, 74 => 73, 75 => 75, 79 => 79, 80 => 80, 81 => 80,
+                                       83  => 83, 109 => 83, 84 => 84, 85 => 85, 86 => 86, 87 => 87, 88 => 88, 89 => 88,
+                                       90  => 90, 91 => 91, 94 => 94, 99 => 99, 100 => 100, 101 => 101, 102 => 102,
+                                       104 => 104, 107 => 107, 108 => 108, 111 => 111, 113 => 113, 114 => 114,
+                                       115 => 115, 116 => 116, 118 => 118, 119 => 119, 120 => 120, 121 => 121,
+                                       122 => 122, 123 => 123, 125 => 125, 180 => 125, 126 => 126, 127 => 127,
+                                       128 => 128, 129 => 129, 130 => 130, 131 => 131, 139 => 131, 132 => 132,
+                                       133 => 133, 134 => 134, 135 => 134, 137 => 134, 138 => 134, 136 => 136,
+                                       140 => 140, 141 => 141, 142 => 142, 184 => 142, 143 => 143, 145 => 145,
+                                       146 => 146, 147 => 147, 148 => 148, 149 => 149, 150 => 150, 151 => 151,
+                                       152 => 152, 153 => 153, 154 => 154, 155 => 155, 156 => 156, 157 => 157,
+                                       158 => 158, 161 => 161, 162 => 162, 164 => 164, 165 => 165, 169 => 169,
+                                       170 => 170, 171 => 171, 172 => 172, 173 => 173, 174 => 174, 175 => 175,
+                                       176 => 176, 177 => 177, 179 => 179, 181 => 181, 182 => 182, 185 => 185,
+                                       186 => 186, 187 => 187, 188 => 188, 189 => 188, 191 => 188, 190 => 190,
+                                       192 => 192, 193 => 193, 194 => 194,);
+
+    #line 225 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r0()
     {
-        $this->_retvalue = $this->root_buffer->to_smarty_php();
+        $this->root_buffer->prepend_array($this, $this->template_prefix);
+        $this->root_buffer->append_array($this, $this->template_postfix);
+        $this->_retvalue = $this->root_buffer->to_smarty_php($this);
     }
-    #line 2150 "smarty_internal_templateparser.php"
-    #line 101 "smarty_internal_templateparser.y"
+
+    #line 235 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r1()
     {
         if ($this->yystack[$this->yyidx + 0]->minor != null) {
-            $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);
+            $this->current_buffer->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
         }
     }
-    #line 2157 "smarty_internal_templateparser.php"
-    #line 108 "smarty_internal_templateparser.y"
+
+    #line 242 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r2()
     {
         if ($this->yystack[$this->yyidx + 0]->minor != null) {
             // because of possible code injection
-            $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);
+            $this->current_buffer->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
         }
     }
-    #line 2165 "smarty_internal_templateparser.php"
-    #line 122 "smarty_internal_templateparser.y"
+
+    #line 256 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r4()
     {
         if ($this->compiler->has_code) {
-            $tmp = '';
-            foreach ($this->compiler->prefix_code as $code) {
-                $tmp .= $code;
-            }
-            $this->compiler->prefix_code = array();
-            $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode($tmp . $this->yystack[$this->yyidx + - 1]->minor, true));
+            $this->_retvalue = $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor);
         } else {
             $this->_retvalue = null;
         }
         $this->compiler->has_variable_string = false;
         $this->block_nesting_level = count($this->compiler->_tag_stack);
     }
-    #line 2177 "smarty_internal_templateparser.php"
-    #line 134 "smarty_internal_templateparser.y"
+
+    #line 267 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r5()
     {
-        $this->_retvalue = null;
+        $this->_retvalue = new Smarty_Internal_ParseTree_Text($this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2182 "smarty_internal_templateparser.php"
-    #line 139 "smarty_internal_templateparser.y"
+
+    #line 271 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r6()
     {
-        $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-    #line 2187 "smarty_internal_templateparser.php"
-    #line 144 "smarty_internal_templateparser.y"
-    function yy_r7()
-    {
-        if (strpos($this->yystack[$this->yyidx + 0]->minor, '<s') === 0) {
-            $this->lex->is_phpScript = true;
-        }
-        if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            if ($this->lex->is_phpScript) {
-                $s = addcslashes($this->yystack[$this->yyidx + 0]->minor, "'");
-                $this->_retvalue = new _smarty_text($this, $s);
-            } else {
-                $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-            }
-        } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-            $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-        } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-            if (!($this->smarty instanceof SmartyBC)) {
-                $this->compiler->trigger_template_error(self::Err3);
+        $code = $this->compiler->compileTag('private_php',
+                                            array(array('code' => $this->yystack[$this->yyidx + 0]->minor),
+                                                  array('type' => $this->lex->phpType)), array());
+        if ($this->compiler->has_code && !empty($code)) {
+            $tmp = '';
+            foreach ($this->compiler->prefix_code as $code) {
+                $tmp .= $code;
             }
-            $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('<?php ', true));
-        } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
+            $this->compiler->prefix_code = array();
+            $this->_retvalue =
+                new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp . $code, true));
+        } else {
             $this->_retvalue = null;
         }
     }
-    #line 2211 "smarty_internal_templateparser.php"
-    #line 168 "smarty_internal_templateparser.y"
+
+    #line 282 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r7()
+    {
+        $this->compiler->tag_nocache = true;
+        $save = $this->template->compiled->has_nocache_code;
+        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this,
+                                                             $this->compiler->processNocacheCode("<?php echo '{$this->yystack[$this->yyidx + 0]->minor}';?>\n",
+                                                                                                 $this->compiler,
+                                                                                                 true));
+        $this->template->compiled->has_nocache_code = $save;
+    }
+
+    #line 289 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r8()
     {
-        if ($this->is_xml) {
-            $this->compiler->tag_nocache = true;
-            $this->is_xml = false;
-            $save = $this->template->has_nocache_code;
-            $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode("<?php echo '?>';?>\n", $this->compiler, true));
-            $this->template->has_nocache_code = $save;
-        } elseif ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-        } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-            $this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES));
-        } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-            $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('?>', true));
-        } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-            $this->_retvalue = null;
-        }
+        $this->_retvalue = $this->compiler->processText($this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2230 "smarty_internal_templateparser.php"
-    #line 186 "smarty_internal_templateparser.y"
+
+    #line 293 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r9()
     {
-        if (!$this->lex->is_phpScript) {
-            $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-        } else {
-            $this->lex->is_phpScript = false;
-            if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-                $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-            } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-                $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-            } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-                $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('?>', true));
-            } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-                $this->_retvalue = null;
-            }
-        }
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2248 "smarty_internal_templateparser.php"
-    #line 204 "smarty_internal_templateparser.y"
+
+    #line 297 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r10()
     {
-        if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-        } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-            $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-        } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-            if ($this->asp_tags) {
-                if (!($this->smarty instanceof SmartyBC)) {
-                    $this->compiler->trigger_template_error(self::Err3);
-                }
-                $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('<%', true));
-            } else {
-                $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-            }
-        } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-            if ($this->asp_tags) {
-                $this->_retvalue = null;
-            } else {
-                $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-            }
-        }
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2272 "smarty_internal_templateparser.php"
-    #line 228 "smarty_internal_templateparser.y"
+
+    #line 302 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r11()
     {
-        if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            $this->_retvalue = new _smarty_text($this, st);
-        } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-            $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES));
-        } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-            if ($this->asp_tags) {
-                $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('%>', true));
-            } else {
-                $this->_retvalue = new _smarty_text($this, st);
-            }
-        } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-            if ($this->asp_tags) {
-                $this->_retvalue = null;
-            } else {
-                $this->_retvalue = new _smarty_text($this, st);
-            }
-        }
+        $this->strip = true;
     }
-    #line 2293 "smarty_internal_templateparser.php"
-    #line 250 "smarty_internal_templateparser.y"
+
+    #line 306 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r12()
     {
-        $this->compiler->tag_nocache = true;
-        $this->is_xml = true;
-        $save = $this->template->has_nocache_code;
-        $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true));
-        $this->template->has_nocache_code = $save;
+        $this->strip = false;
     }
-    #line 2302 "smarty_internal_templateparser.php"
-    #line 259 "smarty_internal_templateparser.y"
+
+    #line 311 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r13()
     {
-        if ($this->strip) {
-            $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor));
-        } else {
-            $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-        }
+        $this->_retvalue = '';
     }
-    #line 2311 "smarty_internal_templateparser.php"
-    #line 268 "smarty_internal_templateparser.y"
+
+    #line 315 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r14()
     {
-        $this->strip = true;
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
-    #line 2316 "smarty_internal_templateparser.php"
-    #line 272 "smarty_internal_templateparser.y"
+
+    #line 319 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r15()
     {
-        $this->strip = false;
-    }
-    #line 2321 "smarty_internal_templateparser.php"
-    #line 276 "smarty_internal_templateparser.y"
-    function yy_r16()
-    {
-        if ($this->strip) {
-            SMARTY_INTERNAL_COMPILE_BLOCK::blockSource($this->compiler, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor));
-        } else {
-            SMARTY_INTERNAL_COMPILE_BLOCK::blockSource($this->compiler, $this->yystack[$this->yyidx + 0]->minor);
-        }
-    }
-    #line 2330 "smarty_internal_templateparser.php"
-    #line 285 "smarty_internal_templateparser.y"
-    function yy_r17()
-    {
-        $this->_retvalue = '';
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2335 "smarty_internal_templateparser.php"
-    #line 289 "smarty_internal_templateparser.y"
-    function yy_r18()
+
+    #line 335 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r19()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
-    #line 2340 "smarty_internal_templateparser.php"
-    #line 293 "smarty_internal_templateparser.y"
-    function yy_r19()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
+
+    #line 341 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r20()
+    {
+        $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length),
+                    ' $');
+        if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array('nocache'),
+                                                           array('value' => $this->compiler->compileVariable('\'' .
+                                                                                                             $match[1] .
+                                                                                                             '\'')));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(),
+                                                           array('value' => $this->compiler->compileVariable('\'' .
+                                                                                                             $var .
+                                                                                                             '\'')));
+        }
     }
-    #line 2345 "smarty_internal_templateparser.php"
-    #line 301 "smarty_internal_templateparser.y"
+
+    #line 351 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r21()
     {
-        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    }
-    #line 2350 "smarty_internal_templateparser.php"
-    #line 314 "smarty_internal_templateparser.y"
-    function yy_r23()
-    {
-        $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $this->yystack[$this->yyidx + 0]->minor));
-    }
-    #line 2355 "smarty_internal_templateparser.php"
-    #line 318 "smarty_internal_templateparser.y"
-    function yy_r24()
-    {
-        $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
+        $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(),
+                                                       array('value' => $this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2360 "smarty_internal_templateparser.php"
-    #line 322 "smarty_internal_templateparser.y"
-    function yy_r25()
+
+    #line 355 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r22()
     {
-        $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 1]->minor));
+        $this->_retvalue =
+            $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor,
+                                        array('value'        => $this->yystack[$this->yyidx + - 2]->minor,
+                                              'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
     }
-    #line 2365 "smarty_internal_templateparser.php"
-    #line 326 "smarty_internal_templateparser.y"
-    function yy_r26()
+
+    #line 359 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r23()
     {
-        $this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + - 2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
+        $this->_retvalue =
+            $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor,
+                                        array('value' => $this->yystack[$this->yyidx + - 1]->minor));
     }
-    #line 2370 "smarty_internal_templateparser.php"
-    #line 339 "smarty_internal_templateparser.y"
-    function yy_r28()
+
+    #line 373 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r27()
     {
-        $this->_retvalue = $this->compiler->compileTag('assign', array(array('value' => $this->yystack[$this->yyidx + 0]->minor), array('var' => "'" . $this->yystack[$this->yyidx + - 2]->minor . "'")));
+        $this->_retvalue =
+            $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor,
+                                        array('value'        => $this->yystack[$this->yyidx + - 2]->minor,
+                                              'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
     }
-    #line 2375 "smarty_internal_templateparser.php"
-    #line 347 "smarty_internal_templateparser.y"
-    function yy_r30()
+
+    #line 386 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r29()
     {
-        $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor), array('var' => "'" . $this->yystack[$this->yyidx + - 3]->minor . "'")), $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $this->compiler->compileTag('assign',
+                                                       array(array('value' => $this->yystack[$this->yyidx + 0]->minor),
+                                                             array('var' => '\'' .
+                                                                 substr($this->yystack[$this->yyidx + - 2]->minor, 1) .
+                                                                 '\'')));
     }
-    #line 2380 "smarty_internal_templateparser.php"
-    #line 351 "smarty_internal_templateparser.y"
+
+    #line 394 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r31()
     {
-        $this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + - 1]->minor), array('var' => $this->yystack[$this->yyidx + - 3]->minor['var'])), $this->yystack[$this->yyidx + 0]->minor), array('smarty_internal_index' => $this->yystack[$this->yyidx + - 3]->minor['smarty_internal_index']));
+        $this->_retvalue = $this->compiler->compileTag('assign',
+                                                       array_merge(array(array('value' => $this->yystack[$this->yyidx +
+                                                       - 1]->minor), array('var' => '\'' .
+                                                           substr($this->yystack[$this->yyidx + - 3]->minor, 1) .
+                                                           '\'')), $this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2385 "smarty_internal_templateparser.php"
-    #line 356 "smarty_internal_templateparser.y"
+
+    #line 398 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r32()
     {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = $this->compiler->compileTag('assign',
+                                                       array_merge(array(array('value' => $this->yystack[$this->yyidx +
+                                                       - 1]->minor), array('var' => $this->yystack[$this->yyidx +
+                                                       - 3]->minor['var'])), $this->yystack[$this->yyidx + 0]->minor),
+                                                       array('smarty_internal_index' => $this->yystack[$this->yyidx +
+                                                       - 3]->minor['smarty_internal_index']));
     }
-    #line 2390 "smarty_internal_templateparser.php"
-    #line 360 "smarty_internal_templateparser.y"
+
+    #line 403 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r33()
     {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor, array());
+        $tag =
+            trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length));
+        if ($tag == 'strip') {
+            $this->strip = true;
+            $this->_retvalue = null;;
+        } else {
+            if (defined($tag)) {
+                if ($this->security) {
+                    $this->security->isTrustedConstant($tag, $this->compiler);
+                }
+                $this->_retvalue =
+                    $this->compiler->compileTag('private_print_expression', array(), array('value' => $tag));
+            } else {
+                if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                    $this->_retvalue = $this->compiler->compileTag($match[1], array("'nocache'"));
+                } else {
+                    $this->_retvalue = $this->compiler->compileTag($tag, array());
+                }
+            }
+        }
     }
-    #line 2395 "smarty_internal_templateparser.php"
-    #line 365 "smarty_internal_templateparser.y"
+
+    #line 425 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r34()
     {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 1]->minor));
+        if (defined($this->yystack[$this->yyidx + - 1]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + - 1]->minor, $this->compiler);
+            }
+            $this->_retvalue =
+                $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor,
+                                            array('value' => $this->yystack[$this->yyidx + - 1]->minor));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor,
+                                                           $this->yystack[$this->yyidx + 0]->minor);
+        }
     }
-    #line 2400 "smarty_internal_templateparser.php"
-    #line 370 "smarty_internal_templateparser.y"
+
+    #line 435 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r35()
     {
-        $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor, $this->yystack[$this->yyidx + 0]->minor) . '<?php echo ';
-        $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . '?>';
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression', array(),
+                                                           array('value' => $this->yystack[$this->yyidx + 0]->minor));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor, array());
+        }
     }
-    #line 2406 "smarty_internal_templateparser.php"
-    #line 376 "smarty_internal_templateparser.y"
+
+    #line 448 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r36()
     {
-        $this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + - 4]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + - 2]->minor)) . '<?php echo ';
-        $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + - 1]->minor, 'value' => 'ob_get_clean()')) . '?>';
+        if (defined($this->yystack[$this->yyidx + - 2]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + - 2]->minor, $this->compiler);
+            }
+            $this->_retvalue =
+                $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor,
+                                            array('value'        => $this->yystack[$this->yyidx + - 2]->minor,
+                                                  'modifierlist' => $this->yystack[$this->yyidx + - 1]->minor));
+        } else {
+            $this->_retvalue = '<?php ob_start();?>' .
+                $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor,
+                                            $this->yystack[$this->yyidx + 0]->minor) . '<?php echo ';
+            $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(),
+                                                            array('modifierlist' => $this->yystack[$this->yyidx +
+                                                            - 1]->minor, 'value' => 'ob_get_clean()')) . ';?>';
+        }
     }
-    #line 2412 "smarty_internal_templateparser.php"
-    #line 382 "smarty_internal_templateparser.y"
+
+    #line 461 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r37()
     {
-        $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length));
-        $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor,
+                                                       $this->yystack[$this->yyidx + 0]->minor,
+                                                       array('object_method' => $this->yystack[$this->yyidx +
+                                                       - 1]->minor));
     }
-    #line 2418 "smarty_internal_templateparser.php"
-    #line 387 "smarty_internal_templateparser.y"
+
+    #line 466 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r38()
     {
-        $tag = trim(substr($this->yystack[$this->yyidx + - 2]->minor, $this->lex->ldel_length));
-        $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, $this->yystack[$this->yyidx + 0]->minor, array('if condition' => $this->yystack[$this->yyidx + - 1]->minor));
+        $this->_retvalue = '<?php ob_start();?>' .
+            $this->compiler->compileTag($this->yystack[$this->yyidx + - 4]->minor,
+                                        $this->yystack[$this->yyidx + 0]->minor,
+                                        array('object_method' => $this->yystack[$this->yyidx + - 2]->minor)) .
+            '<?php echo ';
+        $this->_retvalue .= $this->compiler->compileTag('private_modifier', array(),
+                                                        array('modifierlist' => $this->yystack[$this->yyidx +
+                                                        - 1]->minor, 'value' => 'ob_get_clean()')) . ';?>';
     }
-    #line 2424 "smarty_internal_templateparser.php"
-    #line 392 "smarty_internal_templateparser.y"
+
+    #line 472 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r39()
     {
         $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length));
-        $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(),
+                                                       array('if condition' => $this->yystack[$this->yyidx +
+                                                       0]->minor));
     }
-    #line 2430 "smarty_internal_templateparser.php"
-    #line 403 "smarty_internal_templateparser.y"
-    function yy_r41()
+
+    #line 477 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r40()
     {
-        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 9]->minor), array('ifexp' => $this->yystack[$this->yyidx + - 6]->minor), array('var' => $this->yystack[$this->yyidx + - 2]->minor), array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 1);
+        $tag = trim(substr($this->yystack[$this->yyidx + - 2]->minor, $this->lex->ldel_length));
+        $this->_retvalue =
+            $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, $this->yystack[$this->yyidx + 0]->minor,
+                                        array('if condition' => $this->yystack[$this->yyidx + - 1]->minor));
     }
-    #line 2435 "smarty_internal_templateparser.php"
-    #line 407 "smarty_internal_templateparser.y"
-    function yy_r42()
+
+    #line 482 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r41()
     {
-        $this->_retvalue = '=' . $this->yystack[$this->yyidx + 0]->minor;
+        $tag = trim(substr($this->yystack[$this->yyidx + - 1]->minor, $this->lex->ldel_length));
+        $this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(),
+                                                       array('if condition' => $this->yystack[$this->yyidx +
+                                                       0]->minor));
     }
-    #line 2440 "smarty_internal_templateparser.php"
-    #line 415 "smarty_internal_templateparser.y"
-    function yy_r44()
-    {
-        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 3]->minor), array('to' => $this->yystack[$this->yyidx + - 1]->minor))), 0);
+
+    #line 493 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r43()
+    {
+        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor,
+                                                                          array(array('start' => $this->yystack[$this->yyidx +
+                                                                          - 6]->minor),
+                                                                                array('ifexp' => $this->yystack[$this->yyidx +
+                                                                                - 4]->minor),
+                                                                                array('var' => $this->yystack[$this->yyidx +
+                                                                                - 2]->minor),
+                                                                                array('step' => $this->yystack[$this->yyidx +
+                                                                                - 1]->minor))), 1);
     }
-    #line 2445 "smarty_internal_templateparser.php"
-    #line 419 "smarty_internal_templateparser.y"
-    function yy_r45()
+
+    #line 497 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r44()
     {
-        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + - 5]->minor), array('to' => $this->yystack[$this->yyidx + - 3]->minor), array('step' => $this->yystack[$this->yyidx + - 1]->minor))), 0);
+        $this->_retvalue = '=' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2450 "smarty_internal_templateparser.php"
-    #line 424 "smarty_internal_templateparser.y"
+
+    #line 505 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r46()
     {
-        $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor,
+                                                                          array(array('start' => $this->yystack[$this->yyidx +
+                                                                          - 3]->minor),
+                                                                                array('to' => $this->yystack[$this->yyidx +
+                                                                                - 1]->minor))), 0);
     }
-    #line 2455 "smarty_internal_templateparser.php"
-    #line 429 "smarty_internal_templateparser.y"
+
+    #line 509 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r47()
     {
-        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 4]->minor), array('item' => $this->yystack[$this->yyidx + - 1]->minor))));
+        $this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor,
+                                                                          array(array('start' => $this->yystack[$this->yyidx +
+                                                                          - 5]->minor),
+                                                                                array('to' => $this->yystack[$this->yyidx +
+                                                                                - 3]->minor),
+                                                                                array('step' => $this->yystack[$this->yyidx +
+                                                                                - 1]->minor))), 0);
     }
-    #line 2460 "smarty_internal_templateparser.php"
-    #line 433 "smarty_internal_templateparser.y"
+
+    #line 514 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r48()
     {
-        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + - 7]->minor), array('item' => $this->yystack[$this->yyidx + - 1]->minor), array('key' => $this->yystack[$this->yyidx + - 4]->minor))));
+        $this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2465 "smarty_internal_templateparser.php"
-    #line 446 "smarty_internal_templateparser.y"
-    function yy_r51()
+
+    #line 519 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r49()
     {
-        $this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array(array_merge(array($this->yystack[$this->yyidx + - 1]->minor), $this->yystack[$this->yyidx + 0]->minor))));
+        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor,
+                                                                              array(array('from' => $this->yystack[$this->yyidx +
+                                                                              - 3]->minor),
+                                                                                    array('item' => $this->yystack[$this->yyidx +
+                                                                                    - 1]->minor))));
     }
-    #line 2470 "smarty_internal_templateparser.php"
-    #line 450 "smarty_internal_templateparser.y"
-    function yy_r52()
+
+    #line 523 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r50()
     {
-        $this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array_merge(array(array_merge(array($this->yystack[$this->yyidx + - 2]->minor), $this->yystack[$this->yyidx + - 1]->minor)), $this->yystack[$this->yyidx + 0]->minor)));
+        $this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor,
+                                                                              array(array('from' => $this->yystack[$this->yyidx +
+                                                                              - 5]->minor),
+                                                                                    array('item' => $this->yystack[$this->yyidx +
+                                                                                    - 1]->minor),
+                                                                                    array('key' => $this->yystack[$this->yyidx +
+                                                                                    - 3]->minor))));
     }
-    #line 2475 "smarty_internal_templateparser.php"
-    #line 455 "smarty_internal_templateparser.y"
+
+    #line 536 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r53()
     {
+        $this->_retvalue = $this->compiler->compileTag('setfilter', array(),
+                                                       array('modifier_list' => array(array_merge(array($this->yystack[$this->yyidx +
+                                                       - 1]->minor), $this->yystack[$this->yyidx + 0]->minor))));
+    }
+
+    #line 540 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r54()
+    {
+        $this->_retvalue = $this->compiler->compileTag('setfilter', array(),
+                                                       array('modifier_list' => array_merge(array(array_merge(array($this->yystack[$this->yyidx +
+                                                       - 2]->minor), $this->yystack[$this->yyidx + - 1]->minor)),
+                                                                                            $this->yystack[$this->yyidx +
+                                                                                            0]->minor)));
+    }
+
+    #line 545 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r55()
+    {
         $j = strrpos($this->yystack[$this->yyidx + 0]->minor, '.');
         if ($this->yystack[$this->yyidx + 0]->minor[$j + 1] == 'c') {
             // {$smarty.block.child}
@@ -3698,463 +1868,594 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileParentBlock($this->compiler);
         }
     }
-    #line 2487 "smarty_internal_templateparser.php"
-    #line 468 "smarty_internal_templateparser.y"
-    function yy_r54()
+
+    #line 558 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r56()
+    {
+        $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length),
+                    ' /');
+        if ($tag == 'strip') {
+            $this->strip = false;
+            $this->_retvalue = null;
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($tag . 'close', array());
+        }
+    }
+
+    #line 567 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r57()
     {
         $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor . 'close', array());
     }
-    #line 2492 "smarty_internal_templateparser.php"
-    #line 472 "smarty_internal_templateparser.y"
-    function yy_r55()
+
+    #line 571 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r58()
     {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor . 'close', array(), array('modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 1]->minor . 'close', array(),
+                                                       array('modifier_list' => $this->yystack[$this->yyidx +
+                                                       0]->minor));
     }
-    #line 2497 "smarty_internal_templateparser.php"
-    #line 477 "smarty_internal_templateparser.y"
-    function yy_r56()
+
+    #line 576 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r59()
     {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 2]->minor . 'close', array(),
+                                                       array('object_method' => $this->yystack[$this->yyidx +
+                                                       0]->minor));
     }
-    #line 2502 "smarty_internal_templateparser.php"
-    #line 481 "smarty_internal_templateparser.y"
-    function yy_r57()
+
+    #line 580 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r60()
     {
-        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + - 1]->minor, 'modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + - 3]->minor . 'close', array(),
+                                                       array('object_method'        => $this->yystack[$this->yyidx +
+                                                       - 1]->minor, 'modifier_list' => $this->yystack[$this->yyidx +
+                                                       0]->minor));
     }
-    #line 2507 "smarty_internal_templateparser.php"
-    #line 489 "smarty_internal_templateparser.y"
-    function yy_r58()
+
+    #line 588 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r61()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
         $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2513 "smarty_internal_templateparser.php"
-    #line 495 "smarty_internal_templateparser.y"
-    function yy_r59()
+
+    #line 594 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r62()
     {
         $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2518 "smarty_internal_templateparser.php"
-    #line 500 "smarty_internal_templateparser.y"
-    function yy_r60()
+
+    #line 599 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r63()
     {
         $this->_retvalue = array();
     }
-    #line 2523 "smarty_internal_templateparser.php"
-    #line 505 "smarty_internal_templateparser.y"
-    function yy_r61()
+
+    #line 604 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r64()
     {
-        if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-            $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => 'true');
-        } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-            $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => 'false');
-        } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-            $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => 'null');
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            }
+            $this->_retvalue =
+                array($this->yystack[$this->yyidx + - 2]->minor => $this->yystack[$this->yyidx + 0]->minor);
         } else {
-            $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => "'" . $this->yystack[$this->yyidx + 0]->minor . "'");
+            $this->_retvalue =
+                array($this->yystack[$this->yyidx + - 2]->minor => '\'' . $this->yystack[$this->yyidx + 0]->minor .
+                    '\'');
         }
     }
-    #line 2536 "smarty_internal_templateparser.php"
-    #line 517 "smarty_internal_templateparser.y"
-    function yy_r62()
+
+    #line 615 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r65()
     {
-        $this->_retvalue = array(trim($this->yystack[$this->yyidx + - 1]->minor, " =\n\r\t") => $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue =
+            array(trim($this->yystack[$this->yyidx + - 1]->minor, " =\n\r\t") => $this->yystack[$this->yyidx +
+            0]->minor);
     }
-    #line 2541 "smarty_internal_templateparser.php"
-    #line 525 "smarty_internal_templateparser.y"
-    function yy_r64()
+
+    #line 623 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r67()
     {
-        $this->_retvalue = "'" . $this->yystack[$this->yyidx + 0]->minor . "'";
+        $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
     }
-    #line 2546 "smarty_internal_templateparser.php"
-    #line 537 "smarty_internal_templateparser.y"
-    function yy_r67()
+
+    #line 635 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r70()
     {
         $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor => $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2551 "smarty_internal_templateparser.php"
-    #line 550 "smarty_internal_templateparser.y"
-    function yy_r69()
+
+    #line 648 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r72()
     {
         $this->yystack[$this->yyidx + - 2]->minor[] = $this->yystack[$this->yyidx + 0]->minor;
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor;
     }
-    #line 2557 "smarty_internal_templateparser.php"
-    #line 555 "smarty_internal_templateparser.y"
-    function yy_r70()
+
+    #line 653 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r73()
     {
-        $this->_retvalue = array('var' => $this->yystack[$this->yyidx + - 2]->minor, 'value' => $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = array('var'   => '\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '\'',
+                                 'value' => $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2562 "smarty_internal_templateparser.php"
-    #line 583 "smarty_internal_templateparser.y"
+
+    #line 660 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r75()
     {
-        $this->_retvalue = '$_smarty_tpl->getStreamVariable(\'' . $this->yystack[$this->yyidx + - 2]->minor . '://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
+        $this->_retvalue = array('var'   => $this->yystack[$this->yyidx + - 2]->minor,
+                                 'value' => $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2567 "smarty_internal_templateparser.php"
-    #line 588 "smarty_internal_templateparser.y"
-    function yy_r76()
+
+    #line 684 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r79()
     {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . trim($this->yystack[$this->yyidx + - 1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
+        $this->_retvalue =
+            '$_smarty_tpl->getStreamVariable(\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '://' .
+            $this->yystack[$this->yyidx + 0]->minor . '\')';
     }
-    #line 2572 "smarty_internal_templateparser.php"
-    #line 607 "smarty_internal_templateparser.y"
+
+    #line 689 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r80()
     {
-        $this->_retvalue = $this->compiler->compileTag('private_modifier', array(), array('value' => $this->yystack[$this->yyidx + - 1]->minor, 'modifierlist' => $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . trim($this->yystack[$this->yyidx + - 1]->minor) .
+            $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2577 "smarty_internal_templateparser.php"
-    #line 613 "smarty_internal_templateparser.y"
-    function yy_r81()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
-    }
-    #line 2582 "smarty_internal_templateparser.php"
-    #line 617 "smarty_internal_templateparser.y"
-    function yy_r82()
+
+    #line 703 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r83()
     {
-        $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor . ')';
+        $this->_retvalue = $this->compiler->compileTag('private_modifier', array(),
+                                                       array('value' => $this->yystack[$this->yyidx + - 1]->minor,
+                                                             'modifierlist' => $this->yystack[$this->yyidx +
+                                                             0]->minor));
     }
-    #line 2587 "smarty_internal_templateparser.php"
-    #line 621 "smarty_internal_templateparser.y"
-    function yy_r83()
+
+    #line 709 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r84()
     {
-        $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',(array)' . $this->yystack[$this->yyidx + 0]->minor . ')';
+        $this->_retvalue = (isset($this->yystack[$this->yyidx + - 1]->minor['pre']) ?
+                $this->yystack[$this->yyidx + - 1]->minor['pre'] : '') . $this->yystack[$this->yyidx + - 2]->minor .
+            $this->yystack[$this->yyidx + - 1]->minor['op'] . $this->yystack[$this->yyidx + 0]->minor .
+            (isset($this->yystack[$this->yyidx + - 1]->minor['pre']) ? ')' : '');
     }
-    #line 2592 "smarty_internal_templateparser.php"
-    #line 629 "smarty_internal_templateparser.y"
+
+    #line 712 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r85()
     {
-        $this->_retvalue = '!(' . $this->yystack[$this->yyidx + - 2]->minor . ' % ' . $this->yystack[$this->yyidx + 0]->minor . ')';
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
-    #line 2597 "smarty_internal_templateparser.php"
-    #line 633 "smarty_internal_templateparser.y"
+
+    #line 716 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r86()
     {
-        $this->_retvalue = '(' . $this->yystack[$this->yyidx + - 2]->minor . ' % ' . $this->yystack[$this->yyidx + 0]->minor . ')';
+        $this->_retvalue =
+            'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor .
+            ')';
     }
-    #line 2602 "smarty_internal_templateparser.php"
-    #line 637 "smarty_internal_templateparser.y"
+
+    #line 720 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r87()
     {
-        $this->_retvalue = '!(1 & ' . $this->yystack[$this->yyidx + - 1]->minor . ')';
+        $this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + - 2]->minor . ',(array)' .
+            $this->yystack[$this->yyidx + 0]->minor . ')';
     }
-    #line 2607 "smarty_internal_templateparser.php"
-    #line 641 "smarty_internal_templateparser.y"
+
+    #line 724 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r88()
     {
-        $this->_retvalue = '(1 & ' . $this->yystack[$this->yyidx + - 1]->minor . ')';
-    }
-    #line 2612 "smarty_internal_templateparser.php"
-    #line 645 "smarty_internal_templateparser.y"
-    function yy_r89()
-    {
-        $this->_retvalue = '!(1 & ' . $this->yystack[$this->yyidx + - 2]->minor . ' / ' . $this->yystack[$this->yyidx + 0]->minor . ')';
+        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor .
+            $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2617 "smarty_internal_templateparser.php"
-    #line 649 "smarty_internal_templateparser.y"
+
+    #line 736 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r90()
     {
-        $this->_retvalue = '(1 & ' . $this->yystack[$this->yyidx + - 2]->minor . ' / ' . $this->yystack[$this->yyidx + 0]->minor . ')';
+        $this->_retvalue = $this->yystack[$this->yyidx + - 5]->minor . ' ? ' .
+            $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 2]->minor, 1) . '\'') .
+            ' : ' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2622 "smarty_internal_templateparser.php"
-    #line 673 "smarty_internal_templateparser.y"
-    function yy_r96()
-    {
-        self::$prefix_number ++;
-        $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->yystack[$this->yyidx + 0]->minor . ';?>';
-        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . '$_tmp' . self::$prefix_number;
-    }
-    #line 2629 "smarty_internal_templateparser.php"
-    #line 682 "smarty_internal_templateparser.y"
-    function yy_r97()
-    {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 6]->minor . ' ? ' . $this->compileVariable("'" . $this->yystack[$this->yyidx + - 2]->minor . "'") . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
-    }
-    #line 2634 "smarty_internal_templateparser.php"
-    #line 686 "smarty_internal_templateparser.y"
-    function yy_r98()
+
+    #line 740 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r91()
     {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 5]->minor . ' ? ' . $this->yystack[$this->yyidx + - 2]->minor . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
+        $this->_retvalue =
+            $this->yystack[$this->yyidx + - 5]->minor . ' ? ' . $this->yystack[$this->yyidx + - 2]->minor . ' : ' .
+            $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2639 "smarty_internal_templateparser.php"
-    #line 701 "smarty_internal_templateparser.y"
-    function yy_r101()
+
+    #line 755 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r94()
     {
         $this->_retvalue = '!' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2644 "smarty_internal_templateparser.php"
-    #line 722 "smarty_internal_templateparser.y"
-    function yy_r106()
+
+    #line 776 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r99()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2649 "smarty_internal_templateparser.php"
-    #line 726 "smarty_internal_templateparser.y"
-    function yy_r107()
+
+    #line 780 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r100()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.';
     }
-    #line 2654 "smarty_internal_templateparser.php"
-    #line 730 "smarty_internal_templateparser.y"
-    function yy_r108()
+
+    #line 784 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r101()
     {
         $this->_retvalue = '.' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2659 "smarty_internal_templateparser.php"
-    #line 735 "smarty_internal_templateparser.y"
-    function yy_r109()
+
+    #line 789 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r102()
     {
-        if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-            $this->_retvalue = 'true';
-        } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-            $this->_retvalue = 'false';
-        } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-            $this->_retvalue = 'null';
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
         } else {
-            $this->_retvalue = "'" . $this->yystack[$this->yyidx + 0]->minor . "'";
+            $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
         }
     }
-    #line 2672 "smarty_internal_templateparser.php"
-    #line 753 "smarty_internal_templateparser.y"
-    function yy_r111()
+
+    #line 806 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r104()
     {
         $this->_retvalue = "(" . $this->yystack[$this->yyidx + - 1]->minor . ")";
     }
-    #line 2677 "smarty_internal_templateparser.php"
-    #line 768 "smarty_internal_templateparser.y"
-    function yy_r114()
+
+    #line 821 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r107()
     {
-        if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + - 2]->minor, $this->compiler)) {
+        self::$prefix_number ++;
+        if ($this->yystack[$this->yyidx + - 2]->minor['var'] == '\'smarty\'') {
+            $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . ' = ' .
+                $this->compiler->compileTag('private_special_variable', array(),
+                                            $this->yystack[$this->yyidx + - 2]->minor['smarty_internal_index']) . ';?>';
+        } else {
+            $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . ' = ' .
+                $this->compiler->compileVariable($this->yystack[$this->yyidx + - 2]->minor['var']) .
+                $this->yystack[$this->yyidx + - 2]->minor['smarty_internal_index'] . ';?>';
+        }
+        $this->_retvalue = '$_tmp' . self::$prefix_number . '::' . $this->yystack[$this->yyidx + 0]->minor[0] .
+            $this->yystack[$this->yyidx + 0]->minor[1];
+    }
+
+    #line 832 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r108()
+    {
+        self::$prefix_number ++;
+        $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[$this->yyidx + 0]->minor);
+        $this->compiler->prefix_code[] =
+            $this->compiler->appendCode($tmp, '<?php $_tmp' . self::$prefix_number . '=ob_get_clean();?>');
+        $this->_retvalue = '$_tmp' . self::$prefix_number;
+    }
+
+    #line 849 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r111()
+    {
+        if (!in_array(strtolower($this->yystack[$this->yyidx + - 2]->minor), array('self', 'parent')) &&
+            (!$this->security || $this->security->isTrustedStaticClassAccess($this->yystack[$this->yyidx + - 2]->minor,
+                                                                             $this->yystack[$this->yyidx + 0]->minor,
+                                                                             $this->compiler))
+        ) {
             if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor])) {
-                $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor] . '::' . $this->yystack[$this->yyidx + 0]->minor;
+                $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + - 2]->minor] . '::' .
+                    $this->yystack[$this->yyidx + 0]->minor[0] . $this->yystack[$this->yyidx + 0]->minor[1];
             } else {
-                $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '::' . $this->yystack[$this->yyidx + 0]->minor;
+                $this->_retvalue =
+                    $this->yystack[$this->yyidx + - 2]->minor . '::' . $this->yystack[$this->yyidx + 0]->minor[0] .
+                    $this->yystack[$this->yyidx + 0]->minor[1];
             }
         } else {
-            $this->compiler->trigger_template_error("static class '" . $this->yystack[$this->yyidx + - 2]->minor . "' is undefined or not allowed by security setting");
+            $this->compiler->trigger_template_error("static class '" . $this->yystack[$this->yyidx + - 2]->minor .
+                                                    "' is undefined or not allowed by security setting");
         }
     }
-    #line 2690 "smarty_internal_templateparser.php"
-    #line 780 "smarty_internal_templateparser.y"
-    function yy_r115()
+
+    #line 868 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r113()
     {
-        if ($this->yystack[$this->yyidx + - 2]->minor['var'] == '\'smarty\'') {
-            $this->_retvalue = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + - 2]->minor['smarty_internal_index']) . '::' . $this->yystack[$this->yyidx + 0]->minor;
-        } else {
-            $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + - 2]->minor['var']) . $this->yystack[$this->yyidx + - 2]->minor['smarty_internal_index'] . '::' . $this->yystack[$this->yyidx + 0]->minor;
-        }
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2699 "smarty_internal_templateparser.php"
-    #line 789 "smarty_internal_templateparser.y"
-    function yy_r116()
+
+    #line 879 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r114()
     {
-        self::$prefix_number ++;
-        $this->compiler->prefix_code[] = '<?php ob_start();?>' . $this->yystack[$this->yyidx + - 1]->minor . '<?php $_tmp' . self::$prefix_number . '=ob_get_clean();?>';
-        $this->_retvalue = '$_tmp' . self::$prefix_number;
+        $this->_retvalue =
+            $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'');
     }
-    #line 2706 "smarty_internal_templateparser.php"
-    #line 804 "smarty_internal_templateparser.y"
-    function yy_r118()
+
+    #line 882 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r115()
     {
         if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') {
-            $smarty_var = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
+            $smarty_var = $this->compiler->compileTag('private_special_variable', array(),
+                                                      $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
             $this->_retvalue = $smarty_var;
         } else {
-            // used for array reset,next,prev,end,current 
+            // used for array reset,next,prev,end,current
             $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
             $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-            $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']) . $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+            $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']) .
+                $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
         }
     }
-    #line 2719 "smarty_internal_templateparser.php"
-    #line 817 "smarty_internal_templateparser.y"
+
+    #line 895 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r116()
+    {
+        $this->_retvalue = '$_smarty_tpl->tpl_vars[' . $this->yystack[$this->yyidx + - 2]->minor . ']->' .
+            $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    #line 905 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r118()
+    {
+        $this->_retvalue =
+            $this->compiler->compileConfigVariable("'" . $this->yystack[$this->yyidx + - 1]->minor . "'");
+    }
+
+    #line 909 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r119()
     {
-        $this->_retvalue = '$_smarty_tpl->tpl_vars[' . $this->yystack[$this->yyidx + - 2]->minor . ']->' . $this->yystack[$this->yyidx + 0]->minor;
+        $this->_retvalue = '(is_array($tmp = ' .
+            $this->compiler->compileConfigVariable("'" . $this->yystack[$this->yyidx + - 2]->minor . "'") . ') ? $tmp' .
+            $this->yystack[$this->yyidx + 0]->minor . ' :null)';
+    }
+
+    #line 913 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r120()
+    {
+        $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + - 1]->minor);
     }
-    #line 2724 "smarty_internal_templateparser.php"
-    #line 827 "smarty_internal_templateparser.y"
+
+    #line 917 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r121()
     {
-        $this->_retvalue = '$_smarty_tpl->getConfigVariable(\'' . $this->yystack[$this->yyidx + - 1]->minor . '\')';
+        $this->_retvalue =
+            '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + - 2]->minor) .
+            ') ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' : null)';
     }
-    #line 2729 "smarty_internal_templateparser.php"
-    #line 831 "smarty_internal_templateparser.y"
+
+    #line 921 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r122()
     {
-        $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable(\'' . $this->yystack[$this->yyidx + - 2]->minor . '\')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' :null)';
+        $this->_retvalue = array('var' => '\'' . substr($this->yystack[$this->yyidx + - 1]->minor, 1) . '\'',
+                                 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2734 "smarty_internal_templateparser.php"
-    #line 835 "smarty_internal_templateparser.y"
+
+    #line 924 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r123()
     {
-        $this->_retvalue = '$_smarty_tpl->getConfigVariable(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
+        $this->_retvalue = array('var'                   => $this->yystack[$this->yyidx + - 1]->minor,
+                                 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2739 "smarty_internal_templateparser.php"
-    #line 839 "smarty_internal_templateparser.y"
-    function yy_r124()
+
+    #line 937 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r125()
     {
-        $this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable(' . $this->yystack[$this->yyidx + - 2]->minor . ')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' : null)';
+        return;
     }
-    #line 2744 "smarty_internal_templateparser.php"
-    #line 843 "smarty_internal_templateparser.y"
-    function yy_r125()
+
+    #line 943 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r126()
     {
-        $this->_retvalue = array('var' => $this->yystack[$this->yyidx + - 1]->minor, 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue =
+            '[' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'') .
+            ']';
     }
-    #line 2749 "smarty_internal_templateparser.php"
-    #line 856 "smarty_internal_templateparser.y"
+
+    #line 946 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r127()
     {
-        return;
+        $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor) . ']';
     }
-    #line 2754 "smarty_internal_templateparser.php"
-    #line 862 "smarty_internal_templateparser.y"
+
+    #line 950 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r128()
     {
-        $this->_retvalue = '[' . $this->compileVariable($this->yystack[$this->yyidx + 0]->minor) . ']';
+        $this->_retvalue = '[' . $this->compiler->compileVariable($this->yystack[$this->yyidx + - 2]->minor) . '->' .
+            $this->yystack[$this->yyidx + 0]->minor . ']';
     }
-    #line 2759 "smarty_internal_templateparser.php"
-    #line 866 "smarty_internal_templateparser.y"
+
+    #line 954 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r129()
     {
-        $this->_retvalue = '[' . $this->compileVariable($this->yystack[$this->yyidx + - 2]->minor) . '->' . $this->yystack[$this->yyidx + 0]->minor . ']';
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            }
+            $this->_retvalue = '[' . $this->yystack[$this->yyidx + 0]->minor . ']';
+        } else {
+            $this->_retvalue = "['" . $this->yystack[$this->yyidx + 0]->minor . "']";
+        }
     }
-    #line 2764 "smarty_internal_templateparser.php"
-    #line 870 "smarty_internal_templateparser.y"
+
+    #line 965 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r130()
     {
-        $this->_retvalue = "['" . $this->yystack[$this->yyidx + 0]->minor . "']";
+        $this->_retvalue = '[' . $this->yystack[$this->yyidx + 0]->minor . ']';
     }
-    #line 2769 "smarty_internal_templateparser.php"
-    #line 874 "smarty_internal_templateparser.y"
+
+    #line 970 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r131()
     {
-        $this->_retvalue = "[" . $this->yystack[$this->yyidx + 0]->minor . "]";
+        $this->_retvalue = '[' . $this->yystack[$this->yyidx + - 1]->minor . ']';
     }
-    #line 2774 "smarty_internal_templateparser.php"
-    #line 878 "smarty_internal_templateparser.y"
+
+    #line 975 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r132()
     {
-        $this->_retvalue = "[" . $this->yystack[$this->yyidx + - 1]->minor . "]";
+        $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' .
+                                                                                       $this->yystack[$this->yyidx +
+                                                                                       - 1]->minor . '\'][\'index\']') .
+            ']';
     }
-    #line 2779 "smarty_internal_templateparser.php"
-    #line 883 "smarty_internal_templateparser.y"
+
+    #line 979 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r133()
     {
-        $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + - 1]->minor . '\'][\'index\']') . ']';
+        $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' .
+                                                                                       $this->yystack[$this->yyidx +
+                                                                                       - 3]->minor . '\'][\'' .
+                                                                                       $this->yystack[$this->yyidx +
+                                                                                       - 1]->minor . '\']') . ']';
     }
-    #line 2784 "smarty_internal_templateparser.php"
-    #line 887 "smarty_internal_templateparser.y"
+
+    #line 982 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r134()
     {
-        $this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + - 3]->minor . '\'][\'' . $this->yystack[$this->yyidx + - 1]->minor . '\']') . ']';
+        $this->_retvalue = '[' . $this->yystack[$this->yyidx + - 1]->minor . ']';
     }
-    #line 2789 "smarty_internal_templateparser.php"
-    #line 897 "smarty_internal_templateparser.y"
+
+    #line 988 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r136()
     {
+        $this->_retvalue =
+            '[' . $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 1]->minor, 1) . '\'') .
+            ']';;
+    }
+
+    #line 1004 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r140()
+    {
         $this->_retvalue = '[]';
     }
-    #line 2794 "smarty_internal_templateparser.php"
-    #line 910 "smarty_internal_templateparser.y"
-    function yy_r138()
+
+    #line 1014 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r141()
+    {
+        $this->_retvalue = '\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\'';
+    }
+
+    #line 1018 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r142()
+    {
+        $this->_retvalue = "''";
+    }
+
+    #line 1023 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r143()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2799 "smarty_internal_templateparser.php"
-    #line 915 "smarty_internal_templateparser.y"
-    function yy_r139()
+
+    #line 1031 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r145()
     {
-        $this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
+        $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->lex->ldel_length, - $this->lex->rdel_length),
+                    ' $');
+        $this->_retvalue = $this->compiler->compileVariable('\'' . $var . '\'');
     }
-    #line 2804 "smarty_internal_templateparser.php"
-    #line 920 "smarty_internal_templateparser.y"
-    function yy_r140()
+
+    #line 1037 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r146()
     {
         $this->_retvalue = '(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
-    #line 2809 "smarty_internal_templateparser.php"
-    #line 927 "smarty_internal_templateparser.y"
-    function yy_r141()
+
+    #line 1044 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r147()
     {
         if ($this->yystack[$this->yyidx + - 1]->minor['var'] == '\'smarty\'') {
-            $this->_retvalue = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + - 1]->minor['smarty_internal_index']) . $this->yystack[$this->yyidx + 0]->minor;
+            $this->_retvalue = $this->compiler->compileTag('private_special_variable', array(),
+                                                           $this->yystack[$this->yyidx +
+                                                           - 1]->minor['smarty_internal_index']) .
+                $this->yystack[$this->yyidx + 0]->minor;
         } else {
-            $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + - 1]->minor['var']) . $this->yystack[$this->yyidx + - 1]->minor['smarty_internal_index'] . $this->yystack[$this->yyidx + 0]->minor;
+            $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + - 1]->minor['var']) .
+                $this->yystack[$this->yyidx + - 1]->minor['smarty_internal_index'] .
+                $this->yystack[$this->yyidx + 0]->minor;
         }
     }
-    #line 2818 "smarty_internal_templateparser.php"
-    #line 936 "smarty_internal_templateparser.y"
-    function yy_r142()
+
+    #line 1053 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r148()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2823 "smarty_internal_templateparser.php"
-    #line 941 "smarty_internal_templateparser.y"
-    function yy_r143()
+
+    #line 1058 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r149()
     {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2828 "smarty_internal_templateparser.php"
-    #line 946 "smarty_internal_templateparser.y"
-    function yy_r144()
+
+    #line 1063 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r150()
     {
         if ($this->security && substr($this->yystack[$this->yyidx + - 1]->minor, 0, 1) == '_') {
             $this->compiler->trigger_template_error(self::Err1);
         }
         $this->_retvalue = '->' . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2836 "smarty_internal_templateparser.php"
-    #line 953 "smarty_internal_templateparser.y"
-    function yy_r145()
+
+    #line 1070 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r151()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
         }
-        $this->_retvalue = '->{' . $this->compileVariable($this->yystack[$this->yyidx + - 1]->minor) . $this->yystack[$this->yyidx + 0]->minor . '}';
+        $this->_retvalue = '->{' . $this->compiler->compileVariable($this->yystack[$this->yyidx + - 1]->minor) .
+            $this->yystack[$this->yyidx + 0]->minor . '}';
     }
-    #line 2844 "smarty_internal_templateparser.php"
-    #line 960 "smarty_internal_templateparser.y"
-    function yy_r146()
+
+    #line 1077 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r152()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
         }
-        $this->_retvalue = '->{' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
+        $this->_retvalue =
+            '->{' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
     }
-    #line 2852 "smarty_internal_templateparser.php"
-    #line 967 "smarty_internal_templateparser.y"
-    function yy_r147()
+
+    #line 1084 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r153()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
         }
-        $this->_retvalue = '->{\'' . $this->yystack[$this->yyidx + - 4]->minor . '\'.' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
+        $this->_retvalue =
+            '->{\'' . $this->yystack[$this->yyidx + - 4]->minor . '\'.' . $this->yystack[$this->yyidx + - 2]->minor .
+            $this->yystack[$this->yyidx + 0]->minor . '}';
     }
-    #line 2860 "smarty_internal_templateparser.php"
-    #line 975 "smarty_internal_templateparser.y"
-    function yy_r148()
+
+    #line 1092 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r154()
     {
         $this->_retvalue = '->' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 2865 "smarty_internal_templateparser.php"
-    #line 983 "smarty_internal_templateparser.y"
-    function yy_r149()
+
+    #line 1100 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r155()
     {
-        if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + - 3]->minor, $this->compiler)) {
-            if (strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'array') === 0 || is_callable($this->yystack[$this->yyidx + - 3]->minor)) {
+        if (!$this->security ||
+            $this->security->isTrustedPhpFunction($this->yystack[$this->yyidx + - 3]->minor, $this->compiler)
+        ) {
+            if (strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'isset') === 0 ||
+                strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'empty') === 0 ||
+                strcasecmp($this->yystack[$this->yyidx + - 3]->minor, 'array') === 0 ||
+                is_callable($this->yystack[$this->yyidx + - 3]->minor)
+            ) {
                 $func_name = strtolower($this->yystack[$this->yyidx + - 3]->minor);
                 if ($func_name == 'isset') {
                     if (count($this->yystack[$this->yyidx + - 1]->minor) == 0) {
                         $this->compiler->trigger_template_error('Illegal number of paramer in "isset()"');
                     }
                     $par = implode(',', $this->yystack[$this->yyidx + - 1]->minor);
-                    if (strncasecmp($par, '$_smarty_tpl->getConfigVariable', strlen('$_smarty_tpl->getConfigVariable')) === 0) {
+                    if (strncasecmp($par, '$_smarty_tpl->smarty->ext->_config->_getConfigVariable',
+                                    strlen('$_smarty_tpl->smarty->ext->_config->_getConfigVariable')) === 0
+                    ) {
                         self::$prefix_number ++;
-                        $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . str_replace(')', ', false)', $par) . ';?>';
+                        $this->compiler->prefix_code[] =
+                            '<?php $_tmp' . self::$prefix_number . '=' . str_replace(')', ', false)', $par) . ';?>';
                         $isset_par = '$_tmp' . self::$prefix_number;
                     } else {
                         $isset_par = str_replace("')->value", "',null,true,false)->value", $par);
@@ -4165,256 +2466,253 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
                         $this->compiler->trigger_template_error('Illegal number of paramer in "empty()"');
                     }
                     if ($func_name == 'empty') {
-                        $this->_retvalue = $func_name . '(' . str_replace("')->value", "',null,true,false)->value", $this->yystack[$this->yyidx + - 1]->minor[0]) . ')';
+                        $this->_retvalue = $func_name . '(' . str_replace("')->value", "',null,true,false)->value",
+                                                                          $this->yystack[$this->yyidx +
+                                                                          - 1]->minor[0]) . ')';
                     } else {
                         $this->_retvalue = $func_name . '(' . $this->yystack[$this->yyidx + - 1]->minor[0] . ')';
                     }
                 } else {
-                    $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ")";
+                    $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" .
+                        implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ")";
                 }
             } else {
-                $this->compiler->trigger_template_error("unknown function \"" . $this->yystack[$this->yyidx + - 3]->minor . "\"");
+                $this->compiler->trigger_template_error("unknown function \"" .
+                                                        $this->yystack[$this->yyidx + - 3]->minor . "\"");
             }
         }
     }
-    #line 2901 "smarty_internal_templateparser.php"
-    #line 1021 "smarty_internal_templateparser.y"
-    function yy_r150()
+
+    #line 1139 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r156()
     {
         if ($this->security && substr($this->yystack[$this->yyidx + - 3]->minor, 0, 1) == '_') {
             $this->compiler->trigger_template_error(self::Err1);
         }
-        $this->_retvalue = $this->yystack[$this->yyidx + - 3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ")";
+        $this->_retvalue =
+            $this->yystack[$this->yyidx + - 3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + - 1]->minor) .
+            ")";
     }
-    #line 2909 "smarty_internal_templateparser.php"
-    #line 1028 "smarty_internal_templateparser.y"
-    function yy_r151()
+
+    #line 1146 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r157()
     {
         if ($this->security) {
             $this->compiler->trigger_template_error(self::Err2);
         }
         self::$prefix_number ++;
-        $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->compileVariable("'" . $this->yystack[$this->yyidx + - 3]->minor . "'") . ';?>';
-        $this->_retvalue = '$_tmp' . self::$prefix_number . '(' . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ')';
-    }
-    #line 2919 "smarty_internal_templateparser.php"
-    #line 1039 "smarty_internal_templateparser.y"
-    function yy_r152()
-    {
-        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array($this->yystack[$this->yyidx + 0]->minor));
+        $this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' .
+            $this->compiler->compileVariable('\'' . substr($this->yystack[$this->yyidx + - 3]->minor, 1) . '\'') .
+            ';?>';
+        $this->_retvalue =
+            '$_tmp' . self::$prefix_number . '(' . implode(',', $this->yystack[$this->yyidx + - 1]->minor) . ')';
     }
-    #line 2924 "smarty_internal_templateparser.php"
-    #line 1056 "smarty_internal_templateparser.y"
-    function yy_r155()
-    {
-        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor, array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor)));
-    }
-    #line 2929 "smarty_internal_templateparser.php"
-    #line 1060 "smarty_internal_templateparser.y"
-    function yy_r156()
-    {
-        $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor));
-    }
-    #line 2934 "smarty_internal_templateparser.php"
-    #line 1068 "smarty_internal_templateparser.y"
+
+    #line 1157 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r158()
     {
-        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue =
+            array_merge($this->yystack[$this->yyidx + - 2]->minor, array($this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2939 "smarty_internal_templateparser.php"
-    #line 1076 "smarty_internal_templateparser.y"
-    function yy_r159()
+
+    #line 1174 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r161()
     {
-        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 2]->minor,
+                                       array(array_merge($this->yystack[$this->yyidx + - 1]->minor,
+                                                         $this->yystack[$this->yyidx + 0]->minor)));
     }
-    #line 2944 "smarty_internal_templateparser.php"
-    #line 1110 "smarty_internal_templateparser.y"
-    function yy_r166()
+
+    #line 1178 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r162()
     {
-        $this->_retvalue = '$' . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
+        $this->_retvalue =
+            array(array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor));
     }
-    #line 2949 "smarty_internal_templateparser.php"
-    #line 1115 "smarty_internal_templateparser.y"
-    function yy_r167()
+
+    #line 1186 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r164()
     {
-        $this->_retvalue = '$' . $this->yystack[$this->yyidx + - 2]->minor . $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor;
+        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2954 "smarty_internal_templateparser.php"
-    #line 1121 "smarty_internal_templateparser.y"
-    function yy_r168()
+
+    #line 1194 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r165()
     {
-        $this->_retvalue = '==';
+        $this->_retvalue =
+            array_merge($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 2959 "smarty_internal_templateparser.php"
-    #line 1125 "smarty_internal_templateparser.y"
+
+    #line 1213 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r169()
     {
-        $this->_retvalue = '!=';
+        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
     }
-    #line 2964 "smarty_internal_templateparser.php"
-    #line 1129 "smarty_internal_templateparser.y"
+
+    #line 1218 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r170()
     {
-        $this->_retvalue = '>';
+        $this->_retvalue =
+            array($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method');
     }
-    #line 2969 "smarty_internal_templateparser.php"
-    #line 1133 "smarty_internal_templateparser.y"
+
+    #line 1223 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r171()
     {
-        $this->_retvalue = '<';
+        $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
     }
-    #line 2974 "smarty_internal_templateparser.php"
-    #line 1137 "smarty_internal_templateparser.y"
+
+    #line 1228 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r172()
     {
-        $this->_retvalue = '>=';
+        $this->_retvalue =
+            array($this->yystack[$this->yyidx + - 1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property');
     }
-    #line 2979 "smarty_internal_templateparser.php"
-    #line 1141 "smarty_internal_templateparser.y"
+
+    #line 1233 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r173()
     {
-        $this->_retvalue = '<=';
+        $this->_retvalue = array($this->yystack[$this->yyidx + - 2]->minor,
+                                 $this->yystack[$this->yyidx + - 1]->minor . $this->yystack[$this->yyidx + 0]->minor,
+                                 'property');
     }
-    #line 2984 "smarty_internal_templateparser.php"
-    #line 1145 "smarty_internal_templateparser.y"
+
+    #line 1239 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r174()
     {
-        $this->_retvalue = '===';
+        $this->_retvalue['op'] = ' ' . trim($this->yystack[$this->yyidx + 0]->minor) . ' ';
     }
-    #line 2989 "smarty_internal_templateparser.php"
-    #line 1149 "smarty_internal_templateparser.y"
+
+    #line 1243 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r175()
     {
-        $this->_retvalue = '!==';
+        static $lops = array('eq'          => array('op' => ' == ', 'pre' => null),
+                             'ne'          => array('op' => ' != ', 'pre' => null),
+                             'neq'         => array('op' => ' != ', 'pre' => null),
+                             'gt'          => array('op' => ' > ', 'pre' => null),
+                             'ge'          => array('op' => ' >= ', 'pre' => null),
+                             'gte'         => array('op' => ' >= ', 'pre' => null),
+                             'lt'          => array('op' => ' < ', 'pre' => null),
+                             'le'          => array('op' => ' <= ', 'pre' => null),
+                             'lte'         => array('op' => ' <= ', 'pre' => null),
+                             'mod'         => array('op' => ' % ', 'pre' => null),
+                             'and'         => array('op' => ' && ', 'pre' => null),
+                             'or'          => array('op' => ' || ', 'pre' => null),
+                             'xor'         => array('op' => ' xor ', 'pre' => null),
+                             'isdivby'     => array('op' => ' % ', 'pre' => '!('),
+                             'isnotdivby'  => array('op' => ' % ', 'pre' => '('),
+                             'isevenby'    => array('op' => ' / ', 'pre' => '!(1 & '),
+                             'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+                             'isoddby'     => array('op' => ' / ', 'pre' => '(1 & '),
+                             'isnotoddby'  => array('op' => ' / ', 'pre' => '!(1 & '),);
+        $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $lops[$op];
     }
-    #line 2994 "smarty_internal_templateparser.php"
-    #line 1153 "smarty_internal_templateparser.y"
+
+    #line 1269 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r176()
     {
-        $this->_retvalue = '%';
+        static $scond = array('iseven'   => '!(1 & ', 'isnoteven' => '(1 & ', 'isodd' => '(1 & ',
+                              'isnotodd' => '!(1 & ',);
+        $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
+        $this->_retvalue = $scond[$op];
     }
-    #line 2999 "smarty_internal_templateparser.php"
-    #line 1157 "smarty_internal_templateparser.y"
+
+    #line 1283 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r177()
     {
-        $this->_retvalue = '&&';
-    }
-    #line 3004 "smarty_internal_templateparser.php"
-    #line 1161 "smarty_internal_templateparser.y"
-    function yy_r178()
-    {
-        $this->_retvalue = '||';
+        $this->_retvalue = 'array(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
     }
-    #line 3009 "smarty_internal_templateparser.php"
-    #line 1165 "smarty_internal_templateparser.y"
+
+    #line 1291 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r179()
     {
-        $this->_retvalue = ' XOR ';
+        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 3014 "smarty_internal_templateparser.php"
-    #line 1172 "smarty_internal_templateparser.y"
-    function yy_r180()
+
+    #line 1299 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r181()
     {
-        $this->_retvalue = 'array(' . $this->yystack[$this->yyidx + - 1]->minor . ')';
+        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '=>' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 3019 "smarty_internal_templateparser.php"
-    #line 1180 "smarty_internal_templateparser.y"
+
+    #line 1303 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r182()
     {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor;
+        $this->_retvalue =
+            '\'' . $this->yystack[$this->yyidx + - 2]->minor . '\'=>' . $this->yystack[$this->yyidx + 0]->minor;
     }
-    #line 3024 "smarty_internal_templateparser.php"
-    #line 1188 "smarty_internal_templateparser.y"
-    function yy_r184()
+
+    #line 1319 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r185()
     {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 2]->minor . '=>' . $this->yystack[$this->yyidx + 0]->minor;
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor->to_smarty_php($this);
     }
-    #line 3029 "smarty_internal_templateparser.php"
-    #line 1192 "smarty_internal_templateparser.y"
-    function yy_r185()
+
+    #line 1324 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r186()
     {
-        $this->_retvalue = '\'' . $this->yystack[$this->yyidx + - 2]->minor . '\'=>' . $this->yystack[$this->yyidx + 0]->minor;
+        $this->yystack[$this->yyidx + - 1]->minor->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
-    #line 3034 "smarty_internal_templateparser.php"
-    #line 1204 "smarty_internal_templateparser.y"
+
+    #line 1329 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r187()
     {
-        $this->_retvalue = "''";
+        $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 3039 "smarty_internal_templateparser.php"
-    #line 1208 "smarty_internal_templateparser.y"
+
+    #line 1333 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r188()
     {
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor->to_smarty_php();
-    }
-    #line 3044 "smarty_internal_templateparser.php"
-    #line 1213 "smarty_internal_templateparser.y"
-    function yy_r189()
-    {
-        $this->yystack[$this->yyidx + - 1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor);
-        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
+        $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)' . $this->yystack[$this->yyidx + - 1]->minor);
     }
-    #line 3050 "smarty_internal_templateparser.php"
-    #line 1218 "smarty_internal_templateparser.y"
+
+    #line 1341 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r190()
     {
-        $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\'' .
+                                                              substr($this->yystack[$this->yyidx + 0]->minor, 1) .
+                                                              '\']->value');
     }
-    #line 3055 "smarty_internal_templateparser.php"
-    #line 1222 "smarty_internal_templateparser.y"
-    function yy_r191()
+
+    #line 1349 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r192()
     {
-        $this->_retvalue = new _smarty_code($this, '(string)' . $this->yystack[$this->yyidx + - 1]->minor);
+        $this->_retvalue =
+            new Smarty_Internal_ParseTree_Code('(string)(' . $this->yystack[$this->yyidx + - 1]->minor . ')');
     }
-    #line 3060 "smarty_internal_templateparser.php"
-    #line 1230 "smarty_internal_templateparser.y"
+
+    #line 1353 "../smarty/lexer/smarty_internal_templateparser.y"
     function yy_r193()
     {
-        $this->_retvalue = new _smarty_code($this, '(string)$_smarty_tpl->tpl_vars[\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\']->value');
-    }
-    #line 3065 "smarty_internal_templateparser.php"
-    #line 1238 "smarty_internal_templateparser.y"
-    function yy_r195()
-    {
-        $this->_retvalue = new _smarty_code($this, '(string)(' . $this->yystack[$this->yyidx + - 1]->minor . ')');
-    }
-    #line 3070 "smarty_internal_templateparser.php"
-    #line 1242 "smarty_internal_templateparser.y"
-    function yy_r196()
-    {
-        $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + - 1]->minor);
+        $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[$this->yyidx + 0]->minor);
     }
-    #line 3075 "smarty_internal_templateparser.php"
-    #line 1246 "smarty_internal_templateparser.y"
-    function yy_r197()
+
+    #line 1357 "../smarty/lexer/smarty_internal_templateparser.y"
+    function yy_r194()
     {
-        $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[$this->yyidx + 0]->minor);
     }
 
-    #line 3080 "smarty_internal_templateparser.php"
-
     private $_retvalue;
 
     public function yy_reduce($yyruleno)
     {
-        $yymsp = $this->yystack[$this->yyidx];
-        if ($this->yyTraceFILE && $yyruleno >= 0
-            && $yyruleno < count(self::$yyRuleName)
-        ) {
-            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
-                    $this->yyTracePrompt, $yyruleno,
+        if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno,
                     self::$yyRuleName[$yyruleno]);
         }
 
         $this->_retvalue = $yy_lefthand_side = null;
-        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
+        if (isset(self::$yyReduceMap[$yyruleno])) {
             // call the action
             $this->_retvalue = null;
             $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
             $yy_lefthand_side = $this->_retvalue;
         }
-        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
-        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
+        $yygoto = self::$yyRuleInfo[$yyruleno][0];
+        $yysize = self::$yyRuleInfo[$yyruleno][1];
         $this->yyidx -= $yysize;
         for ($i = $yysize; $i; $i --) {
             // pop all of the right-hand side parameters
@@ -4449,12 +2747,11 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
 
     public function yy_syntax_error($yymajor, $TOKEN)
     {
-        #line 75 "smarty_internal_templateparser.y"
+        #line 207 "../smarty/lexer/smarty_internal_templateparser.y"
 
         $this->internalError = true;
         $this->yymajor = $yymajor;
         $this->compiler->trigger_template_error();
-        #line 3142 "smarty_internal_templateparser.php"
     }
 
     public function yy_accept()
@@ -4463,16 +2760,13 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
         }
         while ($this->yyidx >= 0) {
-            $stack = $this->yy_pop_parser_stack();
+            $this->yy_pop_parser_stack();
         }
-        #line 66 "smarty_internal_templateparser.y"
+        #line 200 "../smarty/lexer/smarty_internal_templateparser.y"
 
         $this->successful = !$this->internalError;
         $this->internalError = false;
         $this->retvalue = $this->_retvalue;
-        //echo $this->retvalue."\n\n";
-
-        #line 3160 "smarty_internal_templateparser.php"
     }
 
     public function doParse($yymajor, $yytokenvalue)
@@ -4486,20 +2780,17 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
             $x->stateno = 0;
             $x->major = 0;
             $this->yystack = array();
-            array_push($this->yystack, $x);
+            $this->yystack[] = $x;
         }
         $yyendofinput = ($yymajor == 0);
 
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sInput %s\n",
-                    $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+            fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
         }
 
         do {
             $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL &&
-                !$this->yy_is_expected_token($yymajor)
-            ) {
+            if ($yymajor < self::YYERRORSYMBOL && !$this->yy_is_expected_token($yymajor)) {
                 // force a syntax error
                 $yyact = self::YY_ERROR_ACTION;
             }
@@ -4515,8 +2806,7 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
                 $this->yy_reduce($yyact - self::YYNSTATE);
             } elseif ($yyact == self::YY_ERROR_ACTION) {
                 if ($this->yyTraceFILE) {
-                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
-                            $this->yyTracePrompt);
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt);
                 }
                 if (self::YYERRORSYMBOL) {
                     if ($this->yyerrcnt < 0) {
@@ -4525,16 +2815,14 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
                     $yymx = $this->yystack[$this->yyidx]->major;
                     if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
                         if ($this->yyTraceFILE) {
-                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
-                                    $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt,
+                                    $this->yyTokenName[$yymajor]);
                         }
                         $this->yy_destructor($yymajor, $yytokenvalue);
                         $yymajor = self::YYNOCODE;
                     } else {
-                        while ($this->yyidx >= 0 &&
-                            $yymx != self::YYERRORSYMBOL &&
-                            ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                        ) {
+                        while ($this->yyidx >= 0 && $yymx != self::YYERRORSYMBOL &&
+                            ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE) {
                             $this->yy_pop_parser_stack();
                         }
                         if ($this->yyidx < 0 || $yymajor == 0) {
@@ -4566,3 +2854,4 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
     }
 }
+
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_testinstall.php b/library/Smarty/libs/sysplugins/smarty_internal_testinstall.php
new file mode 100644
index 000000000..72d9a5211
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_testinstall.php
@@ -0,0 +1,604 @@
+<?php
+/**
+ * Smarty Internal TestInstall
+ * Test Smarty installation
+ *
+ * @package    Smarty
+ * @subpackage Utilities
+ * @author     Uwe Tews
+ */
+
+/**
+ * TestInstall class
+ *
+ * @package    Smarty
+ * @subpackage Utilities
+ */
+class Smarty_Internal_TestInstall
+{
+    /**
+     * diagnose Smarty setup
+     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
+     *
+     * @param  array $errors array to push results into rather than outputting them
+     *
+     * @return bool   status, true if everything is fine, false else
+     */
+    public static function testInstall(Smarty $smarty, &$errors = null)
+    {
+        $status = true;
+
+        if ($errors === null) {
+            echo "<PRE>\n";
+            echo "Smarty Installation test...\n";
+            echo "Testing template directory...\n";
+        }
+
+        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
+
+        // test if all registered template_dir are accessible
+        foreach ($smarty->getTemplateDir() as $template_dir) {
+            $_template_dir = $template_dir;
+            $template_dir = realpath($template_dir);
+            // resolve include_path or fail existence
+            if (!$template_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $template_dir = stream_resolve_include_path($_template_dir);
+                    } else {
+                        $template_dir = $smarty->ext->_getIncludePath->getIncludePath($_template_dir, null, $smarty);
+                    }
+
+                    if ($template_dir !== false) {
+                        if ($errors === null) {
+                            echo "$template_dir is OK.\n";
+                        }
+
+                        continue;
+                    } else {
+                        $status = false;
+                        $message =
+                            "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'template_dir' ] = $message;
+                        }
+
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_template_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'template_dir' ] = $message;
+                    }
+
+                    continue;
+                }
+            }
+
+            if (!is_dir($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } elseif (!is_readable($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$template_dir is OK.\n";
+                }
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing compile directory...\n";
+        }
+
+        // test if registered compile_dir is accessible
+        $__compile_dir = $smarty->getCompileDir();
+        $_compile_dir = realpath($__compile_dir);
+        if (!$_compile_dir) {
+            $status = false;
+            $message = "FAILED: {$__compile_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_dir($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_readable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_writable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_compile_dir} is OK.\n";
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing plugins directory...\n";
+        }
+
+        // test if all registered plugins_dir are accessible
+        // and if core plugins directory is still registered
+        $_core_plugins_dir = realpath(dirname(__FILE__) . '/../plugins');
+        $_core_plugins_available = false;
+        foreach ($smarty->getPluginsDir() as $plugin_dir) {
+            $_plugin_dir = $plugin_dir;
+            $plugin_dir = realpath($plugin_dir);
+            // resolve include_path or fail existence
+            if (!$plugin_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $plugin_dir = stream_resolve_include_path($_plugin_dir);
+                    } else {
+                        $plugin_dir = $smarty->ext->_getIncludePath->getIncludePath($_plugin_dir, null, $smarty);
+                    }
+
+                    if ($plugin_dir !== false) {
+                        if ($errors === null) {
+                            echo "$plugin_dir is OK.\n";
+                        }
+
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'plugins_dir' ] = $message;
+                        }
+
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_plugin_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'plugins_dir' ] = $message;
+                    }
+
+                    continue;
+                }
+            }
+
+            if (!is_dir($plugin_dir)) {
+                $status = false;
+                $message = "FAILED: $plugin_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins_dir' ] = $message;
+                }
+            } elseif (!is_readable($plugin_dir)) {
+                $status = false;
+                $message = "FAILED: $plugin_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins_dir' ] = $message;
+                }
+            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
+                $_core_plugins_available = true;
+                if ($errors === null) {
+                    echo "$plugin_dir is OK.\n";
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$plugin_dir is OK.\n";
+                }
+            }
+        }
+        if (!$_core_plugins_available) {
+            $status = false;
+            $message = "WARNING: Smarty's own libs/plugins is not available";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } elseif (!isset($errors[ 'plugins_dir' ])) {
+                $errors[ 'plugins_dir' ] = $message;
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing cache directory...\n";
+        }
+
+        // test if all registered cache_dir is accessible
+        $__cache_dir = $smarty->getCacheDir();
+        $_cache_dir = realpath($__cache_dir);
+        if (!$_cache_dir) {
+            $status = false;
+            $message = "FAILED: {$__cache_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_dir($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_readable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_writable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_cache_dir} is OK.\n";
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing configs directory...\n";
+        }
+
+        // test if all registered config_dir are accessible
+        foreach ($smarty->getConfigDir() as $config_dir) {
+            $_config_dir = $config_dir;
+            // resolve include_path or fail existence
+            if (!$config_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $config_dir = stream_resolve_include_path($_config_dir);
+                    } else {
+                        $config_dir = $smarty->ext->_getIncludePath->getIncludePath($_config_dir, null, $smarty);
+                    }
+
+                    if ($config_dir !== false) {
+                        if ($errors === null) {
+                            echo "$config_dir is OK.\n";
+                        }
+
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'config_dir' ] = $message;
+                        }
+
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_config_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'config_dir' ] = $message;
+                    }
+
+                    continue;
+                }
+            }
+
+            if (!is_dir($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } elseif (!is_readable($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$config_dir is OK.\n";
+                }
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing sysplugin files...\n";
+        }
+        // test if sysplugins are available
+        $source = SMARTY_SYSPLUGINS_DIR;
+        if (is_dir($source)) {
+            $expectedSysplugins = array('smartycompilerexception.php'                               => true,
+                                        'smartyexception.php'                                       => true,
+                                        'smarty_cacheresource.php'                                  => true,
+                                        'smarty_cacheresource_custom.php'                           => true,
+                                        'smarty_cacheresource_keyvaluestore.php'                    => true,
+                                        'smarty_data.php'                                           => true,
+                                        'smarty_internal_cacheresource_file.php'                    => true,
+                                        'smarty_internal_compilebase.php'                           => true,
+                                        'smarty_internal_compile_append.php'                        => true,
+                                        'smarty_internal_compile_assign.php'                        => true,
+                                        'smarty_internal_compile_block.php'                         => true,
+                                        'smarty_internal_compile_break.php'                         => true,
+                                        'smarty_internal_compile_call.php'                          => true,
+                                        'smarty_internal_compile_capture.php'                       => true,
+                                        'smarty_internal_compile_config_load.php'                   => true,
+                                        'smarty_internal_compile_continue.php'                      => true,
+                                        'smarty_internal_compile_debug.php'                         => true,
+                                        'smarty_internal_compile_eval.php'                          => true,
+                                        'smarty_internal_compile_extends.php'                       => true,
+                                        'smarty_internal_compile_for.php'                           => true,
+                                        'smarty_internal_compile_foreach.php'                       => true,
+                                        'smarty_internal_compile_function.php'                      => true,
+                                        'smarty_internal_compile_if.php'                            => true,
+                                        'smarty_internal_compile_include.php'                       => true,
+                                        'smarty_internal_compile_include_php.php'                   => true,
+                                        'smarty_internal_compile_insert.php'                        => true,
+                                        'smarty_internal_compile_ldelim.php'                        => true,
+                                        'smarty_internal_compile_nocache.php'                       => true,
+                                        'smarty_internal_compile_private_block_plugin.php'          => true,
+                                        'smarty_internal_compile_private_foreachsection.php'        => true,
+                                        'smarty_internal_compile_private_function_plugin.php'       => true,
+                                        'smarty_internal_compile_private_modifier.php'              => true,
+                                        'smarty_internal_compile_private_object_block_function.php' => true,
+                                        'smarty_internal_compile_private_object_function.php'       => true,
+                                        'smarty_internal_compile_private_php.php'                   => true,
+                                        'smarty_internal_compile_private_print_expression.php'      => true,
+                                        'smarty_internal_compile_private_registered_block.php'      => true,
+                                        'smarty_internal_compile_private_registered_function.php'   => true,
+                                        'smarty_internal_compile_private_special_variable.php'      => true,
+                                        'smarty_internal_compile_rdelim.php'                        => true,
+                                        'smarty_internal_compile_section.php'                       => true,
+                                        'smarty_internal_compile_setfilter.php'                     => true,
+                                        'smarty_internal_compile_shared_inheritance.php'            => true,
+                                        'smarty_internal_compile_while.php'                         => true,
+                                        'smarty_internal_configfilelexer.php'                       => true,
+                                        'smarty_internal_configfileparser.php'                      => true,
+                                        'smarty_internal_config_file_compiler.php'                  => true,
+                                        'smarty_internal_data.php'                                  => true,
+                                        'smarty_internal_debug.php'                                 => true,
+                                        'smarty_internal_extension_clear.php'                       => true,
+                                        'smarty_internal_extension_handler.php'                     => true,
+                                        'smarty_internal_method_addautoloadfilters.php'             => true,
+                                        'smarty_internal_method_adddefaultmodifiers.php'            => true,
+                                        'smarty_internal_method_append.php'                         => true,
+                                        'smarty_internal_method_appendbyref.php'                    => true,
+                                        'smarty_internal_method_assignbyref.php'                    => true,
+                                        'smarty_internal_method_assignglobal.php'                   => true,
+                                        'smarty_internal_method_clearallassign.php'                 => true,
+                                        'smarty_internal_method_clearallcache.php'                  => true,
+                                        'smarty_internal_method_clearassign.php'                    => true,
+                                        'smarty_internal_method_clearcache.php'                     => true,
+                                        'smarty_internal_method_clearcompiledtemplate.php'          => true,
+                                        'smarty_internal_method_clearconfig.php'                    => true,
+                                        'smarty_internal_method_compileallconfig.php'               => true,
+                                        'smarty_internal_method_compilealltemplates.php'            => true,
+                                        'smarty_internal_method_configload.php'                     => true,
+                                        'smarty_internal_method_createdata.php'                     => true,
+                                        'smarty_internal_method_getautoloadfilters.php'             => true,
+                                        'smarty_internal_method_getconfigvars.php'                  => true,
+                                        'smarty_internal_method_getdebugtemplate.php'               => true,
+                                        'smarty_internal_method_getdefaultmodifiers.php'            => true,
+                                        'smarty_internal_method_getregisteredobject.php'            => true,
+                                        'smarty_internal_method_getstreamvariable.php'              => true,
+                                        'smarty_internal_method_gettags.php'                        => true,
+                                        'smarty_internal_method_gettemplatevars.php'                => true,
+                                        'smarty_internal_method_loadfilter.php'                     => true,
+                                        'smarty_internal_method_loadplugin.php'                     => true,
+                                        'smarty_internal_method_mustcompile.php'                    => true,
+                                        'smarty_internal_method_registercacheresource.php'          => true,
+                                        'smarty_internal_method_registerclass.php'                  => true,
+                                        'smarty_internal_method_registerdefaultconfighandler.php'   => true,
+                                        'smarty_internal_method_registerdefaultpluginhandler.php'   => true,
+                                        'smarty_internal_method_registerdefaulttemplatehandler.php' => true,
+                                        'smarty_internal_method_registerfilter.php'                 => true,
+                                        'smarty_internal_method_registerobject.php'                 => true,
+                                        'smarty_internal_method_registerplugin.php'                 => true,
+                                        'smarty_internal_method_registerresource.php'               => true,
+                                        'smarty_internal_method_setautoloadfilters.php'             => true,
+                                        'smarty_internal_method_setdebugtemplate.php'               => true,
+                                        'smarty_internal_method_setdefaultmodifiers.php'            => true,
+                                        'smarty_internal_method_unloadfilter.php'                   => true,
+                                        'smarty_internal_method_unregistercacheresource.php'        => true,
+                                        'smarty_internal_method_unregisterfilter.php'               => true,
+                                        'smarty_internal_method_unregisterobject.php'               => true,
+                                        'smarty_internal_method_unregisterplugin.php'               => true,
+                                        'smarty_internal_method_unregisterresource.php'             => true,
+                                        'smarty_internal_nocache_insert.php'                        => true,
+                                        'smarty_internal_parsetree.php'                             => true,
+                                        'smarty_internal_parsetree_code.php'                        => true,
+                                        'smarty_internal_parsetree_dq.php'                          => true,
+                                        'smarty_internal_parsetree_dqcontent.php'                   => true,
+                                        'smarty_internal_parsetree_tag.php'                         => true,
+                                        'smarty_internal_parsetree_template.php'                    => true,
+                                        'smarty_internal_parsetree_text.php'                        => true,
+                                        'smarty_internal_resource_eval.php'                         => true,
+                                        'smarty_internal_resource_extends.php'                      => true,
+                                        'smarty_internal_resource_file.php'                         => true,
+                                        'smarty_internal_resource_php.php'                          => true,
+                                        'smarty_internal_resource_registered.php'                   => true,
+                                        'smarty_internal_resource_stream.php'                       => true,
+                                        'smarty_internal_resource_string.php'                       => true,
+                                        'smarty_internal_runtime_cachemodify.php'                   => true,
+                                        'smarty_internal_runtime_codeframe.php'                     => true,
+                                        'smarty_internal_runtime_filterhandler.php'                 => true,
+                                        'smarty_internal_runtime_foreach.php'                       => true,
+                                        'smarty_internal_runtime_getincludepath.php'                => true,
+                                        'smarty_internal_runtime_hhvm.php'                          => true,
+                                        'smarty_internal_runtime_inheritance.php'                   => true,
+                                        'smarty_internal_runtime_subtemplate.php'                   => true,
+                                        'smarty_internal_runtime_tplfunction.php'                   => true,
+                                        'smarty_internal_runtime_updatecache.php'                   => true,
+                                        'smarty_internal_runtime_updatescope.php'                   => true,
+                                        'smarty_internal_runtime_validatecompiled.php'              => true,
+                                        'smarty_internal_runtime_var.php'                           => true,
+                                        'smarty_internal_runtime_writefile.php'                     => true,
+                                        'smarty_internal_smartytemplatecompiler.php'                => true,
+                                        'smarty_internal_template.php'                              => true,
+                                        'smarty_internal_templatebase.php'                          => true,
+                                        'smarty_internal_templatecompilerbase.php'                  => true,
+                                        'smarty_internal_templatelexer.php'                         => true,
+                                        'smarty_internal_templateparser.php'                        => true,
+                                        'smarty_internal_testinstall.php'                           => true,
+                                        'smarty_internal_undefined.php'                             => true,
+                                        'smarty_resource.php'                                       => true,
+                                        'smarty_resource_custom.php'                                => true,
+                                        'smarty_resource_recompiled.php'                            => true,
+                                        'smarty_resource_uncompiled.php'                            => true,
+                                        'smarty_security.php'                                       => true,
+                                        'smarty_template_cached.php'                                => true,
+                                        'smarty_template_compiled.php'                              => true,
+                                        'smarty_template_config.php'                                => true,
+                                        'smarty_template_resource_base.php'                         => true,
+                                        'smarty_template_source.php'                                => true,
+                                        'smarty_undefined_variable.php'                             => true,
+                                        'smarty_variable.php'                                       => true,);
+            $iterator = new DirectoryIterator($source);
+            foreach ($iterator as $file) {
+                if (!$file->isDot()) {
+                    $filename = $file->getFilename();
+                    if (isset($expectedSysplugins[ $filename ])) {
+                        unset($expectedSysplugins[ $filename ]);
+                    }
+                }
+            }
+            if ($expectedSysplugins) {
+                $status = false;
+                $message = "FAILED: files missing from libs/sysplugins: " . join(', ', array_keys($expectedSysplugins));
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'sysplugins' ] = $message;
+                }
+            } elseif ($errors === null) {
+                echo "... OK\n";
+            }
+        } else {
+            $status = false;
+            $message = "FAILED: " . SMARTY_SYSPLUGINS_DIR . ' is not a directory';
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'sysplugins_dir_constant' ] = $message;
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing plugin files...\n";
+        }
+        // test if core plugins are available
+        $source = SMARTY_PLUGINS_DIR;
+        if (is_dir($source)) {
+            $expectedPlugins =
+                array('block.textformat.php'                  => true, 'function.counter.php' => true,
+                      'function.cycle.php'                    => true, 'function.fetch.php' => true,
+                      'function.html_checkboxes.php'          => true, 'function.html_image.php' => true,
+                      'function.html_options.php'             => true, 'function.html_radios.php' => true,
+                      'function.html_select_date.php'         => true, 'function.html_select_time.php' => true,
+                      'function.html_table.php'               => true, 'function.mailto.php' => true,
+                      'function.math.php'                     => true, 'modifier.capitalize.php' => true,
+                      'modifier.date_format.php'              => true, 'modifier.debug_print_var.php' => true,
+                      'modifier.escape.php'                   => true, 'modifier.regex_replace.php' => true,
+                      'modifier.replace.php'                  => true, 'modifier.spacify.php' => true,
+                      'modifier.truncate.php'                 => true, 'modifiercompiler.cat.php' => true,
+                      'modifiercompiler.count_characters.php' => true, 'modifiercompiler.count_paragraphs.php' => true,
+                      'modifiercompiler.count_sentences.php'  => true, 'modifiercompiler.count_words.php' => true,
+                      'modifiercompiler.default.php'          => true, 'modifiercompiler.escape.php' => true,
+                      'modifiercompiler.from_charset.php'     => true, 'modifiercompiler.indent.php' => true,
+                      'modifiercompiler.lower.php'            => true, 'modifiercompiler.noprint.php' => true,
+                      'modifiercompiler.string_format.php'    => true, 'modifiercompiler.strip.php' => true,
+                      'modifiercompiler.strip_tags.php'       => true, 'modifiercompiler.to_charset.php' => true,
+                      'modifiercompiler.unescape.php'         => true, 'modifiercompiler.upper.php' => true,
+                      'modifiercompiler.wordwrap.php'         => true, 'outputfilter.trimwhitespace.php' => true,
+                      'shared.escape_special_chars.php'       => true, 'shared.literal_compiler_param.php' => true,
+                      'shared.make_timestamp.php'             => true, 'shared.mb_str_replace.php' => true,
+                      'shared.mb_unicode.php'                 => true, 'shared.mb_wordwrap.php' => true,
+                      'variablefilter.htmlspecialchars.php'   => true,);
+            $iterator = new DirectoryIterator($source);
+            foreach ($iterator as $file) {
+                if (!$file->isDot()) {
+                    $filename = $file->getFilename();
+                    if (isset($expectedPlugins[ $filename ])) {
+                        unset($expectedPlugins[ $filename ]);
+                    }
+                }
+            }
+            if ($expectedPlugins) {
+                $status = false;
+                $message = "FAILED: files missing from libs/plugins: " . join(', ', array_keys($expectedPlugins));
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins' ] = $message;
+                }
+            } elseif ($errors === null) {
+                echo "... OK\n";
+            }
+        } else {
+            $status = false;
+            $message = "FAILED: " . SMARTY_PLUGINS_DIR . ' is not a directory';
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'plugins_dir_constant' ] = $message;
+            }
+        }
+
+        if ($errors === null) {
+            echo "Tests complete.\n";
+            echo "</PRE>\n";
+        }
+
+        return $status;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_undefined.php b/library/Smarty/libs/sysplugins/smarty_internal_undefined.php
new file mode 100644
index 000000000..93fca8ec1
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_internal_undefined.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Smarty Method AppendByRef
+ *
+ * Smarty::appendByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Undefined
+{
+
+    /**
+     * This function is executed automatically when a compiled or cached template file is included
+     * - Decode saved properties from compiled template and cache files
+     * - Check if compiled or cache file is valid
+     *
+     * @param  array $properties special template properties
+     * @param  bool  $cache      flag if called from cache file
+     *
+     * @return bool  flag if compiled or cache file is valid
+     */
+    public function decodeProperties($tpl, $properties, $cache = false)
+    {
+        if ($cache) {
+            $tpl->cached->valid = false;
+        } else {
+            $tpl->mustCompile = true;
+        }
+        return false;
+    }
+
+    /**
+     * Call error handler for undefined method
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
+     */
+    public function __call($name, $args)
+    {
+        throw new SmartyException(get_class($args[0]) . "->{$name}() undefined method");
+    }
+}
\ No newline at end of file
diff --git a/library/Smarty/libs/sysplugins/smarty_internal_utility.php b/library/Smarty/libs/sysplugins/smarty_internal_utility.php
deleted file mode 100644
index 0a5975bba..000000000
--- a/library/Smarty/libs/sysplugins/smarty_internal_utility.php
+++ /dev/null
@@ -1,837 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        smarty_internal_utility.php
- * SVN:         $Id: $
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link       http://www.smarty.net/
- * @copyright  2008 New Digital Group, Inc.
- * @author     Monte Ohrt <monte at ohrt dot com>
- * @author     Uwe Tews
- * @package    Smarty
- * @subpackage PluginsInternal
- * @version    3-SVN$Rev: 3286 $
- */
-
-/**
- * Utility class
- *
- * @package    Smarty
- * @subpackage Security
- */
-class Smarty_Internal_Utility
-{
-    /**
-     * private constructor to prevent calls creation of new instances
-     */
-    final private function __construct()
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * Compile all template files
-     *
-     * @param  string $extension     template file name extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit    set maximum execution time
-     * @param  int    $max_errors    set maximum allowed errors
-     * @param  Smarty $smarty        Smarty instance
-     *
-     * @return integer number of template files compiled
-     */
-    public static function compileAllTemplates($extension, $force_compile, $time_limit, $max_errors, Smarty $smarty)
-    {
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        }
-        $smarty->force_compile = $force_compile;
-        $_count = 0;
-        $_error_count = 0;
-        // loop over array of template directories
-        foreach ($smarty->getTemplateDir() as $_dir) {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            $_compile = new RecursiveIteratorIterator($_compileDirs);
-            foreach ($_compile as $_fileinfo) {
-                $_file = $_fileinfo->getFilename();
-                if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-                    continue;
-                }
-                if (!substr_compare($_file, $extension, - strlen($extension)) == 0) {
-                    continue;
-                }
-                if ($_fileinfo->getPath() == substr($_dir, 0, - 1)) {
-                    $_template_file = $_file;
-                } else {
-                    $_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                }
-                echo '<br>', $_dir, '---', $_template_file;
-                flush();
-                $_start_time = microtime(true);
-                try {
-                    $_tpl = $smarty->createTemplate($_template_file, null, null, null, false);
-                    if ($_tpl->mustCompile()) {
-                        $_tpl->compileTemplateSource();
-                        $_count ++;
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                }
-                catch (Exception $e) {
-                    echo 'Error: ', $e->getMessage(), "<br><br>";
-                    $_error_count ++;
-                }
-                // free memory
-                $smarty->template_objects = array();
-                $_tpl->smarty->template_objects = array();
-                $_tpl = null;
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    echo '<br><br>too many errors';
-                    exit();
-                }
-            }
-        }
-
-        return $_count;
-    }
-
-    /**
-     * Compile all config files
-     *
-     * @param  string $extension     config file name extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit    set maximum execution time
-     * @param  int    $max_errors    set maximum allowed errors
-     * @param  Smarty $smarty        Smarty instance
-     *
-     * @return integer number of config files compiled
-     */
-    public static function compileAllConfig($extension, $force_compile, $time_limit, $max_errors, Smarty $smarty)
-    {
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        }
-        $smarty->force_compile = $force_compile;
-        $_count = 0;
-        $_error_count = 0;
-        // loop over array of template directories
-        foreach ($smarty->getConfigDir() as $_dir) {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            $_compile = new RecursiveIteratorIterator($_compileDirs);
-            foreach ($_compile as $_fileinfo) {
-                $_file = $_fileinfo->getFilename();
-                if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-                    continue;
-                }
-                if (!substr_compare($_file, $extension, - strlen($extension)) == 0) {
-                    continue;
-                }
-                if ($_fileinfo->getPath() == substr($_dir, 0, - 1)) {
-                    $_config_file = $_file;
-                } else {
-                    $_config_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                }
-                echo '<br>', $_dir, '---', $_config_file;
-                flush();
-                $_start_time = microtime(true);
-                try {
-                    $_config = new Smarty_Internal_Config($_config_file, $smarty);
-                    if ($_config->mustCompile()) {
-                        $_config->compileConfigSource();
-                        $_count ++;
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                }
-                catch (Exception $e) {
-                    echo 'Error: ', $e->getMessage(), "<br><br>";
-                    $_error_count ++;
-                }
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    echo '<br><br>too many errors';
-                    exit();
-                }
-            }
-        }
-
-        return $_count;
-    }
-
-    /**
-     * Delete compiled template file
-     *
-     * @param  string  $resource_name template name
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time
-     * @param  Smarty  $smarty        Smarty instance
-     *
-     * @return integer number of template files deleted
-     */
-    public static function clearCompiledTemplate($resource_name, $compile_id, $exp_time, Smarty $smarty)
-    {
-        $_compile_dir = realpath($smarty->getCompileDir()) . '/';
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = false;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-
-            // remove from template cache
-            $tpl->source; // have the template registered before unset()
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-
-            if ($tpl->source->exists) {
-                $_resource_part_1 = basename(str_replace('^', '/', $tpl->compiled->filepath));
-                $_resource_part_1_length = strlen($_resource_part_1);
-            } else {
-                return 0;
-            }
-
-            $_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
-            $_resource_part_2_length = strlen($_resource_part_2);
-        }
-        $_dir = $_compile_dir;
-        if ($smarty->use_sub_dirs && isset($_compile_id)) {
-            $_dir .= $_compile_id . $_dir_sep;
-        }
-        if (isset($_compile_id)) {
-            $_compile_id_part = str_replace('\\', '/', $_compile_dir . $_compile_id . $_dir_sep);
-            $_compile_id_part_length = strlen($_compile_id_part);
-        }
-        $_count = 0;
-        try {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            // NOTE: UnexpectedValueException thrown for PHP >= 5.3
-        }
-        catch (Exception $e) {
-            return 0;
-        }
-        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
-        foreach ($_compile as $_file) {
-            if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-                continue;
-            }
-
-            $_filepath = str_replace('\\', '/', (string) $_file);
-
-            if ($_file->isDir()) {
-                if (!$_compile->isDot()) {
-                    // delete folder if empty
-                    @rmdir($_file->getPathname());
-                }
-            } else {
-                $unlink = false;
-                if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) && $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
-                    && (!isset($resource_name)
-                        || (isset($_filepath[$_resource_part_1_length])
-                            && substr_compare($_filepath, $_resource_part_1, - $_resource_part_1_length, $_resource_part_1_length) == 0)
-                        || (isset($_filepath[$_resource_part_2_length])
-                            && substr_compare($_filepath, $_resource_part_2, - $_resource_part_2_length, $_resource_part_2_length) == 0))
-                ) {
-                    if (isset($exp_time)) {
-                        if (time() - @filemtime($_filepath) >= $exp_time) {
-                            $unlink = true;
-                        }
-                    } else {
-                        $unlink = true;
-                    }
-                }
-
-                if ($unlink && @unlink($_filepath)) {
-                    $_count ++;
-                }
-            }
-        }
-        // clear compiled cache
-        Smarty_Resource::$sources = array();
-        Smarty_Resource::$compileds = array();
-
-        return $_count;
-    }
-
-    /**
-     * Return array of tag/attributes of all tags used by an template
-     *
-     * @param Smarty_Internal_Template $template
-     *
-     * @throws Exception
-     * @throws SmartyException
-     * @return array                    of tag/attributes
-     */
-    public static function getTags(Smarty_Internal_Template $template)
-    {
-        $template->smarty->get_used_tags = true;
-        $template->compileTemplateSource();
-
-        return $template->used_tags;
-    }
-
-    /**
-     * diagnose Smarty setup
-     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
-     *
-     * @param  Smarty $smarty Smarty instance to test
-     * @param  array  $errors array to push results into rather than outputting them
-     *
-     * @return bool   status, true if everything is fine, false else
-     */
-    public static function testInstall(Smarty $smarty, &$errors = null)
-    {
-        $status = true;
-
-        if ($errors === null) {
-            echo "<PRE>\n";
-            echo "Smarty Installation test...\n";
-            echo "Testing template directory...\n";
-        }
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // test if all registered template_dir are accessible
-        foreach ($smarty->getTemplateDir() as $template_dir) {
-            $_template_dir = $template_dir;
-            $template_dir = realpath($template_dir);
-            // resolve include_path or fail existence
-            if (!$template_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $template_dir = stream_resolve_include_path($_template_dir);
-                    } else {
-                        $template_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_template_dir);
-                    }
-
-                    if ($template_dir !== false) {
-                        if ($errors === null) {
-                            echo "$template_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['template_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_template_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['template_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['template_dir'] = $message;
-                }
-            } elseif (!is_readable($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['template_dir'] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$template_dir is OK.\n";
-                }
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing compile directory...\n";
-        }
-
-        // test if registered compile_dir is accessible
-        $__compile_dir = $smarty->getCompileDir();
-        $_compile_dir = realpath($__compile_dir);
-        if (!$_compile_dir) {
-            $status = false;
-            $message = "FAILED: {$__compile_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_dir($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_readable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_writable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_compile_dir} is OK.\n";
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing plugins directory...\n";
-        }
-
-        // test if all registered plugins_dir are accessible
-        // and if core plugins directory is still registered
-        $_core_plugins_dir = realpath(dirname(__FILE__) . '/../plugins');
-        $_core_plugins_available = false;
-        foreach ($smarty->getPluginsDir() as $plugin_dir) {
-            $_plugin_dir = $plugin_dir;
-            $plugin_dir = realpath($plugin_dir);
-            // resolve include_path or fail existence
-            if (!$plugin_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $plugin_dir = stream_resolve_include_path($_plugin_dir);
-                    } else {
-                        $plugin_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_plugin_dir);
-                    }
-
-                    if ($plugin_dir !== false) {
-                        if ($errors === null) {
-                            echo "$plugin_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['plugins_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_plugin_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['plugins_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins_dir'] = $message;
-                }
-            } elseif (!is_readable($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins_dir'] = $message;
-                }
-            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
-                $_core_plugins_available = true;
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            }
-        }
-        if (!$_core_plugins_available) {
-            $status = false;
-            $message = "WARNING: Smarty's own libs/plugins is not available";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } elseif (!isset($errors['plugins_dir'])) {
-                $errors['plugins_dir'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing cache directory...\n";
-        }
-
-        // test if all registered cache_dir is accessible
-        $__cache_dir = $smarty->getCacheDir();
-        $_cache_dir = realpath($__cache_dir);
-        if (!$_cache_dir) {
-            $status = false;
-            $message = "FAILED: {$__cache_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_dir($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_readable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_writable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_cache_dir} is OK.\n";
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing configs directory...\n";
-        }
-
-        // test if all registered config_dir are accessible
-        foreach ($smarty->getConfigDir() as $config_dir) {
-            $_config_dir = $config_dir;
-            $config_dir = realpath($config_dir);
-            // resolve include_path or fail existence
-            if (!$config_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $config_dir = stream_resolve_include_path($_config_dir);
-                    } else {
-                        $config_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_config_dir);
-                    }
-
-                    if ($config_dir !== false) {
-                        if ($errors === null) {
-                            echo "$config_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['config_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_config_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['config_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['config_dir'] = $message;
-                }
-            } elseif (!is_readable($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['config_dir'] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$config_dir is OK.\n";
-                }
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing sysplugin files...\n";
-        }
-        // test if sysplugins are available
-        $source = SMARTY_SYSPLUGINS_DIR;
-        if (is_dir($source)) {
-            $expected = array(
-                "smarty_cacheresource.php"                                  => true,
-                "smarty_cacheresource_custom.php"                           => true,
-                "smarty_cacheresource_keyvaluestore.php"                    => true,
-                "smarty_config_source.php"                                  => true,
-                "smarty_internal_cacheresource_file.php"                    => true,
-                "smarty_internal_compile_append.php"                        => true,
-                "smarty_internal_compile_assign.php"                        => true,
-                "smarty_internal_compile_block.php"                         => true,
-                "smarty_internal_compile_break.php"                         => true,
-                "smarty_internal_compile_call.php"                          => true,
-                "smarty_internal_compile_capture.php"                       => true,
-                "smarty_internal_compile_config_load.php"                   => true,
-                "smarty_internal_compile_continue.php"                      => true,
-                "smarty_internal_compile_debug.php"                         => true,
-                "smarty_internal_compile_eval.php"                          => true,
-                "smarty_internal_compile_extends.php"                       => true,
-                "smarty_internal_compile_for.php"                           => true,
-                "smarty_internal_compile_foreach.php"                       => true,
-                "smarty_internal_compile_function.php"                      => true,
-                "smarty_internal_compile_if.php"                            => true,
-                "smarty_internal_compile_include.php"                       => true,
-                "smarty_internal_compile_include_php.php"                   => true,
-                "smarty_internal_compile_insert.php"                        => true,
-                "smarty_internal_compile_ldelim.php"                        => true,
-                "smarty_internal_compile_nocache.php"                       => true,
-                "smarty_internal_compile_private_block_plugin.php"          => true,
-                "smarty_internal_compile_private_function_plugin.php"       => true,
-                "smarty_internal_compile_private_modifier.php"              => true,
-                "smarty_internal_compile_private_object_block_function.php" => true,
-                "smarty_internal_compile_private_object_function.php"       => true,
-                "smarty_internal_compile_private_print_expression.php"      => true,
-                "smarty_internal_compile_private_registered_block.php"      => true,
-                "smarty_internal_compile_private_registered_function.php"   => true,
-                "smarty_internal_compile_private_special_variable.php"      => true,
-                "smarty_internal_compile_rdelim.php"                        => true,
-                "smarty_internal_compile_section.php"                       => true,
-                "smarty_internal_compile_setfilter.php"                     => true,
-                "smarty_internal_compile_while.php"                         => true,
-                "smarty_internal_compilebase.php"                           => true,
-                "smarty_internal_config.php"                                => true,
-                "smarty_internal_config_file_compiler.php"                  => true,
-                "smarty_internal_configfilelexer.php"                       => true,
-                "smarty_internal_configfileparser.php"                      => true,
-                "smarty_internal_data.php"                                  => true,
-                "smarty_internal_debug.php"                                 => true,
-                "smarty_internal_filter_handler.php"                        => true,
-                "smarty_internal_function_call_handler.php"                 => true,
-                "smarty_internal_get_include_path.php"                      => true,
-                "smarty_internal_nocache_insert.php"                        => true,
-                "smarty_internal_parsetree.php"                             => true,
-                "smarty_internal_resource_eval.php"                         => true,
-                "smarty_internal_resource_extends.php"                      => true,
-                "smarty_internal_resource_file.php"                         => true,
-                "smarty_internal_resource_registered.php"                   => true,
-                "smarty_internal_resource_stream.php"                       => true,
-                "smarty_internal_resource_string.php"                       => true,
-                "smarty_internal_smartytemplatecompiler.php"                => true,
-                "smarty_internal_template.php"                              => true,
-                "smarty_internal_templatebase.php"                          => true,
-                "smarty_internal_templatecompilerbase.php"                  => true,
-                "smarty_internal_templatelexer.php"                         => true,
-                "smarty_internal_templateparser.php"                        => true,
-                "smarty_internal_utility.php"                               => true,
-                "smarty_internal_write_file.php"                            => true,
-                "smarty_resource.php"                                       => true,
-                "smarty_resource_custom.php"                                => true,
-                "smarty_resource_recompiled.php"                            => true,
-                "smarty_resource_uncompiled.php"                            => true,
-                "smarty_security.php"                                       => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expected[$filename])) {
-                        unset($expected[$filename]);
-                    }
-                }
-            }
-            if ($expected) {
-                $status = false;
-                $message = "FAILED: files missing from libs/sysplugins: " . join(', ', array_keys($expected));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['sysplugins'] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: " . SMARTY_SYSPLUGINS_DIR . ' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['sysplugins_dir_constant'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing plugin files...\n";
-        }
-        // test if core plugins are available
-        $source = SMARTY_PLUGINS_DIR;
-        if (is_dir($source)) {
-            $expected = array(
-                "block.textformat.php"                  => true,
-                "function.counter.php"                  => true,
-                "function.cycle.php"                    => true,
-                "function.fetch.php"                    => true,
-                "function.html_checkboxes.php"          => true,
-                "function.html_image.php"               => true,
-                "function.html_options.php"             => true,
-                "function.html_radios.php"              => true,
-                "function.html_select_date.php"         => true,
-                "function.html_select_time.php"         => true,
-                "function.html_table.php"               => true,
-                "function.mailto.php"                   => true,
-                "function.math.php"                     => true,
-                "modifier.capitalize.php"               => true,
-                "modifier.date_format.php"              => true,
-                "modifier.debug_print_var.php"          => true,
-                "modifier.escape.php"                   => true,
-                "modifier.regex_replace.php"            => true,
-                "modifier.replace.php"                  => true,
-                "modifier.spacify.php"                  => true,
-                "modifier.truncate.php"                 => true,
-                "modifiercompiler.cat.php"              => true,
-                "modifiercompiler.count_characters.php" => true,
-                "modifiercompiler.count_paragraphs.php" => true,
-                "modifiercompiler.count_sentences.php"  => true,
-                "modifiercompiler.count_words.php"      => true,
-                "modifiercompiler.default.php"          => true,
-                "modifiercompiler.escape.php"           => true,
-                "modifiercompiler.from_charset.php"     => true,
-                "modifiercompiler.indent.php"           => true,
-                "modifiercompiler.lower.php"            => true,
-                "modifiercompiler.noprint.php"          => true,
-                "modifiercompiler.string_format.php"    => true,
-                "modifiercompiler.strip.php"            => true,
-                "modifiercompiler.strip_tags.php"       => true,
-                "modifiercompiler.to_charset.php"       => true,
-                "modifiercompiler.unescape.php"         => true,
-                "modifiercompiler.upper.php"            => true,
-                "modifiercompiler.wordwrap.php"         => true,
-                "outputfilter.trimwhitespace.php"       => true,
-                "shared.escape_special_chars.php"       => true,
-                "shared.literal_compiler_param.php"     => true,
-                "shared.make_timestamp.php"             => true,
-                "shared.mb_str_replace.php"             => true,
-                "shared.mb_unicode.php"                 => true,
-                "shared.mb_wordwrap.php"                => true,
-                "variablefilter.htmlspecialchars.php"   => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expected[$filename])) {
-                        unset($expected[$filename]);
-                    }
-                }
-            }
-            if ($expected) {
-                $status = false;
-                $message = "FAILED: files missing from libs/plugins: " . join(', ', array_keys($expected));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins'] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: " . SMARTY_PLUGINS_DIR . ' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['plugins_dir_constant'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Tests complete.\n";
-            echo "</PRE>\n";
-        }
-
-        return $status;
-    }
-}
diff --git a/library/Smarty/libs/sysplugins/smarty_resource.php b/library/Smarty/libs/sysplugins/smarty_resource.php
index f478a533d..72611255e 100644
--- a/library/Smarty/libs/sysplugins/smarty_resource.php
+++ b/library/Smarty/libs/sysplugins/smarty_resource.php
@@ -17,36 +17,37 @@
 abstract class Smarty_Resource
 {
     /**
-     * cache for Smarty_Template_Source instances
+     * Source is bypassing compiler
      *
-     * @var array
+     * @var boolean
      */
-    public static $sources = array();
+    public $uncompiled = false;
+
     /**
-     * cache for Smarty_Template_Compiled instances
+     * Source must be recompiled on every occasion
      *
-     * @var array
+     * @var boolean
      */
-    public static $compileds = array();
+    public $recompiled = false;
+
     /**
-     * cache for Smarty_Resource instances
+     * resource types provided by the core
      *
      * @var array
      */
-    public static $resources = array();
+    public static $sysplugins = array('file'    => 'smarty_internal_resource_file.php',
+                                      'string'  => 'smarty_internal_resource_string.php',
+                                      'extends' => 'smarty_internal_resource_extends.php',
+                                      'stream'  => 'smarty_internal_resource_stream.php',
+                                      'eval'    => 'smarty_internal_resource_eval.php',
+                                      'php'     => 'smarty_internal_resource_php.php');
+
     /**
-     * resource types provided by the core
+     * Flag if resource does implement populateCompiledFilepath() method
      *
-     * @var array
+     * @var bool
      */
-    protected static $sysplugins = array(
-        'file'    => true,
-        'string'  => true,
-        'extends' => true,
-        'stream'  => true,
-        'eval'    => true,
-        'php'     => true
-    );
+    public $hasCompiledHandler = false;
 
     /**
      * Name of the Class to compile this resource's contents with
@@ -71,7 +72,6 @@ abstract class Smarty_Resource
 
     /**
      * Load template's source into current template object
-     * {@internal The loaded source is assigned to $_template->source->content directly.}}
      *
      * @param  Smarty_Template_Source $source source object
      *
@@ -103,268 +103,23 @@ abstract class Smarty_Resource
      *
      * @param  Smarty  $smarty        Smarty instance
      * @param  string  $resource_name resource_name to make unique
-     * @param  boolean $is_config     flag for config resource
+     * @param  boolean $isConfig      flag for config resource
      *
      * @return string unique resource name
      */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false)
-    {
-        if ($is_config) {
-            return get_class($this) . '#' . $smarty->joined_config_dir . '#' . $resource_name;
-        } else {
-            return get_class($this) . '#' . $smarty->joined_template_dir . '#' . $resource_name;
-        }
-    }
-
-    /**
-     * populate Compiled Object with compiled filepath
-     *
-     * @param Smarty_Template_Compiled $compiled  compiled object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-        $_filepath = $compiled->source->uid;
-        // if use_sub_dirs, break file into directories
-        if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-                . substr($_filepath, 2, 2) . DS
-                . substr($_filepath, 4, 2) . DS
-                . $_filepath;
-        }
-        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        }
-        // caching token
-        if ($_template->caching) {
-            $_cache = '.cache';
-        } else {
-            $_cache = '';
-        }
-        $_compile_dir = $_template->smarty->getCompileDir();
-        // set basename if not specified
-        $_basename = $this->getBasename($compiled->source);
-        if ($_basename === null) {
-            $_basename = basename(preg_replace('![^\w\/]+!', '_', $compiled->source->name));
-        }
-        // separate (optional) basename by dot
-        if ($_basename) {
-            $_basename = '.' . $_basename;
-        }
-
-        $compiled->filepath = $_compile_dir . $_filepath . '.' . $compiled->source->type . $_basename . $_cache . '.php';
-    }
-
-    /**
-     * Normalize Paths "foo/../bar" to "bar"
-     *
-     * @param  string  $_path path to normalize
-     * @param  boolean $ds    respect windows directory separator
-     *
-     * @return string  normalized path
-     */
-    protected function normalizePath($_path, $ds = true)
-    {
-        if ($ds) {
-            // don't we all just love windows?
-            $_path = str_replace('\\', '/', $_path);
-        }
-
-        $offset = 0;
-
-        // resolve simples
-        $_path = preg_replace('#/\./(\./)*#', '/', $_path);
-        // resolve parents
-        while (true) {
-            $_parent = strpos($_path, '/../', $offset);
-            if (!$_parent) {
-                break;
-            } elseif ($_path[$_parent - 1] === '.') {
-                $offset = $_parent + 3;
-                continue;
-            }
-
-            $_pos = strrpos($_path, '/', $_parent - strlen($_path) - 1);
-            if ($_pos === false) {
-                // don't we all just love windows?
-                $_pos = $_parent;
-            }
-
-            $_path = substr_replace($_path, '', $_pos, $_parent + 3 - $_pos);
-        }
-
-        if ($ds && DS != '/') {
-            // don't we all just love windows?
-            $_path = str_replace('/', '\\', $_path);
-        }
-
-        return $_path;
-    }
-
-    /**
-     * build template filepath by traversing the template_dir array
-     *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return string                   fully qualified filepath
-     * @throws SmartyException          if default template handler is registered but not callable
-     */
-    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
     {
-        $file = $source->name;
-        if ($source instanceof Smarty_Config_Source) {
-            $_directories = $source->smarty->getConfigDir();
-            $_default_handler = $source->smarty->default_config_handler_func;
-        } else {
-            $_directories = $source->smarty->getTemplateDir();
-            $_default_handler = $source->smarty->default_template_handler_func;
-        }
-
-        // go relative to a given template?
-        $_file_is_dotted = $file[0] == '.' && ($file[1] == '.' || $file[1] == '/' || $file[1] == "\\");
-        if ($_template && $_template->parent instanceof Smarty_Internal_Template && $_file_is_dotted) {
-            if ($_template->parent->source->type != 'file' && $_template->parent->source->type != 'extends' && !$_template->parent->allow_relative_path) {
-                throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
-            }
-            $file = dirname($_template->parent->source->filepath) . DS . $file;
-            $_file_exact_match = true;
-            if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-                // the path gained from the parent template is relative to the current working directory
-                // as expansions (like include_path) have already been done
-                $file = getcwd() . DS . $file;
+        if ($isConfig) {
+            if (!isset($smarty->_joined_config_dir)) {
+                $smarty->getTemplateDir(null, true);
             }
-        }
-
-        // resolve relative path
-        if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-            // don't we all just love windows?
-            $_path = DS . trim($file, '/');
-            $_was_relative = true;
+            return get_class($this) . '#' . $smarty->_joined_config_dir . '#' . $resource_name;
         } else {
-            // don't we all just love windows?
-            $_path = str_replace('\\', '/', $file);
-        }
-        $_path = $this->normalizePath($_path, false);
-        if (DS != '/') {
-            // don't we all just love windows?
-            $_path = str_replace('/', '\\', $_path);
-        }
-        // revert to relative
-        if (isset($_was_relative)) {
-            $_path = substr($_path, 1);
-        }
-
-        // this is only required for directories
-        $file = rtrim($_path, '/\\');
-
-        // files relative to a template only get one shot
-        if (isset($_file_exact_match)) {
-            return $this->fileExists($source, $file) ? $file : false;
-        }
-
-        // template_dir index?
-        if (preg_match('#^\[(?P<key>[^\]]+)\](?P<file>.+)$#', $file, $match)) {
-            $_directory = null;
-            // try string indexes
-            if (isset($_directories[$match['key']])) {
-                $_directory = $_directories[$match['key']];
-            } elseif (is_numeric($match['key'])) {
-                // try numeric index
-                $match['key'] = (int) $match['key'];
-                if (isset($_directories[$match['key']])) {
-                    $_directory = $_directories[$match['key']];
-                } else {
-                    // try at location index
-                    $keys = array_keys($_directories);
-                    $_directory = $_directories[$keys[$match['key']]];
-                }
-            }
-
-            if ($_directory) {
-                $_file = substr($file, strpos($file, ']') + 1);
-                $_filepath = $_directory . $_file;
-                if ($this->fileExists($source, $_filepath)) {
-                    return $_filepath;
-                }
-            }
-        }
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // relative file name?
-        if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-            foreach ($_directories as $_directory) {
-                $_filepath = $_directory . $file;
-                if ($this->fileExists($source, $_filepath)) {
-                    return $this->normalizePath($_filepath);
-                }
-                if ($source->smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_directory)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $_filepath = stream_resolve_include_path($_filepath);
-                    } else {
-                        $_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath);
-                    }
-
-                    if ($_filepath !== false) {
-                        if ($this->fileExists($source, $_filepath)) {
-                            return $this->normalizePath($_filepath);
-                        }
-                    }
-                }
-            }
-        }
-
-        // try absolute filepath
-        if ($this->fileExists($source, $file)) {
-            return $file;
-        }
-
-        // no tpl file found
-        if ($_default_handler) {
-            if (!is_callable($_default_handler)) {
-                if ($source instanceof Smarty_Config_Source) {
-                    throw new SmartyException("Default config handler not callable");
-                } else {
-                    throw new SmartyException("Default template handler not callable");
-                }
-            }
-            $_return = call_user_func_array($_default_handler,
-                                            array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty));
-            if (is_string($_return)) {
-                $source->timestamp = @filemtime($_return);
-                $source->exists = !!$source->timestamp;
-
-                return $_return;
-            } elseif ($_return === true) {
-                $source->content = $_content;
-                $source->timestamp = $_timestamp;
-                $source->exists = true;
-
-                return $_filepath;
+            if (!isset($smarty->_joined_template_dir)) {
+                $smarty->getTemplateDir();
             }
+            return get_class($this) . '#' . $smarty->_joined_template_dir . '#' . $resource_name;
         }
-
-        // give up
-        return false;
-    }
-
-    /**
-     * test is file exists and save timestamp
-     *
-     * @param  Smarty_Template_Source $source source object
-     * @param  string                 $file   file name
-     *
-     * @return bool                   true if file exists
-     */
-    protected function fileExists(Smarty_Template_Source $source, $file)
-    {
-        $source->timestamp = is_file($file) ? @filemtime($file) : false;
-
-        return $source->exists = !!$source->timestamp;
     }
 
     /**
@@ -374,7 +129,7 @@ abstract class Smarty_Resource
      *
      * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return null;
     }
@@ -391,57 +146,32 @@ abstract class Smarty_Resource
     public static function load(Smarty $smarty, $type)
     {
         // try smarty's cache
-        if (isset($smarty->_resource_handlers[$type])) {
-            return $smarty->_resource_handlers[$type];
+        if (isset($smarty->_cache['resource_handlers'][$type])) {
+            return $smarty->_cache['resource_handlers'][$type];
         }
 
         // try registered resource
         if (isset($smarty->registered_resources[$type])) {
-            if ($smarty->registered_resources[$type] instanceof Smarty_Resource) {
-                $smarty->_resource_handlers[$type] = $smarty->registered_resources[$type];
-                // note registered to smarty is not kept unique!
-                return $smarty->_resource_handlers[$type];
-            }
-
-            if (!isset(self::$resources['registered'])) {
-                self::$resources['registered'] = new Smarty_Internal_Resource_Registered();
-            }
-            if (!isset($smarty->_resource_handlers[$type])) {
-                $smarty->_resource_handlers[$type] = self::$resources['registered'];
-            }
-
-            return $smarty->_resource_handlers[$type];
+            return $smarty->_cache['resource_handlers'][$type] =
+                $smarty->registered_resources[$type] instanceof Smarty_Resource ? $smarty->registered_resources[$type] :
+                    new Smarty_Internal_Resource_Registered();
         }
 
         // try sysplugins dir
         if (isset(self::$sysplugins[$type])) {
-            if (!isset(self::$resources[$type])) {
-                $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
-                self::$resources[$type] = new $_resource_class();
-            }
-
-            return $smarty->_resource_handlers[$type] = self::$resources[$type];
+            $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
+            return $smarty->_cache['resource_handlers'][$type] = new $_resource_class();
         }
 
         // try plugins dir
         $_resource_class = 'Smarty_Resource_' . ucfirst($type);
         if ($smarty->loadPlugin($_resource_class)) {
-            if (isset(self::$resources[$type])) {
-                return $smarty->_resource_handlers[$type] = self::$resources[$type];
-            }
-
             if (class_exists($_resource_class, false)) {
-                self::$resources[$type] = new $_resource_class();
-
-                return $smarty->_resource_handlers[$type] = self::$resources[$type];
+                return $smarty->_cache['resource_handlers'][$type] = new $_resource_class();
             } else {
-                $smarty->registerResource($type, array(
-                    "smarty_resource_{$type}_source",
-                    "smarty_resource_{$type}_timestamp",
-                    "smarty_resource_{$type}_secure",
-                    "smarty_resource_{$type}_trusted"
-                ));
-
+                $smarty->registerResource($type,
+                                          array("smarty_resource_{$type}_source", "smarty_resource_{$type}_timestamp",
+                                                "smarty_resource_{$type}_secure", "smarty_resource_{$type}_trusted"));
                 // give it another try, now that the resource is registered properly
                 return self::load($smarty, $type);
             }
@@ -454,11 +184,7 @@ abstract class Smarty_Resource
             if (is_object($smarty->security_policy)) {
                 $smarty->security_policy->isTrustedStream($type);
             }
-            if (!isset(self::$resources['stream'])) {
-                self::$resources['stream'] = new Smarty_Internal_Resource_Stream();
-            }
-
-            return $smarty->_resource_handlers[$type] = self::$resources['stream'];
+            return $smarty->_cache['resource_handlers'][$type] = new Smarty_Internal_Resource_Stream();
         }
 
         // TODO: try default_(template|config)_handler
@@ -473,57 +199,50 @@ abstract class Smarty_Resource
      *
      * @param  string $resource_name    template_resource or config_resource to parse
      * @param  string $default_resource the default resource_type defined in $smarty
-     * @param  string &$name            the parsed resource name
-     * @param  string &$type            the parsed resource type
      *
-     * @return void
+     * @return array with parsed resource name and type
      */
-    protected static function parseResourceName($resource_name, $default_resource, &$name, &$type)
+    public static function parseResourceName($resource_name, $default_resource)
     {
-        $parts = explode(':', $resource_name, 2);
-        if (!isset($parts[1]) || !isset($parts[0][1])) {
+        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]/', $resource_name, $match)) {
+            $type = $match[1];
+            $name = substr($resource_name, strlen($match[0]));
+        } else {
             // no resource given, use default
             // or single character before the colon is not a resource type, but part of the filepath
             $type = $default_resource;
             $name = $resource_name;
-        } else {
-            $type = $parts[0];
-            $name = $parts[1];
         }
+        return array($name, $type);
     }
 
     /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param  Smarty $smarty        Smarty instance
-     * @param  string $resource_name resource_name to make unique
-     *
-     * @return string unique resource name
-     */
-
-    /**
      * modify template_resource according to resource handlers specifications
      *
-     * @param  Smarty_Internal_template $template          Smarty instance
-     * @param  string                   $template_resource template_resource to extract resource handler and name of
+     * @param  \Smarty_Internal_Template|\Smarty $obj               Smarty instance
+     * @param  string                            $template_resource template_resource to extract resource handler and name of
      *
      * @return string unique resource name
      */
-    public static function getUniqueTemplateName($template, $template_resource)
+    public static function getUniqueTemplateName($obj, $template_resource)
     {
-        self::parseResourceName($template_resource, $template->smarty->default_resource_type, $name, $type);
+        $smarty = $obj->_objType == 2 ? $obj->smarty : $obj;
+        list($name, $type) = self::parseResourceName($template_resource, $smarty->default_resource_type);
         // TODO: optimize for Smarty's internal resource types
-        $resource = Smarty_Resource::load($template->smarty, $type);
+        $resource = Smarty_Resource::load($smarty, $type);
         // go relative to a given template?
-        $_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\");
-        if ($template instanceof Smarty_Internal_Template && $_file_is_dotted && ($template->source->type == 'file' || $template->parent->source->type == 'extends')) {
-            $name = dirname($template->source->filepath) . DS . $name;
+        $_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/');
+        if ($obj->_objType == 2 && $_file_is_dotted &&
+            ($obj->source->type == 'file' || $obj->parent->source->type == 'extends')
+        ) {
+            $name = dirname($obj->source->filepath) . DS . $name;
         }
-        return $resource->buildUniqueResourceName($template->smarty, $name);
+        return $resource->buildUniqueResourceName($smarty, $name);
     }
 
     /**
      * initialize Source Object for given resource
+     * wrapper for backward compatibility to versions < 3.1.22
      * Either [$_template] or [$smarty, $template_resource] must be specified
      *
      * @param  Smarty_Internal_Template $_template         template object
@@ -532,381 +251,10 @@ abstract class Smarty_Resource
      *
      * @return Smarty_Template_Source   Source Object
      */
-    public static function source(Smarty_Internal_Template $_template = null, Smarty $smarty = null, $template_resource = null)
-    {
-        if ($_template) {
-            $smarty = $_template->smarty;
-            $template_resource = $_template->template_resource;
-        }
-
-        // parse resource_name, load resource handler, identify unique resource name
-        self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type);
-        $resource = Smarty_Resource::load($smarty, $type);
-        // go relative to a given template?
-        $_file_is_dotted = isset($name[0]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\");
-        if ($_file_is_dotted && isset($_template) && $_template->parent instanceof Smarty_Internal_Template && ($_template->parent->source->type == 'file' || $_template->parent->source->type == 'extends')) {
-            $name2 = dirname($_template->parent->source->filepath) . DS . $name;
-        } else {
-            $name2 = $name;
-        }
-        $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name2);
-
-        // check runtime cache
-        $_cache_key = 'template|' . $unique_resource_name;
-        if ($smarty->compile_id) {
-            $_cache_key .= '|' . $smarty->compile_id;
-        }
-        if (isset(self::$sources[$_cache_key])) {
-            return self::$sources[$_cache_key];
-        }
-
-        // create source
-        $source = new Smarty_Template_Source($resource, $smarty, $template_resource, $type, $name, $unique_resource_name);
-        $resource->populate($source, $_template);
-
-        // runtime cache
-        self::$sources[$_cache_key] = $source;
-
-        return $source;
-    }
-
-    /**
-     * initialize Config Source Object for given resource
-     *
-     * @param  Smarty_Internal_Config $_config config object
-     *
-     * @throws SmartyException
-     * @return Smarty_Config_Source   Source Object
-     */
-    public static function config(Smarty_Internal_Config $_config)
+    public static function source(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
+                                  $template_resource = null)
     {
-        static $_incompatible_resources = array('eval' => true, 'string' => true, 'extends' => true, 'php' => true);
-        $config_resource = $_config->config_resource;
-        $smarty = $_config->smarty;
-
-        // parse resource_name
-        self::parseResourceName($config_resource, $smarty->default_config_type, $name, $type);
-
-        // make sure configs are not loaded via anything smarty can't handle
-        if (isset($_incompatible_resources[$type])) {
-            throw new SmartyException ("Unable to use resource '{$type}' for config");
-        }
-
-        // load resource handler, identify unique resource name
-        $resource = Smarty_Resource::load($smarty, $type);
-        $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name, true);
-
-        // check runtime cache
-        $_cache_key = 'config|' . $unique_resource_name;
-        if (isset(self::$sources[$_cache_key])) {
-            return self::$sources[$_cache_key];
-        }
-
-        // create source
-        $source = new Smarty_Config_Source($resource, $smarty, $config_resource, $type, $name, $unique_resource_name);
-        $resource->populate($source, null);
-
-        // runtime cache
-        self::$sources[$_cache_key] = $source;
-
-        return $source;
+        return Smarty_Template_Source::load($_template, $smarty, $template_resource);
     }
 }
 
-/**
- * Smarty Resource Data Object
- * Meta Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- * @property integer $timestamp Source Timestamp
- * @property boolean $exists    Source Existence
- * @property boolean $template  Extended Template reference
- * @property string  $content   Source Content
- */
-class Smarty_Template_Source
-{
-    /**
-     * Name of the Class to compile this resource's contents with
-     *
-     * @var string
-     */
-    public $compiler_class = null;
-
-    /**
-     * Name of the Class to tokenize this resource's contents with
-     *
-     * @var string
-     */
-    public $template_lexer_class = null;
-
-    /**
-     * Name of the Class to parse this resource's contents with
-     *
-     * @var string
-     */
-    public $template_parser_class = null;
-
-    /**
-     * Unique Template ID
-     *
-     * @var string
-     */
-    public $uid = null;
-
-    /**
-     * Template Resource (Smarty_Internal_Template::$template_resource)
-     *
-     * @var string
-     */
-    public $resource = null;
-
-    /**
-     * Resource Type
-     *
-     * @var string
-     */
-    public $type = null;
-
-    /**
-     * Resource Name
-     *
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * Unique Resource Name
-     *
-     * @var string
-     */
-    public $unique_resource = null;
-
-    /**
-     * Source Filepath
-     *
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Source is bypassing compiler
-     *
-     * @var boolean
-     */
-    public $uncompiled = null;
-
-    /**
-     * Source must be recompiled on every occasion
-     *
-     * @var boolean
-     */
-    public $recompiled = null;
-
-    /**
-     * The Components an extended template is made of
-     *
-     * @var array
-     */
-    public $components = null;
-
-    /**
-     * Resource Handler
-     *
-     * @var Smarty_Resource
-     */
-    public $handler = null;
-
-    /**
-     * Smarty instance
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * create Source Object container
-     *
-     * @param Smarty_Resource $handler         Resource Handler this source object communicates with
-     * @param Smarty          $smarty          Smarty instance this source object belongs to
-     * @param string          $resource        full template_resource
-     * @param string          $type            type of resource
-     * @param string          $name            resource name
-     * @param string          $unique_resource unique resource name
-     */
-    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
-    {
-        $this->handler = $handler; // Note: prone to circular references
-
-        $this->compiler_class = $handler->compiler_class;
-        $this->template_lexer_class = $handler->template_lexer_class;
-        $this->template_parser_class = $handler->template_parser_class;
-        $this->uncompiled = $this->handler instanceof Smarty_Resource_Uncompiled;
-        $this->recompiled = $this->handler instanceof Smarty_Resource_Recompiled;
-
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-        $this->unique_resource = $unique_resource;
-    }
-
-    /**
-     * get a Compiled Object of this source
-     *
-     * @param  Smarty_Internal_Template|Smarty_Internal_Config $_template template object
-     *
-     * @return Smarty_Template_Compiled compiled object
-     */
-    public function getCompiled($_template)
-    {
-        // check runtime cache
-        $_cache_key = $this->unique_resource . '#' . $_template->compile_id;
-        if (isset(Smarty_Resource::$compileds[$_cache_key])) {
-            return Smarty_Resource::$compileds[$_cache_key];
-        }
-
-        $compiled = new Smarty_Template_Compiled($this);
-        $this->handler->populateCompiledFilepath($compiled, $_template);
-        $compiled->timestamp = @filemtime($compiled->filepath);
-        $compiled->exists = !!$compiled->timestamp;
-
-        // runtime cache
-        Smarty_Resource::$compileds[$_cache_key] = $compiled;
-
-        return $compiled;
-    }
-
-    /**
-     * render the uncompiled source
-     *
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function renderUncompiled(Smarty_Internal_Template $_template)
-    {
-        return $this->handler->renderUncompiled($this, $_template);
-    }
-
-    /**
-     * <<magic>> Generic Setter.
-     *
-     * @param  string $property_name valid: timestamp, exists, content, template
-     * @param  mixed  $value         new value (is not checked)
-     *
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            // regular attributes
-            case 'timestamp':
-            case 'exists':
-            case 'content':
-                // required for extends: only
-            case 'template':
-                $this->$property_name = $value;
-                break;
-
-            default:
-                throw new SmartyException("invalid source property '$property_name'.");
-        }
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * @param  string $property_name valid: timestamp, exists, content
-     *
-     * @return mixed
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'timestamp':
-            case 'exists':
-                $this->handler->populateTimestamp($this);
-
-                return $this->$property_name;
-
-            case 'content':
-                return $this->content = $this->handler->getContent($this);
-
-            default:
-                throw new SmartyException("source property '$property_name' does not exist.");
-        }
-    }
-}
-
-/**
- * Smarty Resource Data Object
- * Meta Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- * @property string $content compiled content
- */
-class Smarty_Template_Compiled
-{
-    /**
-     * Compiled Filepath
-     *
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Compiled Timestamp
-     *
-     * @var integer
-     */
-    public $timestamp = null;
-
-    /**
-     * Compiled Existence
-     *
-     * @var boolean
-     */
-    public $exists = false;
-
-    /**
-     * Compiled Content Loaded
-     *
-     * @var boolean
-     */
-    public $loaded = false;
-
-    /**
-     * Template was compiled
-     *
-     * @var boolean
-     */
-    public $isCompiled = false;
-
-    /**
-     * Source Object
-     *
-     * @var Smarty_Template_Source
-     */
-    public $source = null;
-
-    /**
-     * Metadata properties
-     * populated by Smarty_Internal_Template::decodeProperties()
-     *
-     * @var array
-     */
-    public $_properties = null;
-
-    /**
-     * create Compiled Object container
-     *
-     * @param Smarty_Template_Source $source source object this compiled object belongs to
-     */
-    public function __construct(Smarty_Template_Source $source)
-    {
-        $this->source = $source;
-    }
-}
diff --git a/library/Smarty/libs/sysplugins/smarty_resource_custom.php b/library/Smarty/libs/sysplugins/smarty_resource_custom.php
index 7c11bd8c7..619f2d6f0 100644
--- a/library/Smarty/libs/sysplugins/smarty_resource_custom.php
+++ b/library/Smarty/libs/sysplugins/smarty_resource_custom.php
@@ -88,7 +88,7 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource
      *
      * @return string                 resource's basename
      */
-    protected function getBasename(Smarty_Template_Source $source)
+    public function getBasename(Smarty_Template_Source $source)
     {
         return basename($source->name);
     }
diff --git a/library/Smarty/libs/sysplugins/smarty_resource_recompiled.php b/library/Smarty/libs/sysplugins/smarty_resource_recompiled.php
index 66b36e17a..cfd73401b 100644
--- a/library/Smarty/libs/sysplugins/smarty_resource_recompiled.php
+++ b/library/Smarty/libs/sysplugins/smarty_resource_recompiled.php
@@ -17,6 +17,20 @@
 abstract class Smarty_Resource_Recompiled extends Smarty_Resource
 {
     /**
+     * Flag that it's an recompiled resource
+     *
+     * @var bool
+     */
+    public $recompiled = true;
+
+    /**
+     * Resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = true;
+
+    /**
      * populate Compiled Object with compiled filepath
      *
      * @param  Smarty_Template_Compiled $compiled  compiled object
diff --git a/library/Smarty/libs/sysplugins/smarty_resource_uncompiled.php b/library/Smarty/libs/sysplugins/smarty_resource_uncompiled.php
index 4ee5d7908..88d2bba81 100644
--- a/library/Smarty/libs/sysplugins/smarty_resource_uncompiled.php
+++ b/library/Smarty/libs/sysplugins/smarty_resource_uncompiled.php
@@ -17,6 +17,20 @@
 abstract class Smarty_Resource_Uncompiled extends Smarty_Resource
 {
     /**
+     * Flag that it's an uncompiled resource
+     *
+     * @var bool
+     */
+    public $uncompiled = true;
+
+    /**
+     * Resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = true;
+
+    /**
      * Render and output the template (without using the compiler)
      *
      * @param  Smarty_Template_Source   $source    source object
@@ -38,4 +52,28 @@ abstract class Smarty_Resource_Uncompiled extends Smarty_Resource
         $compiled->timestamp = false;
         $compiled->exists = false;
     }
+
+    /**
+     * render compiled template code
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function render($_template)
+    {
+        $level = ob_get_level();
+        ob_start();
+        try {
+            $this->renderUncompiled($_template->source, $_template);
+            return ob_get_clean();
+        }
+        catch (Exception $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            throw $e;
+        }
+    }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_security.php b/library/Smarty/libs/sysplugins/smarty_security.php
index 9f7183bd0..9d48bcb21 100644
--- a/library/Smarty/libs/sysplugins/smarty_security.php
+++ b/library/Smarty/libs/sysplugins/smarty_security.php
@@ -34,6 +34,7 @@ class Smarty_Security
      * @var integer
      */
     public $php_handling = Smarty::PHP_PASSTHRU;
+
     /**
      * This is the list of template directories that are considered secure.
      * $template_dir is in this list implicitly.
@@ -41,6 +42,7 @@ class Smarty_Security
      * @var array
      */
     public $secure_dir = array();
+
     /**
      * This is an array of directories where trusted php scripts reside.
      * {@link $security} is disabled during their inclusion/execution.
@@ -48,12 +50,21 @@ class Smarty_Security
      * @var array
      */
     public $trusted_dir = array();
+
     /**
      * List of regular expressions (PCRE) that include trusted URIs
      *
      * @var array
      */
     public $trusted_uri = array();
+
+    /**
+     * List of trusted constants names
+     *
+     * @var array
+     */
+    public $trusted_constants = array();
+
     /**
      * This is an array of trusted static classes.
      * If empty access to all static classes is allowed.
@@ -62,6 +73,35 @@ class Smarty_Security
      * @var array
      */
     public $static_classes = array();
+
+    /**
+     * This is an nested array of trusted classes and static methods.
+     * If empty access to all static classes and methods is allowed.
+     * Format:
+     * array (
+     *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
+     *         'class_2' => array(),                       // all methods of class allowed
+     *       )
+     * If set to null none is allowed.
+     *
+     * @var array
+     */
+    public $trusted_static_methods = array();
+
+    /**
+     * This is an array of trusted static properties.
+     * If empty access to all static classes and properties is allowed.
+     * Format:
+     * array (
+     *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+     *         'class_2' => array(),                   // all properties of class allowed
+     *       )
+     * If set to null none is allowed.
+     *
+     * @var array
+     */
+    public $trusted_static_properties = array();
+
     /**
      * This is an array of trusted PHP functions.
      * If empty all functions are allowed.
@@ -69,13 +109,8 @@ class Smarty_Security
      *
      * @var array
      */
-    public $php_functions = array(
-        'isset', 'empty',
-        'count', 'sizeof',
-        'in_array', 'is_array',
-        'time',
-        'nl2br',
-    );
+    public $php_functions = array('isset', 'empty', 'count', 'sizeof', 'in_array', 'is_array', 'time',);
+
     /**
      * This is an array of trusted PHP modifiers.
      * If empty all modifiers are allowed.
@@ -83,10 +118,8 @@ class Smarty_Security
      *
      * @var array
      */
-    public $php_modifiers = array(
-        'escape',
-        'count'
-    );
+    public $php_modifiers = array('escape', 'count', 'nl2br',);
+
     /**
      * This is an array of allowed tags.
      * If empty no restriction by allowed_tags.
@@ -94,6 +127,7 @@ class Smarty_Security
      * @var array
      */
     public $allowed_tags = array();
+
     /**
      * This is an array of disabled tags.
      * If empty no restriction by disabled_tags.
@@ -101,6 +135,7 @@ class Smarty_Security
      * @var array
      */
     public $disabled_tags = array();
+
     /**
      * This is an array of allowed modifier plugins.
      * If empty no restriction by allowed_modifiers.
@@ -108,6 +143,7 @@ class Smarty_Security
      * @var array
      */
     public $allowed_modifiers = array();
+
     /**
      * This is an array of disabled modifier plugins.
      * If empty no restriction by disabled_modifiers.
@@ -115,6 +151,14 @@ class Smarty_Security
      * @var array
      */
     public $disabled_modifiers = array();
+
+    /**
+     * This is an array of disabled special $smarty variables.
+     *
+     * @var array
+     */
+    public $disabled_special_smarty_vars = array();
+
     /**
      * This is an array of trusted streams.
      * If empty all streams are allowed.
@@ -123,12 +167,14 @@ class Smarty_Security
      * @var array
      */
     public $streams = array('file');
+
     /**
      * + flag if constants can be accessed from template
      *
      * @var boolean
      */
     public $allow_constants = true;
+
     /**
      * + flag if super globals can be accessed from template
      *
@@ -137,35 +183,54 @@ class Smarty_Security
     public $allow_super_globals = true;
 
     /**
+     * max template nesting level
+     *
+     * @var int
+     */
+    public $max_template_nesting = 0;
+
+    /**
+     * current template nesting level
+     *
+     * @var int
+     */
+    private $_current_template_nesting = 0;
+
+    /**
      * Cache for $resource_dir lookup
      *
      * @var array
      */
-    protected $_resource_dir = null;
+    protected $_resource_dir = array();
+
     /**
      * Cache for $template_dir lookup
      *
      * @var array
      */
-    protected $_template_dir = null;
+    protected $_template_dir = array();
+
     /**
      * Cache for $config_dir lookup
      *
      * @var array
      */
-    protected $_config_dir = null;
+    protected $_config_dir = array();
+
     /**
      * Cache for $secure_dir lookup
      *
      * @var array
      */
-    protected $_secure_dir = null;
+    protected $_secure_dir = array();
+
     /**
      * Cache for $php_resource_dir lookup
      *
      * @var array
      */
     protected $_php_resource_dir = null;
+
     /**
      * Cache for $trusted_dir lookup
      *
@@ -174,6 +239,20 @@ class Smarty_Security
     protected $_trusted_dir = null;
 
     /**
+     * Cache for include path status
+     *
+     * @var bool
+     */
+    protected $_include_path_status = false;
+
+    /**
+     * Cache for $_include_array lookup
+     *
+     * @var array
+     */
+    protected $_include_dir = array();
+
+    /**
      * @param Smarty $smarty
      */
     public function __construct($smarty)
@@ -192,7 +271,9 @@ class Smarty_Security
      */
     public function isTrustedPhpFunction($function_name, $compiler)
     {
-        if (isset($this->php_functions) && (empty($this->php_functions) || in_array($function_name, $this->php_functions))) {
+        if (isset($this->php_functions) &&
+            (empty($this->php_functions) || in_array($function_name, $this->php_functions))
+        ) {
             return true;
         }
 
@@ -212,7 +293,9 @@ class Smarty_Security
      */
     public function isTrustedStaticClass($class_name, $compiler)
     {
-        if (isset($this->static_classes) && (empty($this->static_classes) || in_array($class_name, $this->static_classes))) {
+        if (isset($this->static_classes) &&
+            (empty($this->static_classes) || in_array($class_name, $this->static_classes))
+        ) {
             return true;
         }
 
@@ -222,6 +305,45 @@ class Smarty_Security
     }
 
     /**
+     * Check if static class method/property is trusted.
+     *
+     * @param  string $class_name
+     * @param  string $params
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if class method is trusted
+     * @throws SmartyCompilerException if static class method is not trusted
+     */
+    public function isTrustedStaticClassAccess($class_name, $params, $compiler)
+    {
+        if (!isset($params[2])) {
+            // fall back
+            return $this->isTrustedStaticClass($class_name, $compiler);
+        }
+        if ($params[2] == 'method') {
+            $allowed = $this->trusted_static_methods;
+            $name = substr($params[0], 0, strpos($params[0], '('));
+        } else {
+            $allowed = $this->trusted_static_properties;
+            // strip '$'
+            $name = substr($params[0], 1);
+        }
+        if (isset($allowed)) {
+            if (empty($allowed)) {
+                // fall back
+                return $this->isTrustedStaticClass($class_name, $compiler);
+            }
+            if (isset($allowed[$class_name]) &&
+                (empty($allowed[$class_name]) || in_array($name, $allowed[$class_name]))
+            ) {
+                return true;
+            }
+        }
+        $compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
      * Check if PHP modifier is trusted.
      *
      * @param  string $modifier_name
@@ -232,7 +354,9 @@ class Smarty_Security
      */
     public function isTrustedPhpModifier($modifier_name, $compiler)
     {
-        if (isset($this->php_modifiers) && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))) {
+        if (isset($this->php_modifiers) &&
+            (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))
+        ) {
             return true;
         }
 
@@ -253,9 +377,11 @@ class Smarty_Security
     public function isTrustedTag($tag_name, $compiler)
     {
         // check for internal always required tags
-        if (in_array($tag_name, array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin', 'private_object_block_function',
-                                      'private_object_function', 'private_registered_function', 'private_registered_block', 'private_special_variable', 'private_print_expression', 'private_modifier'))
-        ) {
+        if (in_array($tag_name, array('assign', 'call', 'private_filter', 'private_block_plugin',
+                                      'private_function_plugin', 'private_object_block_function',
+                                      'private_object_function', 'private_registered_function',
+                                      'private_registered_block', 'private_special_variable',
+                                      'private_print_expression', 'private_modifier'))) {
             return true;
         }
         // check security settings
@@ -263,12 +389,32 @@ class Smarty_Security
             if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
                 return true;
             } else {
-                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true);
             }
         } elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
             return true;
         } else {
-            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
+        }
+
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if special $smarty variable is trusted.
+     *
+     * @param  string $var_name
+     * @param  object $compiler compiler object
+     *
+     * @return boolean                 true if tag is trusted
+     * @throws SmartyCompilerException if modifier is not trusted
+     */
+    public function isTrustedSpecialSmartyVar($var_name, $compiler)
+    {
+        if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
+            return true;
+        } else {
+            $compiler->trigger_template_error("special variable '\$smarty.{$var_name}' not allowed by security setting", null, true);
         }
 
         return false; // should not, but who knows what happens to the compiler in the future?
@@ -294,18 +440,47 @@ class Smarty_Security
             if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
                 return true;
             } else {
-                $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", $compiler->lex->taglineno);
+                $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", null, true);
             }
-        } elseif (in_array($modifier_name, $this->allowed_modifiers) && !in_array($modifier_name, $this->disabled_modifiers)) {
+        } elseif (in_array($modifier_name, $this->allowed_modifiers) &&
+            !in_array($modifier_name, $this->disabled_modifiers)
+        ) {
             return true;
         } else {
-            $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", $compiler->lex->taglineno);
+            $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", null, true);
         }
 
         return false; // should not, but who knows what happens to the compiler in the future?
     }
 
     /**
+     * Check if constants are enabled or trusted
+     *
+     * @param  string $const    constant name
+     * @param  object $compiler compiler object
+     *
+     * @return bool
+     */
+    public function isTrustedConstant($const, $compiler)
+    {
+        if (in_array($const, array('true', 'false', 'null'))) {
+            return true;
+        }
+        if (!empty($this->trusted_constants)) {
+            if (!in_array($const, $this->trusted_constants)) {
+                $compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
+                return false;
+            }
+            return true;
+        }
+        if ($this->allow_constants) {
+            return true;
+        }
+        $compiler->trigger_template_error("Security: access to constants not permitted");
+        return false;
+    }
+
+    /**
      * Check if stream is trusted.
      *
      * @param  string $stream_name
@@ -325,81 +500,70 @@ class Smarty_Security
     /**
      * Check if directory of file resource is trusted.
      *
-     * @param  string $filepath
+     * @param  string   $filepath
+     * @param null|bool $isConfig
      *
-     * @return boolean         true if directory is trusted
-     * @throws SmartyException if directory is not trusted
+     * @return bool true if directory is trusted
+     * @throws \SmartyException if directory is not trusted
      */
-    public function isTrustedResourceDir($filepath)
+    public function isTrustedResourceDir($filepath, $isConfig = null)
     {
-        $_template = false;
-        $_config = false;
-        $_secure = false;
-
-        $_template_dir = $this->smarty->getTemplateDir();
-        $_config_dir = $this->smarty->getConfigDir();
-
-        // check if index is outdated
-        if ((!$this->_template_dir || $this->_template_dir !== $_template_dir)
-            || (!$this->_config_dir || $this->_config_dir !== $_config_dir)
-            || (!empty($this->secure_dir) && (!$this->_secure_dir || $this->_secure_dir !== $this->secure_dir))
-        ) {
-            $this->_resource_dir = array();
-            $_template = true;
-            $_config = true;
-            $_secure = !empty($this->secure_dir);
-        }
-
-        // rebuild template dir index
-        if ($_template) {
-            $this->_template_dir = $_template_dir;
-            foreach ($_template_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
+        if ($this->_include_path_status !== $this->smarty->use_include_path) {
+            foreach ($this->_include_dir as $directory) {
+                unset($this->_resource_dir[$directory]);
+            }
+            if ($this->smarty->use_include_path) {
+                $this->_include_dir = array();
+                $_dirs = $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty);
+                foreach ($_dirs as $directory) {
+                    $this->_include_dir[] = $directory;
+                    $this->_resource_dir[$directory] = true;
+                }
             }
+            $this->_include_path_status = $this->smarty->use_include_path;
         }
-
-        // rebuild config dir index
-        if ($_config) {
-            $this->_config_dir = $_config_dir;
-            foreach ($_config_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
+        if ($isConfig !== true &&
+            (!isset($this->smarty->_cache['template_dir_new']) || $this->smarty->_cache['template_dir_new'])
+        ) {
+            $_dir = $this->smarty->getTemplateDir();
+            if ($this->_template_dir !== $_dir) {
+                foreach ($this->_template_dir as $directory) {
+                    unset($this->_resource_dir[$directory]);
+                }
+                foreach ($_dir as $directory) {
+                    $this->_resource_dir[$directory] = true;
+                }
+                $this->_template_dir = $_dir;
             }
+            $this->smarty->_cache['template_dir_new'] = false;
         }
-
-        // rebuild secure dir index
-        if ($_secure) {
-            $this->_secure_dir = $this->secure_dir;
-            foreach ((array) $this->secure_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
+        if ($isConfig !== false &&
+            (!isset($this->smarty->_cache['config_dir_new']) || $this->smarty->_cache['config_dir_new'])
+        ) {
+            $_dir = $this->smarty->getConfigDir();
+            if ($this->_config_dir !== $_dir) {
+                foreach ($this->_config_dir as $directory) {
+                    unset($this->_resource_dir[$directory]);
+                }
+                foreach ($_dir as $directory) {
+                    $this->_resource_dir[$directory] = true;
+                }
+                $this->_config_dir = $_dir;
             }
+            $this->smarty->_cache['config_dir_new'] = false;
         }
-
-        $_filepath = realpath($filepath);
-        $directory = dirname($_filepath);
-        $_directory = array();
-        while (true) {
-            // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[$directory] = true;
-            // test if the directory is trusted
-            if (isset($this->_resource_dir[$directory])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
-                $this->_resource_dir = array_merge($this->_resource_dir, $_directory);
-
-                return true;
+        if ($this->_secure_dir !== (array) $this->secure_dir) {
+            foreach ($this->_secure_dir as $directory) {
+                unset($this->_resource_dir[$directory]);
             }
-            // abort if we've reached root
-            if (($pos = strrpos($directory, DS)) === false || !isset($directory[1])) {
-                break;
+            foreach ((array) $this->secure_dir as $directory) {
+                $directory = $this->smarty->_realpath($directory . DS, true);
+                $this->_resource_dir[$directory] = true;
             }
-            // bubble up one level
-            $directory = substr($directory, 0, $pos);
+            $this->_secure_dir = (array) $this->secure_dir;
         }
-
-        // give up
-        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
+        $this->_resource_dir = $this->_checkDir($filepath, $this->_resource_dir);
+        return true;
     }
 
     /**
@@ -449,32 +613,103 @@ class Smarty_Security
 
             $this->_trusted_dir = $this->trusted_dir;
             foreach ((array) $this->trusted_dir as $directory) {
-                $directory = realpath($directory);
+                $directory = $this->smarty->_realpath($directory . DS, true);
                 $this->_php_resource_dir[$directory] = true;
             }
         }
 
-        $_filepath = realpath($filepath);
-        $directory = dirname($_filepath);
+        $this->_php_resource_dir = $this->_checkDir($this->smarty->_realpath($filepath, true), $this->_php_resource_dir);
+        return true;
+    }
+
+    /**
+     * Start template processing
+     *
+     * @param $template
+     *
+     * @throws SmartyException
+     */
+    public function startTemplate($template)
+    {
+        if ($this->max_template_nesting > 0 && $this->_current_template_nesting ++ >= $this->max_template_nesting) {
+            throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
+        }
+    }
+
+    /**
+     * Exit template processing
+     *
+     * @internal param $template
+     */
+    public function exitTemplate()
+    {
+        if ($this->max_template_nesting > 0) {
+            $this->_current_template_nesting --;
+        }
+    }
+
+    /**
+     * Check if file is inside a valid directory
+     *
+     * @param string $filepath
+     * @param array  $dirs valid directories
+     *
+     * @return array
+     * @throws \SmartyException
+     */
+    private function _checkDir($filepath, $dirs)
+    {
+        $directory = dirname($filepath) . DS;
         $_directory = array();
         while (true) {
             // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[] = $directory;
+            $_directory[$directory] = true;
             // test if the directory is trusted
-            if (isset($this->_php_resource_dir[$directory])) {
+            if (isset($dirs[$directory])) {
                 // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
-                $this->_php_resource_dir = array_merge($this->_php_resource_dir, $_directory);
+                $dirs = array_merge($dirs, $_directory);
 
-                return true;
+                return $dirs;
             }
             // abort if we've reached root
-            if (($pos = strrpos($directory, DS)) === false || !isset($directory[2])) {
+            if (!preg_match('#[\\\/][^\\\/]+[\\\/]$#', $directory)) {
                 break;
             }
             // bubble up one level
-            $directory = substr($directory, 0, $pos);
+            $directory = preg_replace('#[\\\/][^\\\/]+[\\\/]$#', DS, $directory);
         }
 
-        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
+        // give up
+        throw new SmartyException("directory '{$filepath}' not allowed by security setting");
+    }
+
+    /**
+     * Loads security class and enables security
+     *
+     * @param \Smarty                 $smarty
+     * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
+     *
+     * @return \Smarty current Smarty instance for chaining
+     * @throws \SmartyException when an invalid class name is provided
+     */
+    public static function enableSecurity(Smarty $smarty, $security_class)
+    {
+        if ($security_class instanceof Smarty_Security) {
+            $smarty->security_policy = $security_class;
+            return;
+        } elseif (is_object($security_class)) {
+            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
+        }
+        if ($security_class == null) {
+            $security_class = $smarty->security_class;
+        }
+        if (!class_exists($security_class)) {
+            throw new SmartyException("Security class '$security_class' is not defined");
+        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
+            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
+        } else {
+            $smarty->security_policy = new $security_class($smarty);
+        }
+        return;
     }
 }
diff --git a/library/Smarty/libs/sysplugins/smarty_template_cached.php b/library/Smarty/libs/sysplugins/smarty_template_cached.php
new file mode 100644
index 000000000..cecf42986
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_template_cached.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Uwe Tews
+ * Date: 04.12.2014
+ * Time: 06:08
+ */
+
+/**
+ * Smarty Resource Data Object
+ * Cache Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+class Smarty_Template_Cached extends Smarty_Template_Resource_Base
+{
+    /**
+     * Cache Is Valid
+     *
+     * @var boolean
+     */
+    public $valid = null;
+
+    /**
+     * CacheResource Handler
+     *
+     * @var Smarty_CacheResource
+     */
+    public $handler = null;
+
+    /**
+     * Template Cache Id (Smarty_Internal_Template::$cache_id)
+     *
+     * @var string
+     */
+    public $cache_id = null;
+
+    /**
+     * saved cache lifetime in seconds
+     *
+     * @var integer
+     */
+    public $cache_lifetime = 0;
+
+    /**
+     * Id for cache locking
+     *
+     * @var string
+     */
+    public $lock_id = null;
+
+    /**
+     * flag that cache is locked by this instance
+     *
+     * @var bool
+     */
+    public $is_locked = false;
+
+    /**
+     * Source Object
+     *
+     * @var Smarty_Template_Source
+     */
+    public $source = null;
+
+    /**
+     * Nocache hash codes of processed compiled templates
+     *
+     * @var array
+     */
+    public $hashes = array();
+
+    /**
+     * create Cached Object container
+     *
+     * @param Smarty_Internal_Template $_template template object
+     */
+    public function __construct(Smarty_Internal_Template $_template)
+    {
+        $this->compile_id = $_template->compile_id;
+        $this->cache_id = $_template->cache_id;
+        $this->source = $_template->source;
+        if (!class_exists('Smarty_CacheResource', false)) {
+            require SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
+        }
+        $this->handler = Smarty_CacheResource::load($_template->smarty);
+    }
+
+    /**
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return Smarty_Template_Cached
+     */
+    static function load(Smarty_Internal_Template $_template)
+    {
+        $_template->cached = new Smarty_Template_Cached($_template);
+        $_template->cached->handler->populate($_template->cached, $_template);
+        // caching enabled ?
+        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT ||
+                $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->handler->recompiled
+        ) {
+            $_template->cached->valid = false;
+        }
+        return $_template->cached;
+    }
+
+    /**
+     * Render cache template
+     *
+     * @param \Smarty_Internal_Template $_template
+     * @param  bool                     $no_output_filter
+     *
+     * @throws \Exception
+     */
+    public function render(Smarty_Internal_Template $_template, $no_output_filter = true)
+    {
+        if ($this->isCached($_template)) {
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->start_cache($_template);
+            }
+            if (!$this->processed) {
+                $this->process($_template);
+            }
+            $this->getRenderedTemplateCode($_template);
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->end_cache($_template);
+            }
+            return;
+        } else {
+            $_template->smarty->ext->_updateCache->updateCache($this, $_template, $no_output_filter);
+        }
+    }
+
+    /**
+     * Check if cache is valid, lock cache if required
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @return bool flag true if cache is valid
+     */
+    public function isCached(Smarty_Internal_Template $_template)
+    {
+        if ($this->valid !== null) {
+            return $this->valid;
+        }
+        while (true) {
+            while (true) {
+                if ($this->exists === false || $_template->smarty->force_compile || $_template->smarty->force_cache) {
+                    $this->valid = false;
+                } else {
+                    $this->valid = true;
+                }
+                if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT &&
+                    $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
+                ) {
+                    // lifetime expired
+                    $this->valid = false;
+                }
+                if ($this->valid && $_template->smarty->compile_check == 1 &&
+                    $_template->source->getTimeStamp() > $this->timestamp
+                ) {
+                    $this->valid = false;
+                }
+                if ($this->valid || !$_template->smarty->cache_locking) {
+                    break;
+                }
+                if (!$this->handler->locked($_template->smarty, $this)) {
+                    $this->handler->acquireLock($_template->smarty, $this);
+                    break 2;
+                }
+                $this->handler->populate($this, $_template);
+            }
+            if ($this->valid) {
+                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
+                    // load cache file for the following checks
+                    if ($_template->smarty->debugging) {
+                        $_template->smarty->_debug->start_cache($_template);
+                    }
+                    if ($this->handler->process($_template, $this) === false) {
+                        $this->valid = false;
+                    } else {
+                        $this->processed = true;
+                    }
+                    if ($_template->smarty->debugging) {
+                        $_template->smarty->_debug->end_cache($_template);
+                    }
+                } else {
+                    $this->is_locked = true;
+                    continue;
+                }
+            } else {
+                return $this->valid;
+            }
+            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED &&
+                $_template->cached->cache_lifetime >= 0 &&
+                (time() > ($_template->cached->timestamp + $_template->cached->cache_lifetime))
+            ) {
+                $this->valid = false;
+            }
+            if ($_template->smarty->cache_locking) {
+                if (!$this->valid) {
+                    $this->handler->acquireLock($_template->smarty, $this);
+                } elseif ($this->is_locked) {
+                    $this->handler->releaseLock($_template->smarty, $this);
+                }
+            }
+            return $this->valid;
+        }
+        return $this->valid;
+    }
+
+    /**
+     * Process cached template
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param bool                     $update    flag if called because cache update
+     */
+    public function process(Smarty_Internal_Template $_template, $update = false)
+    {
+        if ($this->handler->process($_template, $this, $update) === false) {
+            $this->valid = false;
+        }
+        if ($this->valid) {
+            $this->processed = true;
+        } else {
+            $this->processed = false;
+        }
+    }
+
+    /**
+     * Read cache content from handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string content
+     */
+    public function read(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->handler->recompiled) {
+            return $this->handler->readCachedContent($_template);
+        }
+        return false;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_template_compiled.php b/library/Smarty/libs/sysplugins/smarty_template_compiled.php
new file mode 100644
index 000000000..e7710f85e
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_template_compiled.php
@@ -0,0 +1,297 @@
+<?php
+
+/**
+ * Smarty Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ * @property string $content compiled content
+ */
+class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
+{
+
+    /**
+     * nocache hash
+     *
+     * @var string|null
+     */
+    public $nocache_hash = null;
+
+    /**
+     * get a Compiled Object of this source
+     *
+     * @param  Smarty_Internal_Template $_template template object
+     *
+     * @return Smarty_Template_Compiled compiled object
+     */
+    static function load($_template)
+    {
+        // check runtime cache
+        if (!$_template->source->handler->recompiled &&
+            ($_template->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
+        ) {
+            $_cache_key = $_template->source->unique_resource . '#';
+            if ($_template->caching) {
+                $_cache_key .= 'caching#';
+            }
+            $_cache_key .= $_template->compile_id;
+            if (isset($_template->source->compileds[$_cache_key])) {
+                return $_template->source->compileds[$_cache_key];
+            }
+        }
+        $compiled = new Smarty_Template_Compiled();
+        if ($_template->source->handler->hasCompiledHandler) {
+            $_template->source->handler->populateCompiledFilepath($compiled, $_template);
+        } else {
+            $compiled->populateCompiledFilepath($_template);
+        }
+        // runtime cache
+        if (!$_template->source->handler->recompiled &&
+            ($_template->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON)
+        ) {
+            $_template->source->compileds[$_cache_key] = $compiled;
+        }
+        return $compiled;
+    }
+
+    /**
+     * populate Compiled Object with compiled filepath
+     *
+     * @param Smarty_Internal_Template $_template template object
+     **/
+    public function populateCompiledFilepath(Smarty_Internal_Template $_template)
+    {
+        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w]+!', '_', $_template->compile_id) : null;
+        if ($_template->source->isConfig) {
+            $_flag = '_' .
+                ((int) $_template->smarty->config_read_hidden + (int) $_template->smarty->config_booleanize * 2 +
+                    (int) $_template->smarty->config_overwrite * 4);
+        } else {
+            $_flag =
+                '_' . ((int) $_template->smarty->merge_compiled_includes + (int) $_template->smarty->escape_html * 2);
+        }
+        $_filepath = $_template->source->uid . $_flag;
+        // if use_sub_dirs, break file into directories
+        if ($_template->smarty->use_sub_dirs) {
+            $_filepath = substr($_filepath, 0, 2) . DS . substr($_filepath, 2, 2) . DS . substr($_filepath, 4, 2) . DS .
+                $_filepath;
+        }
+        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
+        if (isset($_compile_id)) {
+            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
+        }
+        // caching token
+        if ($_template->caching) {
+            $_cache = '.cache';
+        } else {
+            $_cache = '';
+        }
+        $_compile_dir = $_template->smarty->getCompileDir();
+        // set basename if not specified
+        $_basename = $_template->source->handler->getBasename($_template->source);
+        if ($_basename === null) {
+            $_basename = basename(preg_replace('![^\w]+!', '_', $_template->source->name));
+        }
+        // separate (optional) basename by dot
+        if ($_basename) {
+            $_basename = '.' . $_basename;
+        }
+
+        $this->filepath = $_compile_dir . $_filepath . '.' . $_template->source->type . $_basename . $_cache . '.php';
+        $this->exists = is_file($this->filepath);
+        if (!$this->exists) {
+            $this->timestamp = false;
+        }
+    }
+
+    /**
+     * load compiled template or compile from source
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @throws Exception
+     */
+    public function process(Smarty_Internal_Template $_template)
+    {
+        $_smarty_tpl = $_template;
+        if ($_template->source->handler->recompiled || !$_template->compiled->exists ||
+            $_template->smarty->force_compile || ($_template->smarty->compile_check &&
+                $_template->source->getTimeStamp() > $_template->compiled->getTimeStamp())
+        ) {
+            $this->compileTemplateSource($_template);
+            $compileCheck = $_template->smarty->compile_check;
+            $_template->smarty->compile_check = false;
+            if ($_template->source->handler->recompiled) {
+                $level = ob_get_level();
+                ob_start();
+                try {
+                    eval("?>" . $this->content);
+                }
+                catch (Exception $e) {
+                    while (ob_get_level() > $level) {
+                        ob_end_clean();
+                    }
+                    throw $e;
+                }
+                ob_get_clean();
+                $this->content = null;
+            } else {
+                $this->loadCompiledTemplate($_template);
+            }
+            $_template->smarty->compile_check = $compileCheck;
+        } else {
+            $_template->mustCompile = true;
+            @include($_template->compiled->filepath);
+            if ($_template->mustCompile) {
+                $this->compileTemplateSource($_template);
+                $compileCheck = $_template->smarty->compile_check;
+                $_template->smarty->compile_check = false;
+                $this->loadCompiledTemplate($_template);
+                $_template->smarty->compile_check = $compileCheck;
+            }
+        }
+        $_template->smarty->ext->_subTemplate->registerSubTemplates($_template);
+
+        $this->processed = true;
+    }
+
+    /**
+     * Load fresh compiled template by including the PHP file
+     * HHVM requires a work around because of a PHP incompatibility
+     *
+     * @param \Smarty_Internal_Template $_template
+     */
+    private function loadCompiledTemplate(Smarty_Internal_Template $_template)
+    {
+        if (function_exists('opcache_invalidate')) {
+            opcache_invalidate($_template->compiled->filepath);
+        }
+        $_smarty_tpl = $_template;
+        if (defined('HHVM_VERSION')) {
+            $_template->smarty->ext->_hhvm->includeHhvm($_template, $_template->compiled->filepath);
+        } else {
+            include($_template->compiled->filepath);
+        }
+    }
+
+    /**
+     * render compiled template code
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function render(Smarty_Internal_Template $_template)
+    {
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->start_render($_template);
+        }
+        if (!$this->processed) {
+            $this->process($_template);
+        }
+        if (isset($_template->cached)) {
+            $_template->cached->file_dependency =
+                array_merge($_template->cached->file_dependency, $this->file_dependency);
+        }
+        $this->getRenderedTemplateCode($_template);
+        if ($_template->caching && $this->has_nocache_code) {
+            $_template->cached->hashes[$this->nocache_hash] = true;
+        }
+        if (isset($_template->parent) && $_template->parent->_objType == 2 && !empty($_template->tpl_function)) {
+            $_template->parent->tpl_function = array_merge($_template->parent->tpl_function, $_template->tpl_function);
+        }
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->end_render($_template);
+        }
+    }
+
+    /**
+     * compile template from source
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function compileTemplateSource(Smarty_Internal_Template $_template)
+    {
+        $_template->source->compileds = array();
+        $this->file_dependency = array();
+        $this->tpl_function = array();
+        $this->includes = array();
+        $this->nocache_hash = null;
+        $this->unifunc = null;
+        // compile locking
+        if (!$_template->source->handler->recompiled) {
+            if ($saved_timestamp = $_template->compiled->getTimeStamp()) {
+                touch($_template->compiled->filepath);
+            }
+        }
+        // call compiler
+        try {
+            $_template->loadCompiler();
+            $code = $_template->compiler->compileTemplate($_template);
+        }
+        catch (Exception $e) {
+            // restore old timestamp in case of error
+            if (!$_template->source->handler->recompiled && $saved_timestamp) {
+                touch($_template->compiled->filepath, $saved_timestamp);
+            }
+            throw $e;
+        }
+        // compiling succeeded
+        if ($_template->compiler->write_compiled_code) {
+            // write compiled template
+            $this->write($_template, $code);
+            $code = '';
+        }
+        // release compiler object to free memory
+        unset($_template->compiler);
+        return $code;
+    }
+
+    /**
+     * Write compiled code by handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $code      compiled code
+     *
+     * @return boolean success
+     */
+    public function write(Smarty_Internal_Template $_template, $code)
+    {
+        if (!$_template->source->handler->recompiled) {
+            if ($_template->smarty->ext->_writeFile->writeFile($this->filepath, $code, $_template->smarty) === true) {
+                $this->timestamp = $this->exists = is_file($this->filepath);
+                if ($this->exists) {
+                    $this->timestamp = filemtime($this->filepath);
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            $this->content = $code;
+        }
+        $this->timestamp = time();
+        $this->exists = true;
+        return true;
+    }
+
+    /**
+     * Read compiled content from handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string content
+     */
+    public function read(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->handler->recompiled) {
+            return file_get_contents($this->filepath);
+        }
+        return isset($this->content) ? $this->content : false;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_template_config.php b/library/Smarty/libs/sysplugins/smarty_template_config.php
new file mode 100644
index 000000000..f0fff5080
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_template_config.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Smarty Config Source Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Connfig Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ *
+ */
+class Smarty_Template_Config extends Smarty_Template_Source
+{
+    /**
+     * array of section names, single section or null
+     *
+     * @var null|string|array
+     */
+    public $config_sections = null;
+
+    /**
+     * scope into which the config variables shall be loaded
+     *
+     * @var string
+     */
+    public $scope = 'local';
+
+    /**
+     * Flag that source is a config file
+     *
+     * @var bool
+     */
+    public $isConfig = true;
+
+    /**
+     * create Source Object container
+     *
+     * @param Smarty_Resource $handler  Resource Handler this source object communicates with
+     * @param Smarty          $smarty   Smarty instance this source object belongs to
+     * @param string          $resource full template_resource
+     * @param string          $type     type of resource
+     * @param string          $name     resource name
+     */
+    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name)
+    {
+        // must clone handler as we change class names
+        $this->handler = clone $handler; // Note: prone to circular references
+        $this->handler->compiler_class = 'Smarty_Internal_Config_File_Compiler';
+        $this->handler->template_lexer_class = 'Smarty_Internal_Configfilelexer';
+        $this->handler->template_parser_class = 'Smarty_Internal_Configfileparser';
+        $this->resource = $resource;
+        $this->type = $type;
+        $this->name = $name;
+        $this->smarty = $smarty;
+    }
+
+    /**
+     * initialize Source Object for given resource
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param  Smarty_Internal_Template $_template         template object
+     * @param  Smarty                   $smarty            smarty object
+     * @param  string                   $template_resource resource identifier
+     *
+     * @return Smarty_Template_Config Source Object
+     * @throws SmartyException
+     */
+    public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null, $template_resource = null)
+    {
+        static $_incompatible_resources = array('extends' => true, 'php' => true);
+        $template_resource = $_template->template_resource;
+        if (empty($template_resource)) {
+            throw new SmartyException('Missing config name');
+        }
+        // parse resource_name, load resource handler
+        list($name, $type) = Smarty_Resource::parseResourceName($template_resource, $_template->smarty->default_config_type);
+        // make sure configs are not loaded via anything smarty can't handle
+        if (isset($_incompatible_resources[$type])) {
+            throw new SmartyException ("Unable to use resource '{$type}' for config");
+        }
+        $resource = Smarty_Resource::load($_template->smarty, $type);
+        $source = new Smarty_Template_Config($resource, $_template->smarty, $template_resource, $type, $name);
+        $resource->populate($source, $_template);
+        if (!$source->exists && isset($_template->smarty->default_config_handler_func)) {
+            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
+        }
+        $source->unique_resource = $resource->buildUniqueResourceName($_template->smarty, $name, true);
+        return $source;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_template_resource_base.php b/library/Smarty/libs/sysplugins/smarty_template_resource_base.php
new file mode 100644
index 000000000..b9e2e2830
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_template_resource_base.php
@@ -0,0 +1,162 @@
+<?php
+
+/**
+ * Smarty Template Resource Base Object
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_Template_Resource_Base
+{
+    /**
+     * Compiled Filepath
+     *
+     * @var string
+     */
+    public $filepath = null;
+
+    /**
+     * Compiled Timestamp
+     *
+     * @var integer
+     */
+    public $timestamp = null;
+
+    /**
+     * Compiled Existence
+     *
+     * @var boolean
+     */
+    public $exists = false;
+
+    /**
+     * Template Compile Id (Smarty_Internal_Template::$compile_id)
+     *
+     * @var string
+     */
+    public $compile_id = null;
+
+    /**
+     * Compiled Content Loaded
+     *
+     * @var boolean
+     */
+    public $processed = false;
+
+    /**
+     * unique function name for compiled template code
+     *
+     * @var string
+     */
+    public $unifunc = '';
+
+    /**
+     * flag if template does contain nocache code sections
+     *
+     * @var bool
+     */
+    public $has_nocache_code = false;
+
+    /**
+     * resource file dependency
+     *
+     * @var array
+     */
+    public $file_dependency = array();
+
+    /**
+     * Content buffer
+     *
+     * @var string
+     */
+    public $content = null;
+
+    /**
+     * required plugins
+     *
+     * @var array
+     */
+    public $required_plugins = array();
+
+    /**
+     * Known template functions
+     *
+     * @var array
+     */
+    public $tpl_function = array();
+
+    /**
+     * Included subtemplates
+     *
+     * @var array
+     */
+    public $includes = array();
+
+    /**
+     * Process resource
+     *
+     * @param Smarty_Internal_Template $_template template object
+     */
+    abstract public function process(Smarty_Internal_Template $_template);
+
+     /**
+     * get rendered template content by calling compiled or cached template code
+     *
+     * @param string $unifunc function with template code
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function getRenderedTemplateCode(Smarty_Internal_Template $_template, $unifunc = null)
+    {
+        $unifunc = isset($unifunc) ? $unifunc : $this->unifunc;
+        $level = ob_get_level();
+        try {
+            if (empty($unifunc) || !is_callable($unifunc)) {
+                throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");
+            }
+            if (isset($_template->smarty->security_policy)) {
+                $_template->smarty->security_policy->startTemplate($_template);
+            }
+            //
+            // render compiled or saved template code
+            //
+            if (!isset($_template->_cache['capture_stack'])) {
+                $_template->_cache['capture_stack'] = array();
+            }
+            $_saved_capture_level = count($_template->_cache['capture_stack']);
+            $unifunc($_template);
+            // any unclosed {capture} tags ?
+            if ($_saved_capture_level != count($_template->_cache['capture_stack'])) {
+                $_template->capture_error();
+            }
+            if (isset($_template->smarty->security_policy)) {
+                $_template->smarty->security_policy->exitTemplate();
+            }
+            return null;
+        }
+        catch (Exception $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+             if (isset($_template->smarty->security_policy)) {
+                $_template->smarty->security_policy->exitTemplate();
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Get compiled time stamp
+     *
+     * @return int
+     */
+    public function getTimeStamp()
+    {
+        if ($this->exists && !isset($this->timestamp)) {
+            $this->timestamp = @filemtime($this->filepath);
+        }
+        return $this->timestamp;
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_template_source.php b/library/Smarty/libs/sysplugins/smarty_template_source.php
new file mode 100644
index 000000000..be5b62809
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_template_source.php
@@ -0,0 +1,267 @@
+<?php
+
+/**
+ * Smarty Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ *
+ */
+class Smarty_Template_Source
+{
+    /**
+     * Unique Template ID
+     *
+     * @var string
+     */
+    public $uid = null;
+
+    /**
+     * Template Resource (Smarty_Internal_Template::$template_resource)
+     *
+     * @var string
+     */
+    public $resource = null;
+
+    /**
+     * Resource Type
+     *
+     * @var string
+     */
+    public $type = null;
+
+    /**
+     * Resource Name
+     *
+     * @var string
+     */
+    public $name = null;
+
+    /**
+     * Unique Resource Name
+     *
+     * @var string
+     */
+    public $unique_resource = null;
+
+    /**
+     * Source Filepath
+     *
+     * @var string
+     */
+    public $filepath = null;
+
+    /**
+     * Source Timestamp
+     *
+     * @var integer
+     */
+    public $timestamp = null;
+
+    /**
+     * Source Existence
+     *
+     * @var boolean
+     */
+    public $exists = false;
+
+    /**
+     * Source File Base name
+     *
+     * @var string
+     */
+    public $basename = null;
+
+    /**
+     * The Components an extended template is made of
+     *
+     * @var \Smarty_Template_Source[]
+     */
+    public $components = null;
+
+    /**
+     * Resource Handler
+     *
+     * @var \Smarty_Resource
+     */
+    public $handler = null;
+
+    /**
+     * Smarty instance
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * Resource is source
+     *
+     * @var bool
+     */
+    public $isConfig = false;
+
+    /**
+     * cache for Smarty_Template_Compiled instances
+     *
+     * @var Smarty_Template_Compiled[]
+     */
+    public $compileds = array();
+
+    /**
+     * Template source content eventually set by default handler
+     *
+     * @var string
+     */
+    public $content = null;
+
+    /**
+     * create Source Object container
+     *
+     * @param Smarty_Resource $handler  Resource Handler this source object communicates with
+     * @param Smarty          $smarty   Smarty instance this source object belongs to
+     * @param string          $resource full template_resource
+     * @param string          $type     type of resource
+     * @param string          $name     resource name
+     *
+     */
+    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name)
+    {
+        $this->handler = $handler; // Note: prone to circular references
+        $this->smarty = $smarty;
+        $this->resource = $resource;
+        $this->type = $type;
+        $this->name = $name;
+    }
+
+    /**
+     * initialize Source Object for given resource
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param  Smarty_Internal_Template $_template         template object
+     * @param  Smarty                   $smarty            smarty object
+     * @param  string                   $template_resource resource identifier
+     *
+     * @return Smarty_Template_Source Source Object
+     * @throws SmartyException
+     */
+    public static function load(Smarty_Internal_Template $_template = null, Smarty $smarty = null,
+                                $template_resource = null)
+    {
+        if ($_template) {
+            $smarty = $_template->smarty;
+            $template_resource = $_template->template_resource;
+        }
+        if (empty($template_resource)) {
+            throw new SmartyException('Missing template name');
+        }
+        // parse resource_name, load resource handler, identify unique resource name
+        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]([\s\S]*)$/', $template_resource, $match)) {
+            $type = $match[1];
+            $name = $match[2];
+        } else {
+            // no resource given, use default
+            // or single character before the colon is not a resource type, but part of the filepath
+            $type = $smarty->default_resource_type;
+            $name = $template_resource;
+        }
+
+        $handler = isset($smarty->_cache['resource_handlers'][$type]) ?
+            $smarty->_cache['resource_handlers'][$type] :
+            Smarty_Resource::load($smarty, $type);
+        // if resource is not recompiling and resource name is not dotted we can check the source cache
+        if (($smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON) && !$handler->recompiled &&
+            !(isset($name[1]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/'))
+        ) {
+            $unique_resource = $handler->buildUniqueResourceName($smarty, $name);
+            if (isset($smarty->_cache['source_objects'][$unique_resource])) {
+                return $smarty->_cache['source_objects'][$unique_resource];
+            }
+        } else {
+            $unique_resource = null;
+        }
+        // create new source  object
+        $source = new Smarty_Template_Source($handler, $smarty, $template_resource, $type, $name);
+        $handler->populate($source, $_template);
+        if (!$source->exists && isset($_template->smarty->default_template_handler_func)) {
+            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
+        }
+        // on recompiling resources we are done
+        if (($smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON) && !$handler->recompiled) {
+            // may by we have already $unique_resource
+            $is_relative = false;
+            if (!isset($unique_resource)) {
+                $is_relative = isset($name[1]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/') &&
+                    ($type == 'file' ||
+                        (isset($_template->parent->source) && $_template->parent->source->type == 'extends'));
+                $unique_resource =
+                    $handler->buildUniqueResourceName($smarty, $is_relative ? $source->filepath . $name : $name);
+            }
+            $source->unique_resource = $unique_resource;
+            // save in runtime cache if not relative
+            if (!$is_relative) {
+                $smarty->_cache['source_objects'][$unique_resource] = $source;
+            }
+        }
+        return $source;
+    }
+
+    /**
+     * render the uncompiled source
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function renderUncompiled(Smarty_Internal_Template $_template)
+    {
+        $this->handler->renderUncompiled($_template->source, $_template);
+    }
+
+    /**
+     * Render uncompiled source
+     *
+     * @param \Smarty_Internal_Template $_template
+     */
+    public function render(Smarty_Internal_Template $_template)
+    {
+        if ($_template->source->handler->uncompiled) {
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->start_render($_template);
+            }
+            $this->handler->renderUncompiled($_template->source, $_template);
+            if (isset($_template->parent) && $_template->parent->_objType == 2 && !empty($_template->tpl_function)) {
+                $_template->parent->tpl_function =
+                    array_merge($_template->parent->tpl_function, $_template->tpl_function);
+            }
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->end_render($_template);
+            }
+        }
+    }
+
+    /**
+     * Get source time stamp
+     *
+     * @return int
+     */
+    public function getTimeStamp()
+    {
+        if (!isset($this->timestamp)) {
+            $this->handler->populateTimestamp($this);
+        }
+        return $this->timestamp;
+    }
+
+    /**
+     * Get source content
+     *
+     * @return string
+     */
+    public function getContent()
+    {
+        return isset($this->content) ? $this->content : $this->handler->getContent($this);
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_undefined_variable.php b/library/Smarty/libs/sysplugins/smarty_undefined_variable.php
new file mode 100644
index 000000000..88bc6f68c
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_undefined_variable.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * class for undefined variable object
+ * This class defines an object for undefined variable handling
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Undefined_Variable
+{
+    /**
+     * Returns FALSE for 'nocache' and NULL otherwise.
+     *
+     * @param  string $name
+     *
+     * @return bool
+     */
+    public function __get($name)
+    {
+        if ($name == 'nocache') {
+            return false;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Always returns an empty string.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return "";
+    }
+}
diff --git a/library/Smarty/libs/sysplugins/smarty_variable.php b/library/Smarty/libs/sysplugins/smarty_variable.php
new file mode 100644
index 000000000..a6504b18f
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smarty_variable.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * class for the Smarty variable object
+ * This class defines the Smarty variable object
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Variable
+{
+    /**
+     * template variable
+     *
+     * @var mixed
+     */
+    public $value = null;
+    /**
+     * if true any output of this variable will be not cached
+     *
+     * @var boolean
+     */
+    public $nocache = false;
+
+    /**
+     * create Smarty variable object
+     *
+     * @param mixed   $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     */
+    public function __construct($value = null, $nocache = false)
+    {
+        $this->value = $value;
+        $this->nocache = $nocache;
+    }
+
+    /**
+     * <<magic>> String conversion
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->value;
+    }
+}
+
diff --git a/library/Smarty/libs/sysplugins/smartycompilerexception.php b/library/Smarty/libs/sysplugins/smartycompilerexception.php
new file mode 100644
index 000000000..4d5d77875
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smartycompilerexception.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Smarty compiler exception class
+ *
+ * @package Smarty
+ */
+class SmartyCompilerException extends SmartyException
+{
+    public function __toString()
+    {
+        return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
+    }
+
+    /**
+     * The line number of the template error
+     *
+     * @type int|null
+     */
+    public $line = null;
+    /**
+     * The template source snippet relating to the error
+     *
+     * @type string|null
+     */
+    public $source = null;
+    /**
+     * The raw text of the error message
+     *
+     * @type string|null
+     */
+    public $desc = null;
+    /**
+     * The resource identifier or template name
+     *
+     * @type string|null
+     */
+    public $template = null;
+}
diff --git a/library/Smarty/libs/sysplugins/smartyexception.php b/library/Smarty/libs/sysplugins/smartyexception.php
new file mode 100644
index 000000000..3da16c276
--- /dev/null
+++ b/library/Smarty/libs/sysplugins/smartyexception.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Smarty exception class
+ *
+ * @package Smarty
+ */
+class SmartyException extends Exception
+{
+    public static $escape = false;
+
+    public function __toString()
+    {
+        return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- ';
+    }
+}
diff --git a/library/cacert.pem b/library/cacert.pem
index 739128024..ef43898ab 100644
--- a/library/cacert.pem
+++ b/library/cacert.pem
@@ -4078,3 +4078,33 @@ Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
 c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
 mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
 -----END CERTIFICATE-----
+
+Lets Encrypt
+============
+-----BEGIN CERTIFICATE-----
+MIIEqDCCA5CgAwIBAgIRAJgT9HUT5XULQ+dDHpceRL0wDQYJKoZIhvcNAQELBQAw
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzAeFw0xNTEwMTkyMjMzMzZaFw0yMDEwMTkyMjMzMzZa
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAJzTDPBa5S5Ht3JdN4OzaGMw6tc1Jhkl4b2+NfFwki+3uEtB
+BaupnjUIWOyxKsRohwuj43Xk5vOnYnG6eYFgH9eRmp/z0HhncchpDpWRz/7mmelg
+PEjMfspNdxIknUcbWuu57B43ABycrHunBerOSuu9QeU2mLnL/W08lmjfIypCkAyG
+dGfIf6WauFJhFBM/ZemCh8vb+g5W9oaJ84U/l4avsNwa72sNlRZ9xCugZbKZBDZ1
+gGusSvMbkEl4L6KWTyogJSkExnTA0DHNjzE4lRa6qDO4Q/GxH8Mwf6J5MRM9LTb4
+4/zyM2q5OTHFr8SNDR1kFjOq+oQpttQLwNh9w5MCAwEAAaOCAZIwggGOMBIGA1Ud
+EwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMH8GCCsGAQUFBwEBBHMwcTAy
+BggrBgEFBQcwAYYmaHR0cDovL2lzcmcudHJ1c3RpZC5vY3NwLmlkZW50cnVzdC5j
+b20wOwYIKwYBBQUHMAKGL2h0dHA6Ly9hcHBzLmlkZW50cnVzdC5jb20vcm9vdHMv
+ZHN0cm9vdGNheDMucDdjMB8GA1UdIwQYMBaAFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MFQGA1UdIARNMEswCAYGZ4EMAQIBMD8GCysGAQQBgt8TAQEBMDAwLgYIKwYBBQUH
+AgEWImh0dHA6Ly9jcHMucm9vdC14MS5sZXRzZW5jcnlwdC5vcmcwPAYDVR0fBDUw
+MzAxoC+gLYYraHR0cDovL2NybC5pZGVudHJ1c3QuY29tL0RTVFJPT1RDQVgzQ1JM
+LmNybDATBgNVHR4EDDAKoQgwBoIELm1pbDAdBgNVHQ4EFgQUqEpqYwR93brm0Tm3
+pkVl7/Oo7KEwDQYJKoZIhvcNAQELBQADggEBANHIIkus7+MJiZZQsY14cCoBG1hd
+v0J20/FyWo5ppnfjL78S2k4s2GLRJ7iD9ZDKErndvbNFGcsW+9kKK/TnY21hp4Dd
+ITv8S9ZYQ7oaoqs7HwhEMY9sibED4aXw09xrJZTC9zK1uIfW6t5dHQjuOWv+HHoW
+ZnupyxpsEUlEaFb+/SCI4KCSBdAsYxAcsHYI5xxEI4LutHp6s3OT2FuO90WfdsIk
+6q78OMSdn875bNjdBYAqxUp2/LEIHfDBkLoQz0hFJmwAbYahqKaLn73PAAm1X2kj
+f1w8DdnkabOLGeOVcj9LQ+s67vBykx4anTjURkbqZslUEUsn2k5xeua2zUk=
+-----END CERTIFICATE-----
diff --git a/library/certs/cacert.pem b/library/certs/cacert.pem
index 1ff34f9b5..e4da7fc15 100644
--- a/library/certs/cacert.pem
+++ b/library/certs/cacert.pem
@@ -3986,3 +3986,33 @@ PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
 kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
 ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
 -----END CERTIFICATE-----
+
+Lets Encrypt
+============
+-----BEGIN CERTIFICATE-----
+MIIEqDCCA5CgAwIBAgIRAJgT9HUT5XULQ+dDHpceRL0wDQYJKoZIhvcNAQELBQAw
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzAeFw0xNTEwMTkyMjMzMzZaFw0yMDEwMTkyMjMzMzZa
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAJzTDPBa5S5Ht3JdN4OzaGMw6tc1Jhkl4b2+NfFwki+3uEtB
+BaupnjUIWOyxKsRohwuj43Xk5vOnYnG6eYFgH9eRmp/z0HhncchpDpWRz/7mmelg
+PEjMfspNdxIknUcbWuu57B43ABycrHunBerOSuu9QeU2mLnL/W08lmjfIypCkAyG
+dGfIf6WauFJhFBM/ZemCh8vb+g5W9oaJ84U/l4avsNwa72sNlRZ9xCugZbKZBDZ1
+gGusSvMbkEl4L6KWTyogJSkExnTA0DHNjzE4lRa6qDO4Q/GxH8Mwf6J5MRM9LTb4
+4/zyM2q5OTHFr8SNDR1kFjOq+oQpttQLwNh9w5MCAwEAAaOCAZIwggGOMBIGA1Ud
+EwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMH8GCCsGAQUFBwEBBHMwcTAy
+BggrBgEFBQcwAYYmaHR0cDovL2lzcmcudHJ1c3RpZC5vY3NwLmlkZW50cnVzdC5j
+b20wOwYIKwYBBQUHMAKGL2h0dHA6Ly9hcHBzLmlkZW50cnVzdC5jb20vcm9vdHMv
+ZHN0cm9vdGNheDMucDdjMB8GA1UdIwQYMBaAFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MFQGA1UdIARNMEswCAYGZ4EMAQIBMD8GCysGAQQBgt8TAQEBMDAwLgYIKwYBBQUH
+AgEWImh0dHA6Ly9jcHMucm9vdC14MS5sZXRzZW5jcnlwdC5vcmcwPAYDVR0fBDUw
+MzAxoC+gLYYraHR0cDovL2NybC5pZGVudHJ1c3QuY29tL0RTVFJPT1RDQVgzQ1JM
+LmNybDATBgNVHR4EDDAKoQgwBoIELm1pbDAdBgNVHQ4EFgQUqEpqYwR93brm0Tm3
+pkVl7/Oo7KEwDQYJKoZIhvcNAQELBQADggEBANHIIkus7+MJiZZQsY14cCoBG1hd
+v0J20/FyWo5ppnfjL78S2k4s2GLRJ7iD9ZDKErndvbNFGcsW+9kKK/TnY21hp4Dd
+ITv8S9ZYQ7oaoqs7HwhEMY9sibED4aXw09xrJZTC9zK1uIfW6t5dHQjuOWv+HHoW
+ZnupyxpsEUlEaFb+/SCI4KCSBdAsYxAcsHYI5xxEI4LutHp6s3OT2FuO90WfdsIk
+6q78OMSdn875bNjdBYAqxUp2/LEIHfDBkLoQz0hFJmwAbYahqKaLn73PAAm1X2kj
+f1w8DdnkabOLGeOVcj9LQ+s67vBykx4anTjURkbqZslUEUsn2k5xeua2zUk=
+-----END CERTIFICATE-----
diff --git a/library/ical.php b/library/ical.php
deleted file mode 100644
index 6bb26bad8..000000000
--- a/library/ical.php
+++ /dev/null
@@ -1,379 +0,0 @@
-<?php
-/**
- * This PHP-Class should only read a iCal-File (*.ics), parse it and give an
- * array with its content.
- *
- * PHP Version 5
- *
- * @category Parser
- * @package  Ics-parser
- * @author   Martin Thoma <info@martin-thoma.de>
- * @license  http://www.opensource.org/licenses/mit-license.php  MIT License
- * @version  SVN: <svn_id>
- * @link     http://code.google.com/p/ics-parser/
- * @example  $ical = new ical('MyCal.ics');
- *           print_r( $ical->events() );
- */
-
-/**
- * This example demonstrates how the Ics-Parser should be used.
- *
- * PHP Version 5
- *
- * @category Example
- * @package  Ics-parser
- * @author   Martin Thoma <info@martin-thoma.de>
- * @license  http://www.opensource.org/licenses/mit-license.php  MIT License
- * @version  SVN: <svn_id>
- * @link     http://code.google.com/p/ics-parser/
- * @example  $ical = new ical('MyCal.ics');
- *           print_r( $ical->get_event_array() );
-
-require 'class.iCalReader.php';
-
-$ical   = new ICal('MyCal.ics');
-$events = $ical->events();
-
-$date = $events[0]['DTSTART'];
-echo "The ical date: ";
-echo $date;
-echo "<br/>";
-
-echo "The Unix timestamp: ";
-echo $ical->iCalDateToUnixTimestamp($date);
-echo "<br/>";
-
-echo "The number of events: ";
-echo $ical->event_count;
-echo "<br/>";
-
-echo "The number of todos: ";
-echo $ical->todo_count;
-echo "<br/>";
-echo "<hr/><hr/>";
-
-foreach ($events as $event) {
-    echo "SUMMARY: ".$event['SUMMARY']."<br/>";
-    echo "DTSTART: ".$event['DTSTART']." - UNIX-Time: ".$ical->iCalDateToUnixTimestamp($event['DTSTART'])."<br/>";
-    echo "DTEND: ".$event['DTEND']."<br/>";
-    echo "DTSTAMP: ".$event['DTSTAMP']."<br/>";
-    echo "UID: ".$event['UID']."<br/>";
-    echo "CREATED: ".$event['CREATED']."<br/>";
-    echo "DESCRIPTION: ".$event['DESCRIPTION']."<br/>";
-    echo "LAST-MODIFIED: ".$event['LAST-MODIFIED']."<br/>";
-    echo "LOCATION: ".$event['LOCATION']."<br/>";
-    echo "SEQUENCE: ".$event['SEQUENCE']."<br/>";
-    echo "STATUS: ".$event['STATUS']."<br/>";
-    echo "TRANSP: ".$event['TRANSP']."<br/>";
-    echo "<hr/>";
-}
-
-   (end example)
- *
- *
- */
-
-// error_reporting(E_ALL);
-
-/**
- * This is the iCal-class
- *
- * @category Parser
- * @package  Ics-parser
- * @author   Martin Thoma <info@martin-thoma.de>
- * @license  http://www.opensource.org/licenses/mit-license.php  MIT License
- * @link     http://code.google.com/p/ics-parser/
- *
- * @param {string} filename The name of the file which should be parsed
- * @constructor
- */
-class ICal
-{
-    /* How many ToDos are in this ical? */
-    public  /** @type {int} */ $todo_count = 0;
-
-    /* How many events are in this ical? */
-    public  /** @type {int} */ $event_count = 0;
-
-    /* The parsed calendar */
-    public /** @type {Array} */ $cal;
-
-    /* Which keyword has been added to cal at last? */
-    private /** @type {string} */ $_lastKeyWord;
-
-    /**
-     * Creates the iCal-Object
-     *
-     * @param {string} $filename The path to the iCal-file
-     *
-     * @return Object The iCal-Object
-     */
-    public function __construct($filename)
-    {
-        if (!$filename) {
-            return false;
-        }
-       
-        $lines = file($filename, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-        if (stristr($lines[0], 'BEGIN:VCALENDAR') === false) {
-            return false;
-        } else {
-            // TODO: Fix multiline-description problem (see http://tools.ietf.org/html/rfc2445#section-4.8.1.5)
-            foreach ($lines as $line) {
-                $line = trim($line);
-                $add  = $this->keyValueFromString($line);
-                if ($add === false) {
-                    $this->addCalendarComponentWithKeyAndValue($type, false, $line);
-                    continue;
-                }
-
-                list($keyword, $value) = $add;
-
-                switch ($line) {
-                // http://www.kanzaki.com/docs/ical/vtodo.html
-                case "BEGIN:VTODO":
-                    $this->todo_count++;
-                    $type = "VTODO";
-                    break;
-
-                // http://www.kanzaki.com/docs/ical/vevent.html
-                case "BEGIN:VEVENT":
-                    //echo "vevent gematcht";
-                    $this->event_count++;
-                    $type = "VEVENT";
-                    break;
-
-                //all other special strings
-                case "BEGIN:VCALENDAR":
-                case "BEGIN:DAYLIGHT":
-                    // http://www.kanzaki.com/docs/ical/vtimezone.html
-                case "BEGIN:VTIMEZONE":
-                case "BEGIN:STANDARD":
-                    $type = $value;
-                    break;
-                case "END:VTODO": // end special text - goto VCALENDAR key
-                case "END:VEVENT":
-                case "END:VCALENDAR":
-                case "END:DAYLIGHT":
-                case "END:VTIMEZONE":
-                case "END:STANDARD":
-                    $type = "VCALENDAR";
-                    break;
-                default:
-                    $this->addCalendarComponentWithKeyAndValue($type,
-                                                               $keyword,
-                                                               $value);
-                    break;
-                }
-            }
-            return $this->cal;
-        }
-    }
-
-    /**
-     * Add to $this->ical array one value and key.
-     *
-     * @param {string} $component This could be VTODO, VEVENT, VCALENDAR, ...
-     * @param {string} $keyword   The keyword, for example DTSTART
-     * @param {string} $value     The value, for example 20110105T090000Z
-     *
-     * @return {None}
-     */
-    public function addCalendarComponentWithKeyAndValue($component,
-                                                        $keyword,
-                                                        $value)
-    {
-        if ($keyword == false) {
-            $keyword = $this->last_keyword;
-            switch ($component) {
-            case 'VEVENT':
-                $value = $this->cal[$component][$this->event_count - 1]
-                                               [$keyword].$value;
-                break;
-            case 'VTODO' :
-                $value = $this->cal[$component][$this->todo_count - 1]
-                                               [$keyword].$value;
-                break;
-            }
-        }
-       
-        if (stristr($keyword, "DTSTART") or stristr($keyword, "DTEND")) {
-            $keyword = explode(";", $keyword);
-            $keyword = $keyword[0];
-        }
-
-        switch ($component) {
-        case "VTODO":
-            $this->cal[$component][$this->todo_count - 1][$keyword] = $value;
-            //$this->cal[$component][$this->todo_count]['Unix'] = $unixtime;
-            break;
-        case "VEVENT":
-            $this->cal[$component][$this->event_count - 1][$keyword] = $value;
-            break;
-        default:
-            $this->cal[$component][$keyword] = $value;
-            break;
-        }
-        $this->last_keyword = $keyword;
-    }
-
-    /**
-     * Get a key-value pair of a string.
-     *
-     * @param {string} $text which is like "VCALENDAR:Begin" or "LOCATION:"
-     *
-     * @return {array} array("VCALENDAR", "Begin")
-     */
-    public function keyValueFromString($text)
-    {
-        preg_match("/([^:]+)[:]([\w\W]*)/", $text, $matches);
-        if (count($matches) == 0) {
-            return false;
-        }
-        $matches = array_splice($matches, 1, 2);
-        return $matches;
-    }
-
-    /**
-     * Return Unix timestamp from ical date time format
-     *
-     * @param {string} $icalDate A Date in the format YYYYMMDD[T]HHMMSS[Z] or
-     *                           YYYYMMDD[T]HHMMSS
-     *
-     * @return {int}
-     */
-    public function iCalDateToUnixTimestamp($icalDate)
-    {
-        $icalDate = str_replace('T', '', $icalDate);
-        $icalDate = str_replace('Z', '', $icalDate);
-
-        $pattern  = '/([0-9]{4})';   // 1: YYYY
-        $pattern .= '([0-9]{2})';    // 2: MM
-        $pattern .= '([0-9]{2})';    // 3: DD
-        $pattern .= '([0-9]{0,2})';  // 4: HH
-        $pattern .= '([0-9]{0,2})';  // 5: MM
-        $pattern .= '([0-9]{0,2})/'; // 6: SS
-        preg_match($pattern, $icalDate, $date);
-
-        // Unix timestamp can't represent dates before 1970
-        if ($date[1] <= 1970) {
-            return false;
-        }
-        // Unix timestamps after 03:14:07 UTC 2038-01-19 might cause an overflow
-        // if 32 bit integers are used.
-        $timestamp = mktime((int)$date[4],
-                            (int)$date[5],
-                            (int)$date[6],
-                            (int)$date[2],
-                            (int)$date[3],
-                            (int)$date[1]);
-        return  $timestamp;
-    }
-
-    /**
-     * Returns an array of arrays with all events. Every event is an associative
-     * array and each property is an element it.
-     *
-     * @return {array}
-     */
-    public function events()
-    {
-        $array = $this->cal;
-        return $array['VEVENT'];
-    }
-
-    /**
-     * Returns a boolean value whether thr current calendar has events or not
-     *
-     * @return {boolean}
-     */
-    public function hasEvents()
-    {
-        return ( count($this->events()) > 0 ? true : false );
-    }
-
-    /**
-     * Returns false when the current calendar has no events in range, else the
-     * events.
-     *
-     * Note that this function makes use of a UNIX timestamp. This might be a
-     * problem on January the 29th, 2038.
-     * See http://en.wikipedia.org/wiki/Unix_time#Representing_the_number
-     *
-     * @param {boolean} $rangeStart Either true or false
-     * @param {boolean} $rangeEnd   Either true or false
-     *
-     * @return {mixed}
-     */
-    public function eventsFromRange($rangeStart = false, $rangeEnd = false)
-    {
-        $events = $this->sortEventsWithOrder($this->events(), SORT_ASC);
-
-        if (!$events) {
-            return false;
-        }
-
-        $extendedEvents = array();
-       
-        if ($rangeStart !== false) {
-            $rangeStart = new DateTime();
-        }
-
-        if ($rangeEnd !== false or $rangeEnd <= 0) {
-            $rangeEnd = new DateTime('2038/01/18');
-        } else {
-            $rangeEnd = new DateTime($rangeEnd);
-        }
-
-        $rangeStart = $rangeStart->format('U');
-        $rangeEnd   = $rangeEnd->format('U');
-
-       
-
-        // loop through all events by adding two new elements
-        foreach ($events as $anEvent) {
-            $timestamp = $this->iCalDateToUnixTimestamp($anEvent['DTSTART']);
-            if ($timestamp >= $rangeStart && $timestamp <= $rangeEnd) {
-                $extendedEvents[] = $anEvent;
-            }
-        }
-
-        return $extendedEvents;
-    }
-
-    /**
-     * Returns a boolean value whether thr current calendar has events or not
-     *
-     * @param {array} $events    An array with events.
-     * @param {array} $sortOrder Either SORT_ASC, SORT_DESC, SORT_REGULAR,
-     *                           SORT_NUMERIC, SORT_STRING
-     *
-     * @return {boolean}
-     */
-    public function sortEventsWithOrder($events, $sortOrder = SORT_ASC)
-    {
-        $extendedEvents = array();
-       
-        // loop through all events by adding two new elements
-        foreach ($events as $anEvent) {
-            if (!array_key_exists('UNIX_TIMESTAMP', $anEvent)) {
-                $anEvent['UNIX_TIMESTAMP'] =
-                            $this->iCalDateToUnixTimestamp($anEvent['DTSTART']);
-            }
-
-            if (!array_key_exists('REAL_DATETIME', $anEvent)) {
-                $anEvent['REAL_DATETIME'] =
-                            date("d.m.Y", $anEvent['UNIX_TIMESTAMP']);
-            }
-           
-            $extendedEvents[] = $anEvent;
-        }
-       
-        foreach ($extendedEvents as $key => $value) {
-            $timestamp[$key] = $value['UNIX_TIMESTAMP'];
-        }
-        array_multisort($timestamp, $sortOrder, $extendedEvents);
-
-        return $extendedEvents;
-    }
-}
diff --git a/library/twitteroauth.php b/library/twitteroauth.php
index a40949534..d6fb1b3a2 100644
--- a/library/twitteroauth.php
+++ b/library/twitteroauth.php
@@ -6,8 +6,8 @@
  * The first PHP Library to support OAuth for Twitter's REST API.
  */
 
-/* Load OAuth lib. You can find it at http://oauth.net */
-if(!class_exists('OAuthException'))
+/* Load OAuth1 lib. You can find it at http://oauth.net */
+if(!class_exists('OAuth1Exception'))
 	require_once('library/OAuth1.php');
 
 /**
@@ -58,10 +58,10 @@ class TwitterOAuth {
    * construct TwitterOAuth object
    */
   function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) {
-    $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
-    $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
+    $this->sha1_method = new OAuth1SignatureMethod_HMAC_SHA1();
+    $this->consumer = new OAuth1Consumer($consumer_key, $consumer_secret);
     if (!empty($oauth_token) && !empty($oauth_token_secret)) {
-      $this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
+      $this->token = new OAuth1Consumer($oauth_token, $oauth_token_secret);
     } else {
       $this->token = NULL;
     }
@@ -79,8 +79,8 @@ class TwitterOAuth {
       $parameters['oauth_callback'] = $oauth_callback;
     } 
     $request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters);
-    $token = OAuthUtil::parse_parameters($request);
-    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    $token = OAuth1Util::parse_parameters($request);
+    $this->token = new OAuth1Consumer($token['oauth_token'], $token['oauth_token_secret']);
     return $token;
   }
 
@@ -115,8 +115,8 @@ class TwitterOAuth {
       $parameters['oauth_verifier'] = $oauth_verifier;
     }
     $request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters);
-    $token = OAuthUtil::parse_parameters($request);
-    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    $token = OAuth1Util::parse_parameters($request);
+    $this->token = new OAuth1Consumer($token['oauth_token'], $token['oauth_token_secret']);
     return $token;
   }
 
@@ -135,8 +135,8 @@ class TwitterOAuth {
     $parameters['x_auth_password'] = $password;
     $parameters['x_auth_mode'] = 'client_auth';
     $request = $this->oAuthRequest($this->accessTokenURL(), 'POST', $parameters);
-    $token = OAuthUtil::parse_parameters($request);
-    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    $token = OAuth1Util::parse_parameters($request);
+    $this->token = new OAuth1Consumer($token['oauth_token'], $token['oauth_token_secret']);
     return $token;
   }
 
@@ -180,7 +180,7 @@ class TwitterOAuth {
     if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
       $url = "{$this->host}{$url}.{$this->format}";
     }
-    $request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
+    $request = OAuth1Request::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
     $request->sign_request($this->sha1_method, $this->consumer, $this->token);
     switch ($method) {
     case 'GET':
diff --git a/mod/admin.php b/mod/admin.php
index 4b7cb3cd9..85ab3627c 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -6,6 +6,8 @@
  * Controller for the /admin/ area.
  */
 
+require_once('include/queue_fn.php');
+
 
 /**
  * @param App &$a
@@ -164,7 +166,7 @@ function admin_page_summary(&$a) {
 	}
 
 	// pending registrations
-	$r = q("SELECT COUNT(id) AS `count` FROM register");
+	$r = q("SELECT COUNT(id) AS `count` FROM `register` WHERE `uid` != '0'");
 	$pending = $r[0]['count'];
 
 	// available channels, primary and clones
@@ -231,7 +233,9 @@ function admin_page_site_post(&$a){
 	$maximagesize		=	((x($_POST,'maximagesize'))		? intval(trim($_POST['maximagesize']))				:  0);
 
 	$register_policy	=	((x($_POST,'register_policy'))	? intval(trim($_POST['register_policy']))	:  0);
+	
 	$access_policy	=	((x($_POST,'access_policy'))	? intval(trim($_POST['access_policy']))	:  0);
+	$invite_only        = ((x($_POST,'invite_only'))		? True	: False);
 	$abandon_days	    =	((x($_POST,'abandon_days'))	    ? intval(trim($_POST['abandon_days']))	    :  0);
 
 	$register_text		=	((x($_POST,'register_text'))	? notags(trim($_POST['register_text']))		: '');
@@ -243,7 +247,7 @@ function admin_page_site_post(&$a){
 	$not_allowed_email    = ((x($_POST,'not_allowed_email'))	? notags(trim($_POST['not_allowed_email']))		: '');
 	$block_public         = ((x($_POST,'block_public'))		? True	: False);
 	$force_publish        = ((x($_POST,'publish_all'))		? True	: False);
-	$disable_discover_tab = ((x($_POST,'disable_discover_tab'))		? True	:	False);
+	$disable_discover_tab = ((x($_POST,'disable_discover_tab'))		? False	:	True);
 	$login_on_homepage    = ((x($_POST,'login_on_homepage'))		? True	:	False);
 	$global_directory     = ((x($_POST,'directory_submit_url'))	? notags(trim($_POST['directory_submit_url']))	: '');
 	$no_community_page    = !((x($_POST,'no_community_page'))	? True	:	False);
@@ -299,6 +303,7 @@ function admin_page_site_post(&$a){
 	set_config('system','maximagesize', $maximagesize);
 
 	set_config('system','register_policy', $register_policy);
+	set_config('system','invitation_only', $invite_only);	
 	set_config('system','access_policy', $access_policy);
 	set_config('system','account_abandon_days', $abandon_days);
 	set_config('system','register_text', $register_text);
@@ -425,6 +430,13 @@ function admin_page_site(&$a) {
 //		SSL_POLICY_FULL     => t("Force all links to use SSL")
 //	);
 
+	$discover_tab = get_config('system','disable_discover_tab');
+	// $disable public streams by default
+	if($discover_tab === false)
+		$discover_tab = 1;
+	// now invert the logic for the setting.
+	$discover_tab = (1 - $discover_tab);
+
 
 	$homelogin = get_config('system','login_on_homepage');
 
@@ -450,6 +462,7 @@ function admin_page_site(&$a) {
 		'$feed_contacts'    => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')), 
 		'$maximagesize'		=> array('maximagesize', t("Maximum image size"), intval(get_config('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
 		'$register_policy'	=> array('register_policy', t("Does this site allow new member registration?"), get_config('system','register_policy'), "", $register_choices),
+		'$invite_only'		=> array('invite_only', t("Invitation only"), get_config('system','invitation_only'), t("Only allow new member registrations with an invitation code. Above register policy must be set to Yes.")),
 		'$access_policy'	=> array('access_policy', t("Which best describes the types of account offered by this hub?"), get_config('system','access_policy'), "This is displayed on the public server site list.", $access_choices),
 		'$register_text'	=> array('register_text', t("Register text"), htmlspecialchars(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")),
 		'$frontpage'	=> array('frontpage', t("Site homepage to show visitors (default: login box)"), get_config('system','frontpage'), t("example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file.")),
@@ -461,7 +474,7 @@ function admin_page_site(&$a) {
 		'$block_public'		=> array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
 		'$verify_email'		=> array('verify_email', t("Verify Email Addresses"), get_config('system','verify_email'), t("Check to verify email addresses used in account registration (recommended).")),
 		'$force_publish'	=> array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
-		'$disable_discover_tab'	=> array('disable_discover_tab', t("Disable discovery tab"), get_config('system','disable_discover_tab'), t("Remove the tab in the network view with public content pulled from sources chosen for this site.")),
+		'$disable_discover_tab'	=> array('disable_discover_tab', t('Import Public Streams'), $discover_tab, t('Import and allow access to public content pulled from other sites. Warning: this content is unmoderated.')),
 		'$login_on_homepage'	=> array('login_on_homepage', t("login on Homepage"),((intval($homelogin) || $homelogin === false) ? 1 : '') , t("Present a login box to visitors on the home page if no other content has been configured.")),
 
 		'$directory_server' => (($dir_choices) ? array('directory_server', t("Directory Server URL"), get_config('system','directory_server'), t("Default directory server"), $dir_choices) : null),
@@ -605,12 +618,11 @@ function admin_page_queue($a) {
 	if($_REQUEST['drophub']) {
 		require_once('hubloc.php');
 		hubloc_mark_as_down($_REQUEST['drophub']);
+		remove_queue_by_posturl($_REQUEST['drophub']);
 	}
 
 	if($_REQUEST['emptyhub']) {
-		$r = q("delete from outq where outq_posturl = '%s' ",
-			dbesc($_REQUEST['emptyhub'])
-		);
+		remove_queue_by_posturl($_REQUEST['emptyhub']);
 	}
 
 	$r = q("select count(outq_posturl) as total, max(outq_priority) as priority, outq_posturl from outq 
diff --git a/mod/api.php b/mod/api.php
index 08978ee96..232349292 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -35,42 +35,40 @@ function api_post(&$a) {
 }
 
 function api_content(&$a) {
-	if ($a->cmd=='api/oauth/authorize'){
+	if($a->cmd=='api/oauth/authorize'){
+
 		/* 
 		 * api/oauth/authorize interact with the user. return a standard page
 		 */
 		
 		$a->page['template'] = "minimal";
-		
-		
+				
 		// get consumer/client from request token
 		try {
-			$request = OAuthRequest::from_request();
+			$request = OAuth1Request::from_request();
 		} catch(Exception $e) {
 			echo "<pre>"; var_dump($e); killme();
 		}
 		
 		
-		if (x($_POST,'oauth_yes')){
+		if(x($_POST,'oauth_yes')){
 		
 			$app = oauth_get_client($request);
 			if (is_null($app)) return "Invalid request. Unknown token.";
-			$consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']);
+			$consumer = new OAuth1Consumer($app['client_id'], $app['pw'], $app['redirect_uri']);
 
 			$verifier = md5($app['secret'].local_channel());
 			set_config("oauth", $verifier, local_channel());
 			
 			
-			if ($consumer->callback_url!=null) {
+			if($consumer->callback_url!=null) {
 				$params = $request->get_parameters();
 				$glue="?";
 				if (strstr($consumer->callback_url,$glue)) $glue="?";
-				goaway($consumer->callback_url.$glue."oauth_token=".OAuthUtil::urlencode_rfc3986($params['oauth_token'])."&oauth_verifier=".OAuthUtil::urlencode_rfc3986($verifier));
+				goaway($consumer->callback_url . $glue . "oauth_token=" . OAuth1Util::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuth1Util::urlencode_rfc3986($verifier));
 				killme();
 			}
-			
-			
-			
+						
 			$tpl = get_markup_template("oauth_authorize_done.tpl");
 			$o = replace_macros($tpl, array(
 				'$title' => t('Authorize application connection'),
@@ -79,8 +77,6 @@ function api_content(&$a) {
 			));
 		
 			return $o;
-		
-		
 		}
 		
 		
diff --git a/mod/channel.php b/mod/channel.php
index 2b9d0ed89..074017466 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -128,7 +128,7 @@ function channel_content(&$a, $update = 0, $load = false) {
 	            'default_location' => (($is_owner) ? $a->profile['channel_location'] : ''),
     	        'nickname' => $a->profile['channel_address'],
         	    'lockstate' => (((strlen($a->profile['channel_allow_cid'])) || (strlen($a->profile['channel_allow_gid'])) || (strlen($a->profile['channel_deny_cid'])) || (strlen($a->profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
-            	'acl' => (($is_owner) ? populate_acl($channel_acl) : ''),
+            	'acl' => (($is_owner) ? populate_acl($channel_acl,true,(($a->profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')) : ''),
 				'showacl' => (($is_owner) ? 'yes' : ''),
 	            'bang' => '',
 				'visitor' => (($is_owner || $observer) ? true : false),
diff --git a/mod/cloud.php b/mod/cloud.php
index efb33f935..67fc199bf 100644
--- a/mod/cloud.php
+++ b/mod/cloud.php
@@ -73,36 +73,18 @@ function cloud_init(&$a) {
 
 	$server->addPlugin($lockPlugin);
 
-/* This next bit should no longer be needed... */
-
-	// The next section of code allows us to bypass prompting for http-auth if a
-	// FILE is being accessed anonymously and permissions allow this. This way
-	// one can create hotlinks to public media files in their cloud and anonymous
-	// viewers won't get asked to login.
-	// If a DIRECTORY is accessed or there are permission issues accessing the
-	// file and we aren't previously authenticated via zot, prompt for HTTP-auth.
-	// This will be the default case for mounting a DAV directory. 
-	// In order to avoid prompting for passwords for viewing a DIRECTORY, add
-	// the URL query parameter 'davguest=1'.
-
-//	$isapublic_file = false;
-//	$davguest = ((x($_SESSION, 'davguest')) ? true : false);
-
-//	if ((! $auth->observer) && ($_SERVER['REQUEST_METHOD'] === 'GET')) {
-//		try { 
-//			$x = RedFileData('/' . $a->cmd, $auth);
-//			if($x instanceof RedDAV\RedFile)
-//				$isapublic_file = true;
-//		}
-//		catch (Exception $e) {
-//			$isapublic_file = false;
-//		}
-//	}
-
-//	if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) {
-//		logger('mod_cloud: auth exception');
-//		http_status_exit(401, 'Permission denied.');
-//	}
+	$is_readable = false;
+
+	if($_SERVER['REQUEST_METHOD'] === 'GET') {
+		try { 
+			$x = RedFileData('/' . $a->cmd, $auth);
+		}
+		catch(\Exception $e) {
+			if($e instanceof Sabre\DAV\Exception\Forbidden) {
+				http_status_exit(401, 'Permission denied.');
+			}
+		}
+	}
 
 	require_once('include/RedDAV/RedBrowser.php');
 	// provide a directory view for the cloud in Hubzilla
diff --git a/mod/events.php b/mod/events.php
index 74b44906c..ed9f0f2e3 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -434,7 +434,7 @@ function events_content(&$a) {
 			'$xchan' => $event_xchan,
 			'$mid' => $mid,
 			'$event_hash' => $event_id,
-			'$summary' => array('summary', (($event_id) ? t('Edit event titel') : t('Event titel')), $t_orig, t('Required'), '*'),
+			'$summary' => array('summary', (($event_id) ? t('Edit event title') : t('Event title')), $t_orig, t('Required'), '*'),
 			'$catsenabled' => $catsenabled,
 			'$placeholdercategory' => t('Categories (comma-separated list)'),
 			'$c_text' => (($event_id) ? t('Edit Category') : t('Category')),
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 90b554edd..13abbfd8a 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -57,13 +57,8 @@ function fbrowser_content($a){
 				$types = $ph->supportedTypes();
 				$ext = $types[$rr['type']];
 
-				if($a->get_template_engine() === 'internal') {
-					$filename_e = template_escape($rr['filename']);
-				}
-				else {
-					$filename_e = $rr['filename'];
-				}
-
+				$filename_e = $rr['filename'];
+		
 				return array( 
 					$a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['hiq'] . '.' .$ext, 
 					$filename_e, 
diff --git a/mod/help.php b/mod/help.php
index 16ec069a7..c4549a2bd 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -143,7 +143,8 @@ function help_content(&$a) {
 	nav_set_selected('help');
 
 	if($_REQUEST['search']) {
-
+	
+		$o .= '<div id="help-content" class="generic-content-wrapper">';
 		$o .= '<h2>' . t('Documentation Search') . ' - ' . htmlspecialchars($_REQUEST['search']) . '</h2>';
 
 		$r = search_doc_files($_REQUEST['search']);
@@ -160,6 +161,7 @@ function help_content(&$a) {
 
 			}
 			$o .= '</ul>';
+			$o .= '</div>';
 		}
 		return $o;
 	}
diff --git a/mod/home.php b/mod/home.php
index bf2463bbc..bfac17eab 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -72,7 +72,7 @@ function home_content(&$a, $update = 0, $load = false) {
 
 	$sitename = get_config('system','sitename');
 	if($sitename) 
-		$o .= '<h1>' . sprintf( t("Welcome to %s") ,$sitename) . '</h1>';
+		$o .= '<h1 class="home-welcome">' . sprintf( t("Welcome to %s") ,$sitename) . '</h1>';
 
 	$loginbox = get_config('system','login_on_homepage');
 	if(intval($loginbox) || $loginbox === false)
diff --git a/mod/invite.php b/mod/invite.php
index 1af5fc1f8..e8bb74ee2 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -50,23 +50,6 @@ function invite_post(&$a) {
 			continue;
 		}
 		
-		if($invonly && ($x || is_site_admin())) {
-			$code = autoname(8) . rand(1000,9999);
-			$nmessage = str_replace('$invite_code',$code,$message);
-
-			$r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ",
-				dbesc($code),
-				dbesc(datetime_convert())
-			);
-
-			if(! is_site_admin()) {
-				$x --;
-				if($x >= 0)
-					set_pconfig(local_channel(),'system','invites_remaining',$x);
-				else
-					return;
-			}
-		}
 		else
 			$nmessage = $message;
 
@@ -117,6 +100,23 @@ function invite_content(&$a) {
 		}
 	}			
 
+		if($invonly && ($x || is_site_admin())) {
+			$invite_code = autoname(8) . rand(1000,9999);
+			$nmessage = str_replace('$invite_code',$invite_code,$message);
+
+			$r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ",
+				dbesc($invite_code),
+				dbesc(datetime_convert())
+			);
+
+			if(! is_site_admin()) {
+				$x --;
+				if($x >= 0)
+					set_pconfig(local_channel(),'system','invites_remaining',$x);
+				else
+					return;
+			}
+		}
 
 	$ob = $a->get_observer();
 	if(! $ob)
diff --git a/mod/item.php b/mod/item.php
index f32ff8844..eecc3a9ac 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -107,6 +107,7 @@ function item_post(&$a) {
 	$layout_mid  = ((x($_REQUEST,'layout_mid'))  ? escape_tags($_REQUEST['layout_mid']): '');
 	$plink       = ((x($_REQUEST,'permalink'))   ? escape_tags($_REQUEST['permalink']) : '');
 	$obj_type    = ((x($_REQUEST,'obj_type'))    ? escape_tags($_REQUEST['obj_type'])  : ACTIVITY_OBJ_NOTE);
+
 	// allow API to bulk load a bunch of imported items with sending out a bunch of posts. 
 	$nopush      = ((x($_REQUEST,'nopush'))      ? intval($_REQUEST['nopush'])         : 0);
 
@@ -209,7 +210,7 @@ function item_post(&$a) {
 		}
 	}
 	else {
-		if(! perm_is_allowed($profile_uid,$observer['xchan_hash'],'post_wall')) {
+		if(! perm_is_allowed($profile_uid,$observer['xchan_hash'],($webpage) ? 'write_pages' : 'post_wall')) {
 			notice( t('Permission denied.') . EOL) ;
 			if(x($_REQUEST,'return')) 
 				goaway($a->get_baseurl() . "/" . $return_path );
@@ -918,7 +919,7 @@ function item_post(&$a) {
 		else {
 			$parent = $post_id;
 
-			if($datarray['owner_xchan'] != $datarray['author_xchan']) {
+			if(($datarray['owner_xchan'] != $datarray['author_xchan']) && ($datarray['item_type'] == ITEM_TYPE_POST)) {
 				notification(array(
 					'type'         => NOTIFY_WALL,
 					'from_xchan'   => $datarray['author_xchan'],
diff --git a/mod/mail.php b/mod/mail.php
index 44c4b479d..59d15772b 100644
--- a/mod/mail.php
+++ b/mod/mail.php
@@ -17,6 +17,7 @@ function mail_post(&$a) {
 	$body      = ((x($_REQUEST,'body'))         ? escape_tags(trim($_REQUEST['body']))    : '');
 	$recipient = ((x($_REQUEST,'messageto'))    ? notags(trim($_REQUEST['messageto']))    : '');
 	$rstr      = ((x($_REQUEST,'messagerecip')) ? notags(trim($_REQUEST['messagerecip'])) : '');
+	$preview   = ((x($_REQUEST,'preview'))      ? intval($_REQUEST['preview'])            : 0);
 	$expires   = ((x($_REQUEST,'expires')) ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : NULL_DATE);
 
 	// If we have a raw string for a recipient which hasn't been auto-filled,
@@ -86,6 +87,13 @@ function mail_post(&$a) {
 	require_once('include/text.php');
 	linkify_tags($a, $body, local_channel());
 
+	if($preview) {
+		
+
+
+
+	}
+
 	if(! $recipient) {
 		notice('No recipient found.');
 		$a->argc = 2;
diff --git a/mod/network.php b/mod/network.php
index 9f0604296..ba2ef761b 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -166,7 +166,7 @@ function network_content(&$a, $update = 0, $load = false) {
 			'default_location' => $channel['channel_location'],
 			'nickname'         => $channel['channel_address'],
 			'lockstate'        => (($private_editing || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-			'acl'              => populate_acl((($private_editing) ? $def_acl : $channel_acl)),
+			'acl'              => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, (($channel['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')),
 			'bang'             => (($private_editing) ? '!' : ''),
 			'visitor'          => true,
 			'profile_uid'      => local_channel()
diff --git a/mod/new_channel.php b/mod/new_channel.php
index 047048f0a..bec2a3c09 100644
--- a/mod/new_channel.php
+++ b/mod/new_channel.php
@@ -100,6 +100,17 @@ function new_channel_content(&$a) {
 		return;
 	}
 
+	$default_role = '';
+	$aid = get_account_id();
+	if($aid) {
+		$r = q("select count(channel_id) as total from channel where channel_account_id = %d",
+			intval($aid)
+		);
+		if($r && (! intval($r[0]['total']))) {
+			$default_role = get_config('system','default_permissions_role');
+		}
+	}
+
 	$name         = ((x($_REQUEST,'name'))         ? $_REQUEST['name']         :  "" );
 	$nickname     = ((x($_REQUEST,'nickname'))     ? $_REQUEST['nickname']     :  "" );
 	$privacy_role = ((x($_REQUEST,'permissions_role')) ? $_REQUEST['permissions_role'] :  "" );
@@ -117,6 +128,7 @@ function new_channel_content(&$a) {
 		'$name'         => $name,
 		'$help_role'    => t('Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you'),
 		'$role' => array('permissions_role' , t('Channel Type'), ($privacy_role) ? $privacy_role : 'social', '<a href="help/roles" target="_blank">'.t('Read more about roles').'</a>',get_roles()),
+		'$default_role' => $default_role,
 		'$nickname'     => $nickname,
 		'$submit'       => t('Create')
 	));
diff --git a/mod/photos.php b/mod/photos.php
index 33a895fdf..b0d9bc631 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -698,12 +698,7 @@ function photos_content(&$a) {
 		$album_edit = null;
 		if(($album !== t('Profile Photos')) && ($album !== 'Profile Photos') && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 			if($can_post) {
-				if($a->get_template_engine() === 'internal') {
-					$album_e = template_escape($album);
-				}
-				else {
-					$album_e = $album;
-				}
+				$album_e = $album;
 				$albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer']));
 
 				// @fixme - syncronise actions with DAV
@@ -765,6 +760,7 @@ function photos_content(&$a) {
 			if($photos) {
 				$o = replace_macros(get_markup_template('photosajax.tpl'),array(
 					'$photos' => $photos,
+					'$album_id' => bin2hex($album)
 				));
 			}
 			else {
@@ -779,6 +775,7 @@ function photos_content(&$a) {
 			$o .= replace_macros($tpl, array(
 				'$photos' => $photos,
 				'$album' => $album,
+				'$album_id' => bin2hex($album),
 				'$album_edit' => array(t('Edit Album'), $album_edit),
 				'$can_post' => $can_post,
 				'$upload' => array(t('Upload'), $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album)),
@@ -1300,6 +1297,7 @@ function photos_content(&$a) {
 		if($photos) {
 			$o = replace_macros(get_markup_template('photosajax.tpl'),array(
 				'$photos' => $photos,
+				'$album_id' => bin2hex(t('Recent Photos'))
 			));
 		}
 		else {
@@ -1313,6 +1311,7 @@ function photos_content(&$a) {
 		$tpl = get_markup_template('photos_recent.tpl'); 
 		$o .= replace_macros($tpl, array(
 			'$title' => t('Recent Photos'),
+			'$album_id' => bin2hex(t('Recent Photos')),
 			'$can_post' => $can_post,
 			'$upload' => array(t('Upload'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
 			'$photos' => $photos,
diff --git a/mod/post.php b/mod/post.php
index 4c52de44a..6555a16c2 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -9,952 +9,26 @@
 
 require_once('include/zot.php');
 
-/**
- * @brief HTTP POST entry point for Zot.
- *
- * Most access to this endpoint is via the post method.
- * Here we will pick out the magic auth params which arrive as a get request,
- * and the only communications to arrive this way.
- *
- * Magic Auth
- * ==========
- *
- * So-called "magic auth" takes place by a special exchange. On the site where the "channel to be authenticated" lives (e.g. $mysite), 
- * a redirection is made via $mysite/magic to the zot endpoint of the remote site ($remotesite) with special GET parameters.
- *
- * The endpoint is typically  https://$remotesite/post - or whatever was specified as the callback url in prior communications
- * (we will bootstrap an address and fetch a zot info packet if possible where no prior communications exist)
- *
- * Five GET parameters are supplied:
- * * auth => the urlencoded webbie (channel@host.domain) of the channel requesting access
- * * dest => the desired destination URL (urlencoded)
- * * sec  => a random string which is also stored on $mysite for use during the verification phase. 
- * * version => the zot revision
- * * delegate => optional urlencoded webbie of a local channel to invoke delegation rights for
- *
- * When this packet is received, an "auth-check" zot message is sent to $mysite.
- * (e.g. if $_GET['auth'] is foobar@podunk.edu, a zot packet is sent to the podunk.edu zot endpoint, which is typically /post)
- * If no information has been recorded about the requesting identity a zot information packet will be retrieved before
- * continuing.
- *
- * The sender of this packet is an arbitrary/random site channel. The recipients will be a single recipient corresponding
- * to the guid and guid_sig we have associated with the requesting auth identity
- *
- * \code{.json}
- * {
- *   "type":"auth_check",
- *   "sender":{
- *     "guid":"kgVFf_...",
- *     "guid_sig":"PT9-TApz...",
- *     "url":"http:\/\/podunk.edu",
- *     "url_sig":"T8Bp7j..."
- *   },
- *   "recipients":{
- *     {
- *       "guid":"ZHSqb...",
- *       "guid_sig":"JsAAXi..."
- *     }
- *   }
- *   "callback":"\/post",
- *   "version":1,
- *   "secret":"1eaa661",
- *   "secret_sig":"eKV968b1..."
- * }
- * \endcode
- *
- * auth_check messages MUST use encapsulated encryption. This message is sent to the origination site, which checks the 'secret' to see 
- * if it is the same as the 'sec' which it passed originally. It also checks the secret_sig which is the secret signed by the 
- * destination channel's private key and base64url encoded. If everything checks out, a json packet is returned:
- *
- * \code{.json}
- * {
- *   "success":1,
- *   "confirm":"q0Ysovd1u...",
- *   "service_class":(optional)
- *   "level":(optional)
- * }
- * \endcode
- *
- * 'confirm' in this case is the base64url encoded RSA signature of the concatenation of 'secret' with the
- * base64url encoded whirlpool hash of the requestor's guid and guid_sig; signed with the source channel private key. 
- * This prevents a man-in-the-middle from inserting a rogue success packet. Upon receipt and successful 
- * verification of this packet, the destination site will redirect to the original destination URL and indicate a successful remote login. 
- * Service_class can be used by cooperating sites to provide different access rights based on account rights and subscription plans. It is 
- * a string whose contents are not defined by protocol. Example: "basic" or "gold".
- *
- * @param[in,out] App &$a
- */
 function post_init(&$a) {
 
 	if (array_key_exists('auth', $_REQUEST)) {
-
-		$ret = array('success' => false, 'message' => '');
-
-		logger('mod_zot: auth request received.');
-		$address  = $_REQUEST['auth'];
-		$desturl  = $_REQUEST['dest'];
-		$sec      = $_REQUEST['sec'];
-		$version  = $_REQUEST['version'];
-		$delegate = $_REQUEST['delegate'];
-
-		$test     = ((x($_REQUEST, 'test')) ? intval($_REQUEST['test']) : 0);
-
-		// They are authenticating ultimately to the site and not to a particular channel.
-		// Any channel will do, providing it's currently active. We just need to have an 
-		// identity to attach to the packet we send back. So find one. 
-
-		$c = q("select * from channel where channel_removed = 0 limit 1");
-
-		if (! $c) {
-			// nobody here
-			logger('mod_zot: auth: unable to find a response channel');
-			if ($test) {
-				$ret['message'] .= 'no local channels found.' . EOL;
-				json_return_and_die($ret);
-			}
-
-			goaway($desturl);
-		}
-
-		// Try and find a hubloc for the person attempting to auth
-		$x = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash where hubloc_addr = '%s' order by hubloc_id desc",
-			dbesc($address)
-		);
-
-		if (! $x) {
-			// finger them if they can't be found. 
-			$ret = zot_finger($address, null);
-			if ($ret['success']) {
-				$j = json_decode($ret['body'], true);
-				if ($j)
-					import_xchan($j);
-				$x = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash where hubloc_addr = '%s' order by hubloc_id desc",
-					dbesc($address)
-				);
-			}
-		}
-		if(! $x) {
-			logger('mod_zot: auth: unable to finger ' . $address);
-
-			if($test) {
-				$ret['message'] .= 'no hubloc found for ' . $address . ' and probing failed.' . EOL;
-				json_return_and_die($ret);
-			}
-
-			goaway($desturl);
-		}
-
-
-		foreach($x as $xx) {
-			logger('mod_zot: auth request received from ' . $xx['hubloc_addr'] ); 
-
-			// check credentials and access
-
-			// If they are already authenticated and haven't changed credentials, 
-			// we can save an expensive network round trip and improve performance.
-
-			$remote = remote_channel();
-			$result = null;
-			$remote_service_class = '';
-			$remote_level = 0;
-			$remote_hub = $xx['hubloc_url'];
-			$DNT = 0;
-
-			// Also check that they are coming from the same site as they authenticated with originally.
-
-			$already_authed = ((($remote) && ($xx['hubloc_hash'] == $remote) && ($xx['hubloc_url'] === $_SESSION['remote_hub'])) ? true : false); 
-			if($delegate && $delegate !== $_SESSION['delegate_channel'])
-				$already_authed = false;
-
-			$j = array();
-
-			if (! $already_authed) {
-
-				// Auth packets MUST use ultra top-secret hush-hush mode - e.g. the entire packet is encrypted using the site private key
-				// The actual channel sending the packet ($c[0]) is not important, but this provides a generic zot packet with a sender
-				// which can be verified
- 
-				$p = zot_build_packet($c[0],$type = 'auth_check', array(array('guid' => $xx['hubloc_guid'],'guid_sig' => $xx['hubloc_guid_sig'])), $xx['hubloc_sitekey'], $sec);
-				if ($test) {
-					$ret['message'] .= 'auth check packet created using sitekey ' . $xx['hubloc_sitekey'] . EOL;
-					$ret['message'] .= 'packet contents: ' . $p . EOL;
-				}
-
-				$result = zot_zot($xx['hubloc_callback'],$p);
-
-				if (! $result['success']) {
-					logger('mod_zot: auth_check callback failed.');
-					if ($test) {
-						$ret['message'] .= 'auth check request to your site returned .' . print_r($result, true) . EOL;
-						continue;
-					}
-					continue;
-				}
-				$j = json_decode($result['body'], true);
-				if (! $j) {
-					logger('mod_zot: auth_check json data malformed.');
-					if($test) {
-						$ret['message'] .= 'json malformed: ' . $result['body'] . EOL;
-						continue;
-					}
-				}
-			}
-
-			if ($test) {
-				$ret['message'] .= 'auth check request returned .' . print_r($j, true) . EOL;
-			}
-
-			if ($already_authed || $j['success']) {
-				if ($j['success']) {
-					// legit response, but we do need to check that this wasn't answered by a man-in-middle
-					if (! rsa_verify($sec . $xx['xchan_hash'],base64url_decode($j['confirm']),$xx['xchan_pubkey'])) {
-						logger('mod_zot: auth: final confirmation failed.');
-						if ($test) {
-							$ret['message'] .= 'final confirmation failed. ' . $sec . print_r($j,true) . print_r($xx,true);
-							continue;
-						}
-
-						continue;
-					}
-					if (array_key_exists('service_class',$j))
-						$remote_service_class = $j['service_class'];
-					if (array_key_exists('level',$j))
-						$remote_level = $j['level'];
-					if (array_key_exists('DNT',$j))
-						$DNT = $j['DNT'];
-				}
-				// everything is good... maybe
-				if(local_channel()) {
-
-					// tell them to logout if they're logged in locally as anything but the target remote account
-					// in which case just shut up because they don't need to be doing this at all.
-
-					if ($a->channel['channel_hash'] != $xx['xchan_hash']) {
-						logger('mod_zot: auth: already authenticated locally as somebody else.');
-						notice( t('Remote authentication blocked. You are logged into this site locally. Please logout and retry.') . EOL);
-						if ($test) {
-							$ret['message'] .= 'already logged in locally with a conflicting identity.' . EOL;
-							continue;
-						}
-					}
-					continue;
-				}
-
-				// log them in
-
-				if ($test) {
-					$ret['success'] = true;
-					$ret['message'] .= 'Authentication Success!' . EOL;
-					json_return_and_die($ret);
-				}
-
-				$delegation_success = false;
-				if ($delegate) {
-					$r = q("select * from channel left join xchan on channel_hash = xchan_hash where xchan_addr = '%s' limit 1",
-						dbesc($delegate)
-					);
-					if ($r && intval($r[0]['channel_id'])) {
-						$allowed = perm_is_allowed($r[0]['channel_id'],$xx['xchan_hash'],'delegate');
-						if ($allowed) {
-							$_SESSION['delegate_channel'] = $r[0]['channel_id'];
-							$_SESSION['delegate'] = $xx['xchan_hash'];
-							$_SESSION['account_id'] = intval($r[0]['channel_account_id']);
-							require_once('include/security.php');
-							change_channel($r[0]['channel_id']);
-							$delegation_success = true;
-						}
-					}
-				}
-
-				$_SESSION['authenticated'] = 1;
-				if (! $delegation_success) {
-					$_SESSION['visitor_id'] = $xx['xchan_hash'];
-					$_SESSION['my_url'] = $xx['xchan_url'];
-					$_SESSION['my_address'] = $address;
-					$_SESSION['remote_service_class'] = $remote_service_class;
-					$_SESSION['remote_level'] = $remote_level;
-					$_SESSION['remote_hub'] = $remote_hub;
-					$_SESSION['DNT'] = $DNT;
-				}
-
-				$arr = array('xchan' => $xx, 'url' => $desturl, 'session' => $_SESSION);
-				call_hooks('magic_auth_success',$arr);
-				$a->set_observer($xx);
-				require_once('include/security.php');
-				$a->set_groups(init_groups_visitor($_SESSION['visitor_id']));
-				info(sprintf( t('Welcome %s. Remote authentication successful.'),$xx['xchan_name']));
-				logger('mod_zot: auth success from ' . $xx['xchan_addr']); 
-			} 
-			else {
-				if ($test) {
-					$ret['message'] .= 'auth failure. ' . print_r($_REQUEST,true) . print_r($j,true) . EOL;
-					continue;
-				}
-				logger('mod_zot: magic-auth failure - not authenticated: ' . $xx['xchan_addr']);
-			}
-
-			if ($test) {
-				$ret['message'] .= 'auth failure fallthrough ' . print_r($_REQUEST,true) . print_r($j,true) . EOL;
-				continue;
-			}
-		}
-
-		/**
-		 * @FIXME we really want to save the return_url in the session before we
-		 * visit rmagic. This does however prevent a recursion if you visit
-		 * rmagic directly, as it would otherwise send you back here again.
-		 * But z_root() probably isn't where you really want to go.
-		 */
-
-		if(strstr($desturl,z_root() . '/rmagic'))
-			goaway(z_root());
-
-		if ($test) {
-			json_return_and_die($ret);
-		}
-
-		goaway($desturl);
+		require_once('Zotlabs/Zot/Auth.php');
+		$x = new Zotlabs\Zot\Auth($_REQUEST);
+		exit;
 	}
+
 }
 
 
-/**
- * @brief zot communications and messaging.
- *
- * Sender HTTP posts to this endpoint ($site/post typically) with 'data' parameter set to json zot message packet.
- * This packet is optionally encrypted, which we will discover if the json has an 'iv' element.
- * $contents => array( 'alg' => 'aes256cbc', 'iv' => initialisation vector, 'key' => decryption key, 'data' => encrypted data);
- * $contents->iv and $contents->key are random strings encrypted with this site's RSA public key and then base64url encoded.
- * Currently only 'aes256cbc' is used, but this is extensible should that algorithm prove inadequate.
- *
- * Once decrypted, one will find the normal json_encoded zot message packet.
- * 
- * Defined packet types are: notify, purge, refresh, force_refresh, auth_check, ping, and pickup 
- *
- * Standard packet: (used by notify, purge, refresh, force_refresh, and auth_check)
- * \code{.json}
- * {
- *   "type": "notify",
- *   "sender":{
- *     "guid":"kgVFf_1...",
- *     "guid_sig":"PT9-TApzp...",
- *     "url":"http:\/\/podunk.edu",
- *     "url_sig":"T8Bp7j5...",
- *   },
- *   "recipients": { optional recipient array },
- *   "callback":"\/post",
- *   "version":1,
- *   "secret":"1eaa...",
- *   "secret_sig": "df89025470fac8..."
- * }
- * \endcode
- *
- * Signature fields are all signed with the sender channel private key and base64url encoded.
- * Recipients are arrays of guid and guid_sig, which were previously signed with the recipients private 
- * key and base64url encoded and later obtained via channel discovery. Absence of recipients indicates
- * a public message or visible to all potential listeners on this site.
- *
- * "pickup" packet:
- * The pickup packet is sent in response to a notify packet from another site
- * \code{.json}
- * {
- *   "type":"pickup",
- *   "url":"http:\/\/example.com",
- *   "callback":"http:\/\/example.com\/post",
- *   "callback_sig":"teE1_fLI...",
- *   "secret":"1eaa...",
- *   "secret_sig":"O7nB4_..."
- * }
- * \endcode
- *
- * In the pickup packet, the sig fields correspond to the respective data
- * element signed with this site's system private key and then base64url encoded.
- * The "secret" is the same as the original secret from the notify packet. 
- *
- * If verification is successful, a json structure is returned containing a
- * success indicator and an array of type 'pickup'.
- * Each pickup element contains the original notify request and a message field
- * whose contents are dependent on the message type.
- *
- * This JSON array is AES encapsulated using the site public key of the site
- * that sent the initial zot pickup packet.
- * Using the above example, this would be example.com.
- *
- * \code{.json}
- * {
- *   "success":1,
- *   "pickup":{
- *     "notify":{
- *       "type":"notify",
- *       "sender":{
- *         "guid":"kgVFf_...",
- *         "guid_sig":"PT9-TApz...",
- *         "url":"http:\/\/z.podunk.edu",
- *         "url_sig":"T8Bp7j5D..."
- *       },
- *       "callback":"\/post",
- *       "version":1,
- *       "secret":"1eaa661..."
- *     },
- *     "message":{
- *       "type":"activity",
- *       "message_id":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu",
- *       "message_top":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu",
- *       "message_parent":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu",
- *       "created":"2012-11-20 04:04:16",
- *       "edited":"2012-11-20 04:04:16",
- *       "title":"",
- *       "body":"Hi Nickordo",
- *       "app":"",
- *       "verb":"post",
- *       "object_type":"",
- *       "target_type":"",
- *       "permalink":"",
- *       "location":"",
- *       "longlat":"",
- *       "owner":{
- *         "name":"Indigo",
- *         "address":"indigo@podunk.edu",
- *         "url":"http:\/\/podunk.edu",
- *         "photo":{
- *           "mimetype":"image\/jpeg",
- *           "src":"http:\/\/podunk.edu\/photo\/profile\/m\/5"
- *         },
- *         "guid":"kgVFf_...",
- *         "guid_sig":"PT9-TAp...",
- *       },
- *       "author":{
- *         "name":"Indigo",
- *         "address":"indigo@podunk.edu",
- *         "url":"http:\/\/podunk.edu",
- *         "photo":{
- *           "mimetype":"image\/jpeg",
- *           "src":"http:\/\/podunk.edu\/photo\/profile\/m\/5"
- *         },
- *         "guid":"kgVFf_...",
- *         "guid_sig":"PT9-TAp..."
- *       }
- *     }
- *   }
- * }
- * \endcode
- *
- * Currently defined message types are 'activity', 'mail', 'profile', 'location'
- * and 'channel_sync', which each have different content schemas.
- *
- * Ping packet:
- * A ping packet does not require any parameters except the type. It may or may
- * not be encrypted.
- *
- * \code{.json}
- * {
- *   "type": "ping"
- * }
- * \endcode
- *
- * On receipt of a ping packet a ping response will be returned:
- *
- * \code{.json}
- * {
- *   "success" : 1,
- *   "site" {
- *     "url": "http:\/\/podunk.edu",
- *     "url_sig": "T8Bp7j5...",
- *     "sitekey": "-----BEGIN PUBLIC KEY-----
- *                 MIICIjANBgkqhkiG9w0BAQE..."
- *   }
- * }
- * \endcode
- *
- * The ping packet can be used to verify that a site has not been re-installed, and to 
- * initiate corrective action if it has. The url_sig is signed with the site private key
- * and base64url encoded - and this should verify with the enclosed sitekey. Failure to
- * verify indicates the site is corrupt or otherwise unable to communicate using zot.
- * This return packet is not otherwise verified, so should be compared with other
- * results obtained from this site which were verified prior to taking action. For instance
- * if you have one verified result with this signature and key, and other records for this 
- * url which have different signatures and keys, it indicates that the site was re-installed
- * and corrective action may commence (remove or mark invalid any entries with different
- * signatures).
- * If you have no records which match this url_sig and key - no corrective action should
- * be taken as this packet may have been returned by an imposter.  
- *
- * @param[in,out] App &$a
- */
 function post_post(&$a) {
 
-	$encrypted_packet = false;
-	$ret = array('success' => false);
-
-	$data = json_decode($_REQUEST['data'],true);
-
-	/*
-	 * Many message packets will arrive encrypted. The existence of an 'iv'
-	 * element tells us we need to unencapsulate the AES-256-CBC content using
-	 * the site private key.
-	 */
-
-	if($data && array_key_exists('iv',$data)) {
-		$encrypted_packet = true;
-		$data = crypto_unencapsulate($data,get_config('system','prvkey'));
-		logger('mod_zot: decrypt1: ' . $data, LOGGER_DATA);
-		$data = json_decode($data,true);
-	}
-
-	if(! $data) {
-
-		// possible Bleichenbacher's attack, just treat it as a 
-		// message we have no handler for. It should fail a bit 
-		// further along with "no hub". Our public key is public
-		// knowledge. There's no reason why anybody should get the 
-		// encryption wrong unless they're fishing or hacking. If 
-		// they're developing and made a goof, this can be discovered 
-		// in the logs of the destination site. If they're fishing or 
-		// hacking, the bottom line is we can't verify their hub. 
-		// That's all we're going to tell them.
-
-		$data = array('type' => 'bogus');
-	}
-
-
-	$msgtype = ((array_key_exists('type',$data)) ? $data['type'] : '');
-
-	if($msgtype === 'ping') {
-
-		// Useful to get a health check on a remote site.
-		// This will let us know if any important communication details
-		// that we may have stored are no longer valid, regardless of xchan details.
-		logger('POST: got ping send pong now back: ' . z_root() , LOGGER_DEBUG );
- 
-		$ret['success'] = true;
-		$ret['site'] = array();
-		$ret['site']['url'] = z_root();
-		$ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),get_config('system','prvkey')));
-		$ret['site']['sitekey'] = get_config('system','pubkey');
-		json_return_and_die($ret);
-	}
-
-
-	if($msgtype === 'pickup') {
-
-		/*
-		 * The 'pickup' message arrives with a tracking ID which is associated with a particular outq_hash
-		 * First verify that that the returned signatures verify, then check that we have an outbound queue item
-		 * with the correct hash.
-		 * If everything verifies, find any/all outbound messages in the queue for this hubloc and send them back
-		 */
-
-		if((! $data['secret']) || (! $data['secret_sig'])) {
-			$ret['message'] = 'no verification signature';
-			logger('mod_zot: pickup: ' . $ret['message'], LOGGER_DEBUG);
-			json_return_and_die($ret);
-		}
-		$r = q("select distinct hubloc_sitekey from hubloc where hubloc_url = '%s' and hubloc_callback = '%s' and hubloc_sitekey != '' group by hubloc_sitekey ",
-			dbesc($data['url']),
-			dbesc($data['callback'])
-		);
-		if(! $r) {
-			$ret['message'] = 'site not found';
-			logger('mod_zot: pickup: ' . $ret['message']);
-			json_return_and_die($ret);
-		}
-
-		foreach ($r as $hubsite) {
+	require_once('Zotlabs/Zot/Receiver.php');
+	require_once('Zotlabs/Zot/ZotHandler.php');
 
-			// verify the url_sig
-			// If the server was re-installed at some point, there could be multiple hubs with the same url and callback.
-			// Only one will have a valid key.
-
-			$forgery = true;
-			$secret_fail = true;
-
-			$sitekey = $hubsite['hubloc_sitekey'];
-
-			logger('mod_zot: Checking sitekey: ' . $sitekey, LOGGER_DATA);
-
-			if(rsa_verify($data['callback'],base64url_decode($data['callback_sig']),$sitekey)) {
-				$forgery = false;
-			}
-			if(rsa_verify($data['secret'],base64url_decode($data['secret_sig']),$sitekey)) {
-				$secret_fail = false;
-			}
-			if((! $forgery) && (! $secret_fail))
-				break;
-		}
-
-		if($forgery) {
-			$ret['message'] = 'possible site forgery';
-			logger('mod_zot: pickup: ' . $ret['message']);
-			json_return_and_die($ret);
-		}
-
-		if($secret_fail) {
-			$ret['message'] = 'secret validation failed';
-			logger('mod_zot: pickup: ' . $ret['message']);
-			json_return_and_die($ret);
-		}
-
-		/*
-		 * If we made it to here, the signatures verify, but we still don't know if the tracking ID is valid.
-		 * It wouldn't be an error if the tracking ID isn't found, because we may have sent this particular
-		 * queue item with another pickup (after the tracking ID for the other pickup  was verified). 
-		 */
-
-		$r = q("select outq_posturl from outq where outq_hash = '%s' and outq_posturl = '%s' limit 1",
-			dbesc($data['secret']),
-			dbesc($data['callback'])
-		);
-		if(! $r) {
-			$ret['message'] = 'nothing to pick up';
-			logger('mod_zot: pickup: ' . $ret['message']);
-			json_return_and_die($ret);
-		}
-
-		/*
-		 * Everything is good if we made it here, so find all messages that are going to this location
-		 * and send them all.
-		 */
-
-		$r = q("select * from outq where outq_posturl = '%s'",
-			dbesc($data['callback'])
-		);
-		if($r) {
-			logger('mod_zot: successful pickup message received from ' . $data['callback'] . ' ' . count($r) . ' message(s) picked up', LOGGER_DEBUG);
-
-			$ret['success'] = true;
-			$ret['pickup'] = array();
-			foreach($r as $rr) {
-				if($rr['outq_msg']) {
-					$x = json_decode($rr['outq_msg'],true);
-
-					if(! $x)
-						continue;
-
-					if(array_key_exists('message_list',$x)) {
-						foreach($x['message_list'] as $xx) {
-							$ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $xx);
-						}
-					}
-					else
-						$ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $x);
-
-					$x = q("delete from outq where outq_hash = '%s'",
-						dbesc($rr['outq_hash'])
-					);
-				}
-			}
-		}
-
-		$encrypted = crypto_encapsulate(json_encode($ret),$sitekey);
-		json_return_and_die($encrypted);
-
-		/* pickup: end */
-	}
-
-
-	/*
-	 * All other message types require us to verify the sender. This is a generic check, so we 
-	 * will do it once here and bail if anything goes wrong.
-	 */
-
-	if (array_key_exists('sender',$data)) {
-		$sender = $data['sender'];
-	}
-
-	/* Check if the sender is already verified here */
-
-	$hubs = zot_gethub($sender,true);
-
-	if (! $hubs) {
-
-		/* Have never seen this guid or this guid coming from this location. Check it and register it. */
-
-		// (!!) this will validate the sender
-		$result = zot_register_hub($sender);
-
-		if ((! $result['success']) || (! ($hubs = zot_gethub($sender,true)))) {
-			$ret['message'] = 'Hub not available.';
-			logger('mod_zot: no hub');
-			json_return_and_die($ret);
-		}
-	}
-
-
-	foreach($hubs as $hub) {
-
-		$sitekey = $hub['hubloc_sitekey'];
-
-		if(array_key_exists('sitekey',$sender) && $sender['sitekey']) {
-
-			/*
-			 * This hub has now been proven to be valid.
-			 * Any hub with the same URL and a different sitekey cannot be valid.
-			 * Get rid of them (mark them deleted). There's a good chance they were re-installs.
-			 */
+	$z = new Zotlabs\Zot\Receiver($_REQUEST['data'],get_config('system','prvkey'), new Zotlabs\Zot\ZotHandler());
 	
-			q("update hubloc set hubloc_deleted = 1, hubloc_error = 1 where hubloc_url = '%s' and hubloc_sitekey != '%s' ",
-				dbesc($hub['hubloc_url']),
-				dbesc($sender['sitekey'])
-			);
-
-			$sitekey = $sender['sitekey'];
-		}
-
-		// $sender['sitekey'] is a new addition to the protcol to distinguish 
-		// hublocs coming from re-installed sites. Older sites will not provide
-		// this field and we have to still mark them valid, since we can't tell
-		// if this hubloc has the same sitekey as the packet we received.
-
-
-		// Update our DB to show when we last communicated successfully with this hub
-		// This will allow us to prune dead hubs from using up resources
-
-		$r = q("update hubloc set hubloc_connected = '%s' where hubloc_id = %d and hubloc_sitekey = '%s' ",
-			dbesc(datetime_convert()),
-			intval($hub['hubloc_id']),
-			dbesc($sitekey)
-		);
-
-		// a dead hub came back to life - reset any tombstones we might have
-
-		if(intval($hub['hubloc_error'])) {
-			q("update hubloc set hubloc_error = 0 where hubloc_id = %d and hubloc_sitekey = '%s' ",
-				intval($hub['hubloc_id']),
-				dbesc($sitekey)		
-			);
-			if(intval($r[0]['hubloc_orphancheck'])) {
-				q("update hubloc set hubloc_orhpancheck = 0 where hubloc_id = %d and hubloc_sitekey = '%s' ",
-					intval($hub['hubloc_id']),
-					dbesc($sitekey)
-				);
-			}
-			q("update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'",
-				dbesc($hub['hubloc_hash'])
-			);
-		}
-		
-		$connecting_url = $hub['hubloc_url'];
-	}
-
-
-	/** @TODO check which hub is primary and take action if mismatched */
-
-	if (array_key_exists('recipients', $data))
-		$recipients = $data['recipients'];
-
+	// notreached;
 
-	if ($msgtype === 'auth_check') {
-
-		/*
-		 * Requestor visits /magic/?dest=somewhere on their own site with a browser
-		 * magic redirects them to $destsite/post [with auth args....]
-		 * $destsite sends an auth_check packet to originator site
-		 * The auth_check packet is handled here by the originator's site 
-		 * - the browser session is still waiting
-		 * inside $destsite/post for everything to verify
-		 * If everything checks out we'll return a token to $destsite
-		 * and then $destsite will verify the token, authenticate the browser
-		 * session and then redirect to the original destination.
-		 * If authentication fails, the redirection to the original destination
-		 * will still take place but without authentication.
-		 */
-		logger('mod_zot: auth_check', LOGGER_DEBUG);
-
-		if (! $encrypted_packet) {
-			logger('mod_zot: auth_check packet was not encrypted.');
-			$ret['message'] .= 'no packet encryption' . EOL;
-			json_return_and_die($ret);
-		}
-
-		$arr = $data['sender'];
-		$sender_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
-
-		// garbage collect any old unused notifications
-
-		// This was and should be 10 minutes but my hosting provider has time lag between the DB and 
-		// the web server. We should probably convert this to webserver time rather than DB time so 
-		// that the different clocks won't affect it and allow us to keep the time short. 
-
-		q("delete from verify where type = 'auth' and created < %s - INTERVAL %s",
-			db_utcnow(), db_quoteinterval('30 MINUTE')
-		);
-
-		$y = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1",
-			dbesc($sender_hash)
-		);
-
-		// We created a unique hash in mod/magic.php when we invoked remote auth, and stored it in
-		// the verify table. It is now coming back to us as 'secret' and is signed by a channel at the other end.
-		// First verify their signature. We will have obtained a zot-info packet from them as part of the sender
-		// verification. 
-
-		if ((! $y) || (! rsa_verify($data['secret'], base64url_decode($data['secret_sig']),$y[0]['xchan_pubkey']))) {
-			logger('mod_zot: auth_check: sender not found or secret_sig invalid.');
-			$ret['message'] .= 'sender not found or sig invalid ' . print_r($y,true) . EOL;
-			json_return_and_die($ret);
-		}
-
-		// There should be exactly one recipient, the original auth requestor
-
-		$ret['message'] .= 'recipients ' . print_r($recipients,true) . EOL;
-
-		if ($data['recipients']) {
-
-			$arr = $data['recipients'][0];
-			$recip_hash = make_xchan_hash($arr['guid'], $arr['guid_sig']);
-			$c = q("select channel_id, channel_account_id, channel_prvkey from channel where channel_hash = '%s' limit 1",
-				dbesc($recip_hash)
-			);
-			if (! $c) {
-				logger('mod_zot: auth_check: recipient channel not found.');
-				$ret['message'] .= 'recipient not found.' . EOL;
-				json_return_and_die($ret);
-			}
-
-			$confirm = base64url_encode(rsa_sign($data['secret'] . $recip_hash,$c[0]['channel_prvkey']));
-
-			// This additionally checks for forged sites since we already stored the expected result in meta
-			// and we've already verified that this is them via zot_gethub() and that their key signed our token
-
-			$z = q("select id from verify where channel = %d and type = 'auth' and token = '%s' and meta = '%s' limit 1",
-				intval($c[0]['channel_id']),
-				dbesc($data['secret']),
-				dbesc($data['sender']['url'])
-			);
-			if (! $z) {
-				logger('mod_zot: auth_check: verification key not found.');
-				$ret['message'] .= 'verification key not found' . EOL;
-				json_return_and_die($ret);
-			}
-			$r = q("delete from verify where id = %d",
-				intval($z[0]['id'])
-			);
-
-			$u = q("select account_service_class from account where account_id = %d limit 1",
-				intval($c[0]['channel_account_id'])
-			);
-
-			logger('mod_zot: auth_check: success', LOGGER_DEBUG);
-			$ret['success'] = true;
-			$ret['confirm'] = $confirm;
-			if ($u && $u[0]['account_service_class'])
-				$ret['service_class'] = $u[0]['account_service_class'];
-
-			// Set "do not track" flag if this site or this channel's profile is restricted
-			// in some way
-
-			if (intval(get_config('system','block_public')))
-				$ret['DNT'] = true;
-			if (! perm_is_allowed($c[0]['channel_id'],'','view_profile'))
-				$ret['DNT'] = true;
-			if (get_pconfig($c[0]['channel_id'],'system','do_not_track'))
-				$ret['DNT'] = true;
-			if (get_pconfig($c[0]['channel_id'],'system','hide_online_status'))
-				$ret['DNT'] = true;
-
-			json_return_and_die($ret);
-		}
-		json_return_and_die($ret);
-	}
-
-	if ($msgtype === 'request') {
-		// request a particular post/conversation by message_id
-		$x = zot_process_message_request($data);
-		json_return_and_die($x);		
-	}
-
-	if ($msgtype === 'purge') {
-		if ($recipients) {
-			// basically this means "unfriend"
-			foreach ($recipients as $recip) {
-				$r = q("select channel.*,xchan.* from channel 
-					left join xchan on channel_hash = xchan_hash
-					where channel_guid = '%s' and channel_guid_sig = '%s' limit 1",
-					dbesc($recip['guid']),
-					dbesc($recip['guid_sig'])
-				);
-				if ($r) {
-					$r = q("select abook_id from abook where uid = %d and abook_xchan = '%s' limit 1",
-						intval($r[0]['channel_id']),
-						dbesc(make_xchan_hash($sender['guid'],$sender['guid_sig']))
-					);
-					if ($r) {
-						contact_remove($r[0]['channel_id'],$r[0]['abook_id']);
-					}
-				}
-			}
-		} else {
-			// Unfriend everybody - basically this means the channel has committed suicide
-			$arr = $data['sender'];
-			$sender_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
-
-			require_once('include/Contact.php');
-			remove_all_xchan_resources($sender_hash);	
-
-			$ret['success'] = true;
-			json_return_and_die($ret);
-		}
-	}
-
-	if (($msgtype === 'refresh') || ($msgtype === 'force_refresh')) {
-
-		// remote channel info (such as permissions or photo or something)
-		// has been updated. Grab a fresh copy and sync it.
-		// The difference between refresh and force_refresh is that 
-		// force_refresh unconditionally creates a directory update record,
-		// even if no changes were detected upon processing.
-
-		if ($recipients) {
-
-			// This would be a permissions update, typically for one connection
-
-			foreach ($recipients as $recip) {
-				$r = q("select channel.*,xchan.* from channel 
-					left join xchan on channel_hash = xchan_hash
-					where channel_guid = '%s' and channel_guid_sig = '%s' limit 1",
-					dbesc($recip['guid']),
-					dbesc($recip['guid_sig'])
-				);
-
-				$x = zot_refresh(array(
-						'xchan_guid'     => $sender['guid'], 
-						'xchan_guid_sig' => $sender['guid_sig'],
-						'hubloc_url'     => $sender['url']
-				), $r[0], (($msgtype === 'force_refresh') ? true : false));
-			}
-		} else {
-
-			// system wide refresh
-
-			$x = zot_refresh(array(
-				'xchan_guid'     => $sender['guid'], 
-				'xchan_guid_sig' => $sender['guid_sig'],
-				'hubloc_url'     => $sender['url']
-			), null, (($msgtype === 'force_refresh') ? true : false));
-		}
-		$ret['success'] = true;
-		json_return_and_die($ret);
-	}
-
-	if ($msgtype === 'notify') {
-
-		logger('notify received from ' . $connecting_url);
-
-
-		$async = get_config('system','queued_fetch');
-
-		if ($async) {
-			// add to receive queue
-			// qreceive_add($data);
-		} else {
-			$x = zot_fetch($data);
-			$ret['delivery_report'] = $x;
-		}
-
-		$ret['success'] = true;
-		json_return_and_die($ret);
-	}
+	exit;
 
-	// catchall
-	json_return_and_die($ret);
 }
diff --git a/mod/register.php b/mod/register.php
index 70bdcf350..2e9967c60 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -103,7 +103,9 @@ function register_post(&$a) {
 
 	if($using_invites && $invite_code) {
 		q("delete * from register where hash = '%s'", dbesc($invite_code));
-		set_pconfig($result['account']['account_id'],'system','invites_remaining',$num_invites);
+// @FIXME - this total needs to be stored by account, but pconfig operates on channels
+// This also needs to be considered when using 'invites_remaining' in mod/invite.php
+//		set_pconfig($result['account']['account_id'],'system','invites_remaining',$num_invites);
 	}
 
 	if($policy == REGISTER_OPEN ) {
diff --git a/mod/rpost.php b/mod/rpost.php
index d519a996b..ab5ef4ccd 100644
--- a/mod/rpost.php
+++ b/mod/rpost.php
@@ -111,7 +111,7 @@ function rpost_content(&$a) {
 		'default_location' => $channel['channel_location'],
 		'nickname' => $channel['channel_address'],
 		'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
-		'acl' => populate_acl($channel_acl),
+		'acl' => populate_acl($channel_acl,true,(($channel['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')),
 		'bang' => '',
 		'visitor' => true,
 		'profile_uid' => local_channel(),
diff --git a/mod/settings.php b/mod/settings.php
index 339f83cfe..275b2a96f 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -367,7 +367,7 @@ function settings_post(&$a) {
 			}
 
 			$r = q("update abook set abook_my_perms  = %d where abook_channel = %d and abook_self = 1",
-				intval(($role_permissions['perms_auto']) ? intval($role_permissions['perms_accept']) : 0),
+				intval((array_key_exists('perms_accept',$role_permissions)) ? $role_permissions['perms_accept'] : 0),
 				intval(local_channel())
 			);
 			set_pconfig(local_channel(),'system','autoperms',(($role_permissions['perms_auto']) ? intval($role_permissions['perms_accept']) : 0));
diff --git a/mod/subthread.php b/mod/subthread.php
index 74d742b6a..ce087806e 100755
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -147,7 +147,6 @@ function subthread_content(&$a) {
 	$arr['deny_cid']      = $item['deny_cid'];
 	$arr['deny_gid']      = $item['deny_gid'];
 
-
 	$post = item_store($arr);	
 	$post_id = $post['item_id'];
 
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 8677c2b83..f52a4f2e5 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -6,14 +6,16 @@ require_once('include/photos.php');
 
 function wall_attach_post(&$a) {
 
-	if(argc() > 1)
-		$channel = get_channel_by_nick(argv(1));
-	elseif($_FILES['media']) {
-		require_once('include/api.php');
-		$user_info = api_get_user($a);
+	$using_api = false;
+
+	if($a->data['api_info'] && array_key_exists('media',$_FILES)) {
+		$using_api = true;
+		$user_info = $a->data['api_info'];
 		$nick = $user_info['screen_name'];
 		$channel = get_channel_by_nick($user_info['screen_name']);
-    }
+	}
+	elseif(argc() > 1)
+		$channel = get_channel_by_nick(argv(1));
 
 	if(! $channel)
 		killme();
@@ -49,12 +51,16 @@ function wall_attach_post(&$a) {
 	}
 
 	if(intval($r['data']['is_photo'])) {
-		echo "\n\n" . $r['body'] . "\n\n";
-		if($using_api)
-			return;
-		killme();
+		$s = "\n\n" . $r['body'] . "\n\n";
+	}
+	else {
+		$s =  "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
 	}
-	echo  "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
+
+	if($using_api)
+		return $s;
+
+	echo $s;
 	killme();
 
 }
diff --git a/mod/wfinger.php b/mod/wfinger.php
index 8b9abe4af..5270c8f31 100644
--- a/mod/wfinger.php
+++ b/mod/wfinger.php
@@ -101,6 +101,11 @@ function wfinger_init(&$a) {
 			),
 
 			array(
+				'rel' => 'http://ostatus.org/schema/1.0/subscribe',
+				'template' => z_root() . '/follow/url={uri}',
+			),
+
+			array(
 				'rel' => 'http://purl.org/zot/protocol',
 				'href' => z_root() . '/.well-known/zot-info' . '?address=' . $r[0]['xchan_addr'],
 			)
diff --git a/mod/xrd.php b/mod/xrd.php
index a373f8bf5..34ed47149 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -50,6 +50,7 @@ function xrd_init(&$a) {
 //		'$salmon'      => $a->get_baseurl() . '/salmon/'        . $r[0]['channel_address'],
 //		'$salmen'      => $a->get_baseurl() . '/salmon/'        . $r[0]['channel_address'] . '/mention',
 		'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
+		'$subscribe'   => $a->get_baseurl() . '/follow?url={uri}',
 //		'$bigkey'      =>  salmon_key($r[0]['pubkey'])
 	));
 
diff --git a/util/hmessages.po b/util/hmessages.po
index e62920817..a301a2f78 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-11-27.1229\n"
+"Project-Id-Version: 2016-01-01.1264\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-27 00:03-0800\n"
+"POT-Creation-Date: 2016-01-01 00:03-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../include/Contact.php:101 ../../include/identity.php:953
+#: ../../include/Contact.php:101 ../../include/identity.php:947
 #: ../../include/widgets.php:137 ../../include/widgets.php:175
 #: ../../include/conversation.php:953 ../../mod/match.php:64
 #: ../../mod/directory.php:318 ../../mod/suggest.php:52
@@ -53,17 +53,17 @@ msgstr ""
 msgid "Room not found."
 msgstr ""
 
-#: ../../include/chat.php:133 ../../include/items.php:4396
-#: ../../include/attach.php:140 ../../include/attach.php:188
-#: ../../include/attach.php:251 ../../include/attach.php:265
-#: ../../include/attach.php:272 ../../include/attach.php:337
-#: ../../include/attach.php:351 ../../include/attach.php:358
-#: ../../include/attach.php:436 ../../include/attach.php:884
-#: ../../include/attach.php:955 ../../include/attach.php:1107
-#: ../../include/photos.php:29 ../../mod/filestorage.php:18
+#: ../../include/chat.php:133 ../../include/items.php:4405
+#: ../../include/photos.php:29 ../../include/attach.php:140
+#: ../../include/attach.php:188 ../../include/attach.php:251
+#: ../../include/attach.php:265 ../../include/attach.php:272
+#: ../../include/attach.php:337 ../../include/attach.php:351
+#: ../../include/attach.php:358 ../../include/attach.php:436
+#: ../../include/attach.php:888 ../../include/attach.php:959
+#: ../../include/attach.php:1111 ../../mod/filestorage.php:18
 #: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/group.php:9 ../../mod/item.php:205
-#: ../../mod/item.php:213 ../../mod/item.php:1049 ../../mod/common.php:35
+#: ../../mod/filestorage.php:115 ../../mod/group.php:9 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:1050 ../../mod/common.php:35
 #: ../../mod/achievements.php:30 ../../mod/rate.php:111
 #: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/id.php:71
 #: ../../mod/like.php:177 ../../mod/page.php:31 ../../mod/page.php:86
@@ -76,20 +76,20 @@ msgstr ""
 #: ../../mod/editwebpage.php:125 ../../mod/profile.php:64
 #: ../../mod/profile.php:72 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/fsuggest.php:78 ../../mod/sources.php:66
-#: ../../mod/notifications.php:66 ../../mod/photos.php:70
-#: ../../mod/profile_photo.php:341 ../../mod/profile_photo.php:354
-#: ../../mod/thing.php:271 ../../mod/thing.php:291 ../../mod/thing.php:328
-#: ../../mod/editblock.php:65 ../../mod/network.php:12
-#: ../../mod/pdledit.php:21 ../../mod/register.php:72
+#: ../../mod/notifications.php:66 ../../mod/invite.php:13
+#: ../../mod/invite.php:87 ../../mod/profile_photo.php:341
+#: ../../mod/profile_photo.php:354 ../../mod/thing.php:271
+#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/editblock.php:65
+#: ../../mod/network.php:12 ../../mod/pdledit.php:21 ../../mod/register.php:72
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
 #: ../../mod/settings.php:568 ../../mod/webpages.php:69
 #: ../../mod/appman.php:66 ../../mod/layouts.php:69 ../../mod/layouts.php:76
-#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/mail.php:118
-#: ../../mod/regmod.php:17 ../../mod/channel.php:100 ../../mod/channel.php:214
-#: ../../mod/channel.php:254 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../mod/editpost.php:13 ../../mod/chat.php:94 ../../mod/chat.php:99
-#: ../../mod/viewsrc.php:14 ../../mod/authtest.php:13
-#: ../../mod/connections.php:29 ../../mod/manage.php:6 ../../mod/menu.php:74
+#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/regmod.php:17
+#: ../../mod/channel.php:100 ../../mod/channel.php:214
+#: ../../mod/channel.php:254 ../../mod/photos.php:70 ../../mod/editpost.php:13
+#: ../../mod/chat.php:94 ../../mod/chat.php:99 ../../mod/viewsrc.php:14
+#: ../../mod/authtest.php:13 ../../mod/connections.php:29
+#: ../../mod/manage.php:6 ../../mod/menu.php:74 ../../mod/mail.php:126
 #: ../../mod/service_limits.php:7 ../../mod/suggest.php:26
 #: ../../mod/events.php:260 ../../mod/message.php:16 ../../mod/block.php:22
 #: ../../mod/block.php:72 ../../mod/mitem.php:111 ../../mod/sharedwithme.php:7
@@ -119,15 +119,390 @@ msgstr ""
 msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:239
-msgid "parent"
+#: ../../include/text.php:394
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:396
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:425
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:428
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:438
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:440
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:803
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:815
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:828 ../../mod/viewconnections.php:101
+msgid "View Connections"
+msgstr ""
+
+#: ../../include/text.php:885 ../../include/text.php:897
+#: ../../include/nav.php:159 ../../include/apps.php:147
+#: ../../mod/search.php:40
+msgid "Search"
+msgstr ""
+
+#: ../../include/text.php:886 ../../include/text.php:898
+#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:100 ../../mod/admin.php:1454 ../../mod/admin.php:1474
+#: ../../mod/filer.php:49
+msgid "Save"
+msgstr ""
+
+#: ../../include/text.php:972
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:972 ../../include/conversation.php:243
+msgid "poked"
+msgstr ""
+
+#: ../../include/text.php:973
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:973
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:974
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:974
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:975
+msgid "slap"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2582
+#: ../../include/text.php:975
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:976
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:976
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:977
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:977
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:987
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:988
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:989
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:990
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:991
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:992
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:993
+msgid "stupefied"
+msgstr ""
+
+#: ../../include/text.php:994
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:995
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:996
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:997
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:998
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:999
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:1000
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:1001
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:1002
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:1003
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:1004
+msgid "depressed"
+msgstr ""
+
+#: ../../include/text.php:1005
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:1006
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:1007
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr ""
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr ""
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr ""
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:45
+msgid "January"
+msgstr ""
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:46
+msgid "February"
+msgstr ""
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:47
+msgid "March"
+msgstr ""
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:48
+msgid "April"
+msgstr ""
+
+#: ../../include/text.php:1183
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:50
+msgid "June"
+msgstr ""
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:51
+msgid "July"
+msgstr ""
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:52
+msgid "August"
+msgstr ""
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:53
+msgid "September"
+msgstr ""
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:54
+msgid "October"
+msgstr ""
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:55
+msgid "November"
+msgstr ""
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:56
+msgid "December"
+msgstr ""
+
+#: ../../include/text.php:1260 ../../include/text.php:1264
+msgid "Unknown Attachment"
+msgstr ""
+
+#: ../../include/text.php:1266 ../../include/RedDAV/RedBrowser.php:237
+#: ../../mod/sharedwithme.php:97
+msgid "Size"
+msgstr ""
+
+#: ../../include/text.php:1266
+msgid "unknown"
+msgstr ""
+
+#: ../../include/text.php:1302
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1379
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1410 ../../include/event.php:22
+#: ../../include/bb2diaspora.php:465
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
+#: ../../include/text.php:1414 ../../include/event.php:30
+#: ../../include/bb2diaspora.php:471
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/text.php:1418 ../../include/event.php:40
+#: ../../include/bb2diaspora.php:479
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/text.php:1425 ../../include/event.php:52
+#: ../../include/identity.php:998 ../../include/bb2diaspora.php:487
+#: ../../mod/directory.php:304
+msgid "Location:"
+msgstr ""
+
+#: ../../include/text.php:1521 ../../include/text.php:1532
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1716 ../../mod/events.php:623
+msgid "Link to Source"
+msgstr ""
+
+#: ../../include/text.php:1737 ../../include/text.php:1809
+msgid "default"
+msgstr ""
+
+#: ../../include/text.php:1745
+msgid "Page layout"
+msgstr ""
+
+#: ../../include/text.php:1745
+msgid "You can create your own with the layouts tool"
+msgstr ""
+
+#: ../../include/text.php:1787
+msgid "Page content type"
+msgstr ""
+
+#: ../../include/text.php:1821
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1940 ../../include/conversation.php:120
+#: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
+msgid "photo"
+msgstr ""
+
+#: ../../include/text.php:1943 ../../include/event.php:904
+#: ../../include/conversation.php:123 ../../mod/tagger.php:47
+#: ../../mod/like.php:363 ../../mod/events.php:249
+msgid "event"
+msgstr ""
+
+#: ../../include/text.php:1946 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:83
+msgid "status"
+msgstr ""
+
+#: ../../include/text.php:1948 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr ""
+
+#: ../../include/text.php:1953
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:2248
+msgid "Design Tools"
+msgstr ""
+
+#: ../../include/text.php:2251 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr ""
+
+#: ../../include/text.php:2252 ../../mod/menu.php:103
+msgid "Menus"
+msgstr ""
+
+#: ../../include/text.php:2253 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr ""
+
+#: ../../include/text.php:2254
+msgid "Pages"
+msgstr ""
+
+#: ../../include/text.php:2606 ../../include/RedDAV/RedBrowser.php:131
 msgid "Collection"
 msgstr ""
 
+#: ../../include/RedDAV/RedBrowser.php:107
+#: ../../include/RedDAV/RedBrowser.php:239
+msgid "parent"
+msgstr ""
+
 #: ../../include/RedDAV/RedBrowser.php:134
 msgid "Principal"
 msgstr ""
@@ -148,16 +523,16 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1317
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1330
 #: ../../include/conversation.php:1027 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../mod/photos.php:759
-#: ../../mod/photos.php:1198
+#: ../../include/apps.php:415 ../../mod/photos.php:754
+#: ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:226 ../../include/conversation.php:1629
 #: ../../include/nav.php:93 ../../include/apps.php:135
-#: ../../mod/fbrowser.php:114
+#: ../../mod/fbrowser.php:109
 msgid "Files"
 msgstr ""
 
@@ -177,13 +552,13 @@ msgid "Create"
 msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1329
-#: ../../mod/photos.php:784 ../../mod/photos.php:1317
-#: ../../mod/profile_photo.php:453
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1343
+#: ../../mod/profile_photo.php:453 ../../mod/photos.php:781
+#: ../../mod/photos.php:1316
 msgid "Upload"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:974
+#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:986
 #: ../../mod/settings.php:588 ../../mod/settings.php:614
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
@@ -193,11 +568,6 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:237 ../../include/text.php:1248
-#: ../../mod/sharedwithme.php:97
-msgid "Size"
-msgstr ""
-
 #: ../../include/RedDAV/RedBrowser.php:238 ../../mod/sharedwithme.php:98
 msgid "Last Modified"
 msgstr ""
@@ -218,10 +588,10 @@ msgstr ""
 #: ../../include/RedDAV/RedBrowser.php:241 ../../include/conversation.php:657
 #: ../../include/ItemObject.php:120 ../../include/apps.php:260
 #: ../../mod/group.php:173 ../../mod/blocks.php:155 ../../mod/connedit.php:551
-#: ../../mod/editwebpage.php:223 ../../mod/photos.php:1129
-#: ../../mod/thing.php:258 ../../mod/editblock.php:181 ../../mod/admin.php:809
-#: ../../mod/admin.php:968 ../../mod/editlayout.php:179
-#: ../../mod/settings.php:649 ../../mod/webpages.php:183
+#: ../../mod/editwebpage.php:223 ../../mod/thing.php:258
+#: ../../mod/editblock.php:181 ../../mod/admin.php:821 ../../mod/admin.php:980
+#: ../../mod/editlayout.php:179 ../../mod/settings.php:649
+#: ../../mod/webpages.php:183 ../../mod/photos.php:1126
 msgid "Delete"
 msgstr ""
 
@@ -252,7 +622,7 @@ msgid "Delete this item?"
 msgstr ""
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:696
-#: ../../mod/photos.php:1047 ../../mod/photos.php:1165
+#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
 msgid "Comment"
 msgstr ""
 
@@ -318,24 +688,25 @@ msgid "Describe (optional)"
 msgstr ""
 
 #: ../../include/js_strings.php:22 ../../include/widgets.php:676
-#: ../../include/ItemObject.php:697 ../../mod/filestorage.php:156
-#: ../../mod/group.php:81 ../../mod/connect.php:93 ../../mod/rate.php:168
-#: ../../mod/mood.php:135 ../../mod/setup.php:331 ../../mod/setup.php:371
-#: ../../mod/pconfig.php:108 ../../mod/poke.php:171 ../../mod/profiles.php:675
+#: ../../include/widgets.php:688 ../../include/ItemObject.php:697
+#: ../../mod/filestorage.php:156 ../../mod/group.php:81
+#: ../../mod/connect.php:93 ../../mod/rate.php:168 ../../mod/mood.php:135
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/pconfig.php:108
+#: ../../mod/poke.php:171 ../../mod/profiles.php:675
 #: ../../mod/connedit.php:715 ../../mod/fsuggest.php:108
 #: ../../mod/sources.php:104 ../../mod/sources.php:138
-#: ../../mod/import.php:527 ../../mod/photos.php:637 ../../mod/photos.php:1008
-#: ../../mod/photos.php:1048 ../../mod/photos.php:1166 ../../mod/thing.php:313
+#: ../../mod/import.php:527 ../../mod/invite.php:142 ../../mod/thing.php:313
 #: ../../mod/thing.php:359 ../../mod/import_items.php:122
-#: ../../mod/pdledit.php:58 ../../mod/admin.php:435 ../../mod/admin.php:802
-#: ../../mod/admin.php:966 ../../mod/admin.php:1103 ../../mod/admin.php:1297
-#: ../../mod/admin.php:1382 ../../mod/settings.php:586
+#: ../../mod/pdledit.php:58 ../../mod/admin.php:447 ../../mod/admin.php:814
+#: ../../mod/admin.php:978 ../../mod/admin.php:1115 ../../mod/admin.php:1309
+#: ../../mod/admin.php:1394 ../../mod/settings.php:586
 #: ../../mod/settings.php:698 ../../mod/settings.php:726
 #: ../../mod/settings.php:749 ../../mod/settings.php:834
 #: ../../mod/settings.php:1023 ../../mod/appman.php:99 ../../mod/locs.php:116
-#: ../../mod/mail.php:371 ../../mod/xchan.php:11 ../../mod/invite.php:142
-#: ../../mod/chat.php:184 ../../mod/chat.php:213 ../../mod/events.php:476
-#: ../../mod/events.php:673 ../../mod/mitem.php:231
+#: ../../mod/xchan.php:11 ../../mod/photos.php:637 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1045 ../../mod/photos.php:1163 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/mail.php:380 ../../mod/events.php:461
+#: ../../mod/events.php:658 ../../mod/mitem.php:231
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr ""
@@ -349,7 +720,7 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr ""
 
 #: ../../include/js_strings.php:25 ../../mod/pubsites.php:28
-#: ../../mod/profiles.php:464 ../../mod/events.php:467
+#: ../../mod/profiles.php:464 ../../mod/events.php:452
 msgid "Location"
 msgstr ""
 
@@ -426,55 +797,11 @@ msgstr ""
 msgid "timeago.numbers"
 msgstr ""
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1165
-msgid "January"
-msgstr ""
-
-#: ../../include/js_strings.php:46 ../../include/text.php:1165
-msgid "February"
-msgstr ""
-
-#: ../../include/js_strings.php:47 ../../include/text.php:1165
-msgid "March"
-msgstr ""
-
-#: ../../include/js_strings.php:48 ../../include/text.php:1165
-msgid "April"
-msgstr ""
-
 #: ../../include/js_strings.php:49
 msgctxt "long"
 msgid "May"
 msgstr ""
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1165
-msgid "June"
-msgstr ""
-
-#: ../../include/js_strings.php:51 ../../include/text.php:1165
-msgid "July"
-msgstr ""
-
-#: ../../include/js_strings.php:52 ../../include/text.php:1165
-msgid "August"
-msgstr ""
-
-#: ../../include/js_strings.php:53 ../../include/text.php:1165
-msgid "September"
-msgstr ""
-
-#: ../../include/js_strings.php:54 ../../include/text.php:1165
-msgid "October"
-msgstr ""
-
-#: ../../include/js_strings.php:55 ../../include/text.php:1165
-msgid "November"
-msgstr ""
-
-#: ../../include/js_strings.php:56 ../../include/text.php:1165
-msgid "December"
-msgstr ""
-
 #: ../../include/js_strings.php:57
 msgid "Jan"
 msgstr ""
@@ -524,34 +851,6 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1161
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/js_strings.php:70 ../../include/text.php:1161
-msgid "Monday"
-msgstr ""
-
-#: ../../include/js_strings.php:71 ../../include/text.php:1161
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/js_strings.php:72 ../../include/text.php:1161
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/js_strings.php:73 ../../include/text.php:1161
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/js_strings.php:74 ../../include/text.php:1161
-msgid "Friday"
-msgstr ""
-
-#: ../../include/js_strings.php:75 ../../include/text.php:1161
-msgid "Saturday"
-msgstr ""
-
 #: ../../include/js_strings.php:76
 msgid "Sun"
 msgstr ""
@@ -613,7 +912,7 @@ msgstr ""
 msgid "Import completed."
 msgstr ""
 
-#: ../../include/comanche.php:34 ../../mod/admin.php:351
+#: ../../include/comanche.php:34 ../../mod/admin.php:356
 msgid "Default"
 msgstr ""
 
@@ -624,148 +923,75 @@ msgstr ""
 msgid "Permission denied"
 msgstr ""
 
-#: ../../include/items.php:1128 ../../include/items.php:1174
+#: ../../include/items.php:1130 ../../include/items.php:1176
 msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/items.php:1371
+#: ../../include/items.php:1373
 msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/items.php:1373
+#: ../../include/items.php:1375
 msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/items.php:1375
+#: ../../include/items.php:1377
 msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/items.php:1377
+#: ../../include/items.php:1379
 msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/items.php:1379
+#: ../../include/items.php:1381
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/items.php:1381
+#: ../../include/items.php:1383
 msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/items.php:1383
+#: ../../include/items.php:1385
 msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/items.php:1385
+#: ../../include/items.php:1387
 msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/items.php:4317 ../../mod/filestorage.php:27
-#: ../../mod/thing.php:86 ../../mod/admin.php:127 ../../mod/admin.php:1005
-#: ../../mod/admin.php:1210 ../../mod/display.php:36 ../../mod/viewsrc.php:20
+#: ../../include/items.php:4326 ../../mod/filestorage.php:27
+#: ../../mod/display.php:36 ../../mod/thing.php:86 ../../mod/admin.php:129
+#: ../../mod/admin.php:1017 ../../mod/admin.php:1222 ../../mod/viewsrc.php:20
 msgid "Item not found."
 msgstr ""
 
-#: ../../include/items.php:4826 ../../mod/group.php:38 ../../mod/group.php:137
+#: ../../include/items.php:4838 ../../mod/group.php:38 ../../mod/group.php:137
 msgid "Collection not found."
 msgstr ""
 
-#: ../../include/items.php:4842
+#: ../../include/items.php:4854
 msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/items.php:4849
+#: ../../include/items.php:4861
 #, php-format
 msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/items.php:4859 ../../mod/connedit.php:683
+#: ../../include/items.php:4871 ../../mod/connedit.php:683
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/items.php:4861
+#: ../../include/items.php:4873
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr ""
-
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr ""
-
-#: ../../include/message.php:43
-msgid "Unable to determine sender."
-msgstr ""
-
-#: ../../include/message.php:218
-msgid "Stored post could not be verified."
-msgstr ""
-
-#: ../../include/network.php:630
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:1608 ../../include/enotify.php:57
-msgid "$Projectname Notification"
-msgstr ""
-
-#: ../../include/network.php:1609 ../../include/enotify.php:58
-msgid "$projectname"
-msgstr ""
-
-#: ../../include/network.php:1611 ../../include/enotify.php:60
-msgid "Thank You,"
-msgstr ""
-
-#: ../../include/network.php:1613 ../../include/enotify.php:62
-#, php-format
-msgid "%s Administrator"
-msgstr ""
-
-#: ../../include/network.php:1655 ../../include/account.php:316
-#: ../../include/account.php:343 ../../include/account.php:403
-msgid "Administrator"
-msgstr ""
-
-#: ../../include/network.php:1669
-msgid "No Subject"
-msgstr ""
-
-#: ../../include/event.php:22 ../../include/bb2diaspora.php:471
-#: ../../include/text.php:1392
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:477
-#: ../../include/text.php:1396
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:485
-#: ../../include/text.php:1400
-msgid "Finishes:"
-msgstr ""
-
-#: ../../include/event.php:52 ../../include/identity.php:1004
-#: ../../include/bb2diaspora.php:493 ../../include/text.php:1407
-#: ../../mod/directory.php:304
-msgid "Location:"
-msgstr ""
-
 #: ../../include/event.php:768
 msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/event.php:904 ../../include/conversation.php:123
-#: ../../include/text.php:1919 ../../mod/tagger.php:47 ../../mod/like.php:363
-#: ../../mod/events.php:249
-msgid "event"
-msgstr ""
-
 #: ../../include/event.php:967
 msgid "Not specified"
 msgstr ""
@@ -845,206 +1071,206 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:966 ../../mod/profiles.php:782
+#: ../../include/identity.php:960 ../../mod/profiles.php:782
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:966
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:966
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/identity.php:973 ../../mod/profiles.php:783
+#: ../../include/identity.php:967 ../../mod/profiles.php:783
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:976 ../../include/nav.php:90
+#: ../../include/identity.php:970 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/identity.php:988 ../../mod/profiles.php:794
+#: ../../include/identity.php:982 ../../mod/profiles.php:794
 msgid "Profile Image"
 msgstr ""
 
-#: ../../include/identity.php:991
+#: ../../include/identity.php:985
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:992 ../../mod/profiles.php:677
+#: ../../include/identity.php:986 ../../mod/profiles.php:677
 #: ../../mod/profiles.php:798
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:1008 ../../include/identity.php:1248
+#: ../../include/identity.php:1002 ../../include/identity.php:1242
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:1009 ../../include/identity.php:1292
+#: ../../include/identity.php:1003 ../../include/identity.php:1286
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:1010 ../../include/identity.php:1303
+#: ../../include/identity.php:1004 ../../include/identity.php:1297
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:1011
+#: ../../include/identity.php:1005
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:1095 ../../include/identity.php:1173
+#: ../../include/identity.php:1089 ../../include/identity.php:1167
 #: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:1096 ../../include/identity.php:1174
+#: ../../include/identity.php:1090 ../../include/identity.php:1168
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:1141 ../../include/identity.php:1213
+#: ../../include/identity.php:1135 ../../include/identity.php:1207
 #: ../../mod/ping.php:341
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:1152
+#: ../../include/identity.php:1146
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1153
+#: ../../include/identity.php:1147
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:1206
+#: ../../include/identity.php:1200
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:1224
+#: ../../include/identity.php:1218
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1225
+#: ../../include/identity.php:1219
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:1238 ../../include/identity.php:1355
+#: ../../include/identity.php:1232 ../../include/identity.php:1349
 #: ../../include/apps.php:138 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
 
-#: ../../include/identity.php:1246 ../../mod/settings.php:1029
+#: ../../include/identity.php:1240 ../../mod/settings.php:1029
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:1253
+#: ../../include/identity.php:1247
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/identity.php:1264 ../../include/taxonomy.php:414
+#: ../../include/identity.php:1258 ../../include/taxonomy.php:414
 #: ../../include/conversation.php:1721 ../../include/ItemObject.php:179
-#: ../../mod/photos.php:1086
+#: ../../mod/photos.php:1083
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/identity.php:1277
+#: ../../include/identity.php:1271
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:1278
+#: ../../include/identity.php:1272
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:1285
+#: ../../include/identity.php:1279
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:1289 ../../mod/directory.php:299
+#: ../../include/identity.php:1283 ../../mod/directory.php:299
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:1298
+#: ../../include/identity.php:1292
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1301 ../../mod/profiles.php:699
+#: ../../include/identity.php:1295 ../../mod/profiles.php:699
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:1305 ../../mod/profiles.php:701
+#: ../../include/identity.php:1299 ../../mod/profiles.php:701
 #: ../../mod/directory.php:315
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:1307
+#: ../../include/identity.php:1301
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:1309 ../../mod/profiles.php:702
+#: ../../include/identity.php:1303 ../../mod/profiles.php:702
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1305
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:1313 ../../mod/directory.php:317
+#: ../../include/identity.php:1307 ../../mod/directory.php:317
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:1315
+#: ../../include/identity.php:1309
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1317 ../../mod/profiles.php:705
+#: ../../include/identity.php:1311 ../../mod/profiles.php:705
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1319 ../../mod/profiles.php:706
+#: ../../include/identity.php:1313 ../../mod/profiles.php:706
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1321
+#: ../../include/identity.php:1315
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1317
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1319
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1327
+#: ../../include/identity.php:1321
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1329
+#: ../../include/identity.php:1323
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1325
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1333
+#: ../../include/identity.php:1327
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1335
+#: ../../include/identity.php:1329
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1337
+#: ../../include/identity.php:1331
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/identity.php:1357
+#: ../../include/identity.php:1351
 msgid "Like this thing"
 msgstr ""
 
@@ -1093,30 +1319,65 @@ msgstr ""
 msgid "dislikes"
 msgstr ""
 
-#: ../../include/acl_selectors.php:240
+#: ../../include/photos.php:112
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr ""
+
+#: ../../include/photos.php:119
+msgid "Image file is empty."
+msgstr ""
+
+#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
+msgid "Unable to process image"
+msgstr ""
+
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr ""
+
+#: ../../include/photos.php:297
+msgid "a new photo"
+msgstr ""
+
+#: ../../include/photos.php:301
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr ""
+
+#: ../../include/photos.php:506 ../../include/conversation.php:1625
+msgid "Photo Albums"
+msgstr ""
+
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr ""
+
+#: ../../include/acl_selectors.php:218
 msgid "Visible to your default audience"
 msgstr ""
 
-#: ../../include/acl_selectors.php:241
+#: ../../include/acl_selectors.php:243
 msgid "Show"
 msgstr ""
 
-#: ../../include/acl_selectors.php:242
+#: ../../include/acl_selectors.php:244
 msgid "Don't show"
 msgstr ""
 
-#: ../../include/acl_selectors.php:247
+#: ../../include/acl_selectors.php:249
 msgid "Other networks and post services"
 msgstr ""
 
-#: ../../include/acl_selectors.php:249 ../../mod/filestorage.php:147
-#: ../../mod/photos.php:631 ../../mod/photos.php:1001 ../../mod/thing.php:310
-#: ../../mod/thing.php:356 ../../mod/chat.php:211
+#: ../../include/acl_selectors.php:251 ../../mod/filestorage.php:147
+#: ../../mod/thing.php:310 ../../mod/thing.php:356 ../../mod/photos.php:631
+#: ../../mod/photos.php:998 ../../mod/chat.php:211
 msgid "Permissions"
 msgstr ""
 
-#: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:384
-#: ../../mod/photos.php:1218
+#: ../../include/acl_selectors.php:252 ../../include/ItemObject.php:384
+#: ../../mod/photos.php:1215
 msgid "Close"
 msgstr ""
 
@@ -1151,68 +1412,60 @@ msgstr ""
 msgid "No source file."
 msgstr ""
 
-#: ../../include/attach.php:514
+#: ../../include/attach.php:518
 msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/attach.php:532
+#: ../../include/attach.php:536
 msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/attach.php:667
+#: ../../include/attach.php:671
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/attach.php:681
+#: ../../include/attach.php:685
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/attach.php:837
+#: ../../include/attach.php:841
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/attach.php:850
+#: ../../include/attach.php:854
 msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/attach.php:898 ../../include/attach.php:914
+#: ../../include/attach.php:902 ../../include/attach.php:918
 msgid "Path not available."
 msgstr ""
 
-#: ../../include/attach.php:960 ../../include/attach.php:1112
+#: ../../include/attach.php:964 ../../include/attach.php:1116
 msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/attach.php:986
+#: ../../include/attach.php:990
 msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/attach.php:1008
+#: ../../include/attach.php:1012
 msgid "Path not found."
 msgstr ""
 
-#: ../../include/attach.php:1066
+#: ../../include/attach.php:1070
 msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/attach.php:1070
+#: ../../include/attach.php:1074
 msgid "database storage failed."
 msgstr ""
 
-#: ../../include/attach.php:1118
+#: ../../include/attach.php:1122
 msgid "Empty path"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:382
-msgid "Attachments:"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:473
-msgid "$Projectname event notification:"
-msgstr ""
-
 #: ../../include/notify.php:20
 msgid "created a new post"
 msgstr ""
@@ -1276,12 +1529,6 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: ../../include/widgets.php:192 ../../include/text.php:868
-#: ../../include/text.php:880 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100
-#: ../../mod/admin.php:1442 ../../mod/admin.php:1462 ../../mod/filer.php:49
-msgid "Save"
-msgstr ""
-
 #: ../../include/widgets.php:266
 msgid "Remove term"
 msgstr ""
@@ -1371,8 +1618,8 @@ msgid "Channel Sources"
 msgstr ""
 
 #: ../../include/widgets.php:554 ../../include/nav.php:202
-#: ../../include/apps.php:134 ../../mod/admin.php:1064
-#: ../../mod/admin.php:1264
+#: ../../include/apps.php:134 ../../mod/admin.php:1076
+#: ../../mod/admin.php:1276
 msgid "Settings"
 msgstr ""
 
@@ -1432,130 +1679,150 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: ../../include/widgets.php:674 ../../mod/events.php:669
+#: ../../include/widgets.php:674 ../../mod/events.php:654
 msgid "Export"
 msgstr ""
 
-#: ../../include/widgets.php:675 ../../mod/events.php:672
+#: ../../include/widgets.php:675 ../../mod/events.php:657
 msgid "Import"
 msgstr ""
 
-#: ../../include/widgets.php:749
+#: ../../include/widgets.php:685
+msgid "Events Tools"
+msgstr ""
+
+#: ../../include/widgets.php:686
+msgid "Export Calendar"
+msgstr ""
+
+#: ../../include/widgets.php:687
+msgid "Import Calendar"
+msgstr ""
+
+#: ../../include/widgets.php:761
 msgid "Chat Rooms"
 msgstr ""
 
-#: ../../include/widgets.php:769
+#: ../../include/widgets.php:781
 msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:789
+#: ../../include/widgets.php:801
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:916 ../../include/widgets.php:974
+#: ../../include/widgets.php:928 ../../include/widgets.php:986
 msgid "photo/image"
 msgstr ""
 
-#: ../../include/widgets.php:1069 ../../include/widgets.php:1071
+#: ../../include/widgets.php:1081 ../../include/widgets.php:1083
 msgid "Rate Me"
 msgstr ""
 
-#: ../../include/widgets.php:1075
+#: ../../include/widgets.php:1087
 msgid "View Ratings"
 msgstr ""
 
-#: ../../include/widgets.php:1086
+#: ../../include/widgets.php:1098
 msgid "Public Hubs"
 msgstr ""
 
-#: ../../include/widgets.php:1134
+#: ../../include/widgets.php:1146
 msgid "Forums"
 msgstr ""
 
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1175
 msgid "Tasks"
 msgstr ""
 
-#: ../../include/widgets.php:1170
+#: ../../include/widgets.php:1184
 msgid "Documentation"
 msgstr ""
 
-#: ../../include/widgets.php:1172
+#: ../../include/widgets.php:1186
 msgid "Project/Site Information"
 msgstr ""
 
-#: ../../include/widgets.php:1173
+#: ../../include/widgets.php:1187
 msgid "For Members"
 msgstr ""
 
-#: ../../include/widgets.php:1174
+#: ../../include/widgets.php:1188
 msgid "For Administrators"
 msgstr ""
 
-#: ../../include/widgets.php:1175
+#: ../../include/widgets.php:1189
 msgid "For Developers"
 msgstr ""
 
-#: ../../include/widgets.php:1200 ../../mod/admin.php:434
+#: ../../include/widgets.php:1214 ../../mod/admin.php:446
 msgid "Site"
 msgstr ""
 
-#: ../../include/widgets.php:1201
+#: ../../include/widgets.php:1215
 msgid "Accounts"
 msgstr ""
 
-#: ../../include/widgets.php:1202 ../../mod/admin.php:965
+#: ../../include/widgets.php:1216 ../../mod/admin.php:977
 msgid "Channels"
 msgstr ""
 
-#: ../../include/widgets.php:1203 ../../mod/admin.php:1062
-#: ../../mod/admin.php:1102
+#: ../../include/widgets.php:1217 ../../mod/admin.php:1074
+#: ../../mod/admin.php:1114
 msgid "Plugins"
 msgstr ""
 
-#: ../../include/widgets.php:1204 ../../mod/admin.php:1262
-#: ../../mod/admin.php:1296
+#: ../../include/widgets.php:1218 ../../mod/admin.php:1274
+#: ../../mod/admin.php:1308
 msgid "Themes"
 msgstr ""
 
-#: ../../include/widgets.php:1205
+#: ../../include/widgets.php:1219
 msgid "Inspect queue"
 msgstr ""
 
-#: ../../include/widgets.php:1206
+#: ../../include/widgets.php:1220
 msgid "Profile Config"
 msgstr ""
 
-#: ../../include/widgets.php:1207
+#: ../../include/widgets.php:1221
 msgid "DB updates"
 msgstr ""
 
-#: ../../include/widgets.php:1225 ../../include/widgets.php:1231
-#: ../../mod/admin.php:1381
+#: ../../include/widgets.php:1239 ../../include/widgets.php:1245
+#: ../../mod/admin.php:1393
 msgid "Logs"
 msgstr ""
 
-#: ../../include/widgets.php:1229 ../../include/nav.php:210
+#: ../../include/widgets.php:1243 ../../include/nav.php:210
 msgid "Admin"
 msgstr ""
 
-#: ../../include/widgets.php:1230
+#: ../../include/widgets.php:1244
 msgid "Plugin Features"
 msgstr ""
 
-#: ../../include/widgets.php:1232
+#: ../../include/widgets.php:1246
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../include/widgets.php:1311 ../../mod/photos.php:753
-#: ../../mod/photos.php:1286
+#: ../../include/widgets.php:1324 ../../mod/photos.php:748
+#: ../../mod/photos.php:1283
 msgid "View Photo"
 msgstr ""
 
-#: ../../include/widgets.php:1327 ../../mod/photos.php:782
+#: ../../include/widgets.php:1341 ../../mod/photos.php:779
 msgid "Edit Album"
 msgstr ""
 
+#: ../../include/bb2diaspora.php:376
+msgid "Attachments:"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:467
+msgid "$Projectname event notification:"
+msgstr ""
+
 #: ../../include/bookmarks.php:35
 #, php-format
 msgid "%1$s's bookmarks"
@@ -2072,11 +2339,11 @@ msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
 #: ../../include/datetime.php:236 ../../mod/appman.php:91
-#: ../../mod/appman.php:92 ../../mod/events.php:452 ../../mod/events.php:457
+#: ../../mod/appman.php:92 ../../mod/events.php:437 ../../mod/events.php:442
 msgid "Required"
 msgstr ""
 
-#: ../../include/datetime.php:263 ../../boot.php:2289
+#: ../../include/datetime.php:263 ../../boot.php:2291
 msgid "never"
 msgstr ""
 
@@ -2156,29 +2423,14 @@ msgstr ""
 msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../include/api.php:1302
+#: ../../include/api.php:1336
 msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/conversation.php:120 ../../include/text.php:1916
-#: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
-msgid "photo"
-msgstr ""
-
 #: ../../include/conversation.php:126 ../../mod/like.php:113
 msgid "channel"
 msgstr ""
 
-#: ../../include/conversation.php:148 ../../include/text.php:1922
-#: ../../mod/like.php:361 ../../mod/subthread.php:83
-msgid "status"
-msgstr ""
-
-#: ../../include/conversation.php:150 ../../include/text.php:1924
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr ""
-
 #: ../../include/conversation.php:164 ../../mod/like.php:410
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -2199,52 +2451,48 @@ msgstr ""
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:243 ../../include/text.php:954
-msgid "poked"
-msgstr ""
-
 #: ../../include/conversation.php:260 ../../mod/mood.php:63
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1063
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Likes"
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1063
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Agree"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Disagree"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Abstain"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Attending"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Not attending"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Might attend"
 msgstr ""
@@ -2299,8 +2547,8 @@ msgstr ""
 
 #: ../../include/conversation.php:740 ../../include/conversation.php:1227
 #: ../../include/ItemObject.php:389 ../../mod/editwebpage.php:190
-#: ../../mod/photos.php:1029 ../../mod/editblock.php:150
-#: ../../mod/editlayout.php:148 ../../mod/editpost.php:129
+#: ../../mod/editblock.php:150 ../../mod/editlayout.php:148
+#: ../../mod/photos.php:1026 ../../mod/editpost.php:129
 msgid "Please wait"
 msgstr ""
 
@@ -2406,8 +2654,8 @@ msgstr ""
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:1155 ../../mod/mail.php:194
-#: ../../mod/mail.php:308
+#: ../../include/conversation.php:1155 ../../mod/mail.php:202
+#: ../../mod/mail.php:316
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2431,22 +2679,22 @@ msgstr ""
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1161 ../../mod/mail.php:195
-#: ../../mod/mail.php:309 ../../mod/editpost.php:56
+#: ../../include/conversation.php:1161 ../../mod/editpost.php:56
+#: ../../mod/mail.php:203 ../../mod/mail.php:317
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
 #: ../../include/conversation.php:1169 ../../include/page_widgets.php:40
 #: ../../include/ItemObject.php:706 ../../mod/editwebpage.php:212
-#: ../../mod/photos.php:1049 ../../mod/editblock.php:171
-#: ../../mod/webpages.php:188 ../../mod/editpost.php:149
-#: ../../mod/events.php:473
+#: ../../mod/editblock.php:171 ../../mod/webpages.php:188
+#: ../../mod/photos.php:1046 ../../mod/editpost.php:149
+#: ../../mod/events.php:458
 msgid "Preview"
 msgstr ""
 
 #: ../../include/conversation.php:1192 ../../mod/blocks.php:154
-#: ../../mod/photos.php:1028 ../../mod/webpages.php:182
-#: ../../mod/layouts.php:184
+#: ../../mod/webpages.php:182 ../../mod/layouts.php:184
+#: ../../mod/photos.php:1025
 msgid "Share"
 msgstr ""
 
@@ -2500,7 +2748,7 @@ msgstr ""
 
 #: ../../include/conversation.php:1206 ../../mod/editwebpage.php:183
 #: ../../mod/editblock.php:143 ../../mod/editlayout.php:141
-#: ../../mod/mail.php:240 ../../mod/mail.php:369 ../../mod/editpost.php:119
+#: ../../mod/editpost.php:119 ../../mod/mail.php:248 ../../mod/mail.php:378
 msgid "Attach file"
 msgstr ""
 
@@ -2510,7 +2758,7 @@ msgstr ""
 
 #: ../../include/conversation.php:1208 ../../mod/editwebpage.php:184
 #: ../../mod/editblock.php:144 ../../mod/editlayout.php:142
-#: ../../mod/mail.php:241 ../../mod/mail.php:370 ../../mod/editpost.php:120
+#: ../../mod/editpost.php:120 ../../mod/mail.php:249 ../../mod/mail.php:379
 msgid "Insert web link"
 msgstr ""
 
@@ -2571,7 +2819,7 @@ msgstr ""
 
 #: ../../include/conversation.php:1228 ../../mod/editwebpage.php:191
 #: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
-#: ../../mod/editpost.php:130 ../../mod/events.php:474
+#: ../../mod/editpost.php:130 ../../mod/events.php:459
 msgid "Permission settings"
 msgstr ""
 
@@ -2593,7 +2841,7 @@ msgstr ""
 
 #: ../../include/conversation.php:1252 ../../mod/editwebpage.php:217
 #: ../../mod/editblock.php:176 ../../mod/editlayout.php:173
-#: ../../mod/mail.php:245 ../../mod/mail.php:374 ../../mod/editpost.php:155
+#: ../../mod/editpost.php:155 ../../mod/mail.php:253 ../../mod/mail.php:383
 msgid "Set expiration date"
 msgstr ""
 
@@ -2602,7 +2850,7 @@ msgid "Set publish date"
 msgstr ""
 
 #: ../../include/conversation.php:1257 ../../include/ItemObject.php:709
-#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:157
+#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385
 msgid "Encrypt text"
 msgstr ""
 
@@ -2610,8 +2858,8 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ../../include/conversation.php:1260 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../include/conversation.php:1260 ../../mod/fbrowser.php:77
+#: ../../mod/fbrowser.php:112 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
 #: ../../mod/settings.php:587 ../../mod/settings.php:613
 #: ../../mod/editpost.php:160
 msgid "Cancel"
@@ -2670,7 +2918,7 @@ msgstr ""
 msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/conversation.php:1601 ../../mod/admin.php:973
+#: ../../include/conversation.php:1601 ../../mod/admin.php:985
 msgid "Channel"
 msgstr ""
 
@@ -2691,10 +2939,6 @@ msgstr ""
 msgid "Photos"
 msgstr ""
 
-#: ../../include/conversation.php:1625 ../../include/photos.php:483
-msgid "Photo Albums"
-msgstr ""
-
 #: ../../include/conversation.php:1632
 msgid "Files and Storage"
 msgstr ""
@@ -2722,13 +2966,13 @@ msgid "Manage Webpages"
 msgstr ""
 
 #: ../../include/conversation.php:1697 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1082
-#: ../../mod/photos.php:1094
+#: ../../include/ItemObject.php:187 ../../mod/photos.php:1079
+#: ../../mod/photos.php:1091
 msgid "View all"
 msgstr ""
 
 #: ../../include/conversation.php:1724 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1091
+#: ../../mod/photos.php:1088
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -2826,8 +3070,8 @@ msgid "RSS/Atom"
 msgstr ""
 
 #: ../../include/contact_selectors.php:79 ../../mod/id.php:15
-#: ../../mod/id.php:16 ../../mod/admin.php:805 ../../mod/admin.php:814
-#: ../../boot.php:1488
+#: ../../mod/id.php:16 ../../mod/admin.php:817 ../../mod/admin.php:826
+#: ../../boot.php:1490
 msgid "Email"
 msgstr ""
 
@@ -2855,23 +3099,6 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
-#: ../../include/zot.php:685
-msgid "Invalid data packet"
-msgstr ""
-
-#: ../../include/zot.php:701
-msgid "Unable to verify channel signature"
-msgstr ""
-
-#: ../../include/zot.php:2265
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr ""
-
-#: ../../include/zot.php:3592
-msgid "invalid target signature"
-msgstr ""
-
 #: ../../include/bbcode.php:123 ../../include/bbcode.php:794
 #: ../../include/bbcode.php:797 ../../include/bbcode.php:802
 #: ../../include/bbcode.php:805 ../../include/bbcode.php:808
@@ -2942,7 +3169,7 @@ msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:439
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:451
 msgid "Advanced"
 msgstr ""
 
@@ -2995,45 +3222,21 @@ msgstr[1] ""
 msgid "show more"
 msgstr ""
 
-#: ../../include/dir_fns.php:139
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:141
-msgid "Safe Mode"
-msgstr ""
-
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:106
-#: ../../mod/photos.php:626 ../../mod/admin.php:410 ../../mod/settings.php:577
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:462
-#: ../../mod/events.php:463 ../../mod/events.php:472 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490
-msgid "No"
+#: ../../include/enotify.php:57 ../../include/network.php:1608
+msgid "$Projectname Notification"
 msgstr ""
 
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/api.php:105 ../../mod/photos.php:626 ../../mod/admin.php:412
-#: ../../mod/settings.php:577 ../../mod/menu.php:96 ../../mod/menu.php:153
-#: ../../mod/events.php:462 ../../mod/events.php:463 ../../mod/events.php:472
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490
-msgid "Yes"
+#: ../../include/enotify.php:58 ../../include/network.php:1609
+msgid "$projectname"
 msgstr ""
 
-#: ../../include/dir_fns.php:142
-msgid "Public Forums Only"
+#: ../../include/enotify.php:60 ../../include/network.php:1611
+msgid "Thank You,"
 msgstr ""
 
-#: ../../include/dir_fns.php:143
-msgid "This Website Only"
+#: ../../include/enotify.php:62 ../../include/network.php:1613
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
 #: ../../include/enotify.php:96
@@ -3230,19 +3433,19 @@ msgstr ""
 msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/follow.php:152 ../../include/follow.php:180
+#: ../../include/follow.php:153 ../../include/follow.php:183
 msgid "Protocol disabled."
 msgstr ""
 
-#: ../../include/follow.php:170
+#: ../../include/follow.php:173
 msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/follow.php:196
+#: ../../include/follow.php:199
 msgid "local account not found."
 msgstr ""
 
-#: ../../include/follow.php:220
+#: ../../include/follow.php:224
 msgid "Cannot connect to yourself."
 msgstr ""
 
@@ -3254,7 +3457,23 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1485
+#: ../../include/message.php:19
+msgid "No recipient provided."
+msgstr ""
+
+#: ../../include/message.php:24
+msgid "[no subject]"
+msgstr ""
+
+#: ../../include/message.php:44
+msgid "Unable to determine sender."
+msgstr ""
+
+#: ../../include/message.php:219
+msgid "Stored post could not be verified."
+msgstr ""
+
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1487
 msgid "Logout"
 msgstr ""
 
@@ -3310,7 +3529,7 @@ msgstr ""
 msgid "Your webpages"
 msgstr ""
 
-#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1486
+#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1488
 msgid "Login"
 msgstr ""
 
@@ -3335,7 +3554,7 @@ msgstr ""
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1462
+#: ../../include/nav.php:149 ../../mod/register.php:226 ../../boot.php:1470
 msgid "Register"
 msgstr ""
 
@@ -3344,7 +3563,7 @@ msgid "Create an account"
 msgstr ""
 
 #: ../../include/nav.php:154 ../../include/apps.php:142
-#: ../../mod/layouts.php:176 ../../mod/help.php:202 ../../mod/help.php:207
+#: ../../mod/layouts.php:176 ../../mod/help.php:204 ../../mod/help.php:209
 msgid "Help"
 msgstr ""
 
@@ -3356,12 +3575,6 @@ msgstr ""
 msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/nav.php:159 ../../include/text.php:867
-#: ../../include/text.php:879 ../../include/apps.php:147
-#: ../../mod/search.php:40
-msgid "Search"
-msgstr ""
-
 #: ../../include/nav.php:159
 msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
@@ -3481,243 +3694,45 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/text.php:394
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:396
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:425
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:428
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:438
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:440
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:785
-msgid "No connections"
-msgstr ""
-
-#: ../../include/text.php:797
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:810 ../../mod/viewconnections.php:101
-msgid "View Connections"
-msgstr ""
-
-#: ../../include/text.php:954
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:955
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:955
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:956
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:956
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:957
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:957
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:958
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:958
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:959
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:959
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:969
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:970
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:971
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:972
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:973
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:974
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:975
-msgid "stupified"
-msgstr ""
-
-#: ../../include/text.php:976
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:977
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:978
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:979
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:980
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:981
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:982
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:983
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:984
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:985
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:986
-msgid "depressed"
-msgstr ""
-
-#: ../../include/text.php:987
-msgid "motivated"
-msgstr ""
-
-#: ../../include/text.php:988
-msgid "relaxed"
-msgstr ""
-
-#: ../../include/text.php:989
-msgid "surprised"
-msgstr ""
-
-#: ../../include/text.php:1165
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:1242 ../../include/text.php:1246
-msgid "Unknown Attachment"
-msgstr ""
-
-#: ../../include/text.php:1248
-msgid "unknown"
-msgstr ""
-
-#: ../../include/text.php:1284
-msgid "remove category"
-msgstr ""
-
-#: ../../include/text.php:1361
-msgid "remove from file"
-msgstr ""
-
-#: ../../include/text.php:1507 ../../include/text.php:1518
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/text.php:1692 ../../mod/events.php:638
-msgid "Link to Source"
-msgstr ""
-
-#: ../../include/text.php:1713 ../../include/text.php:1785
-msgid "default"
-msgstr ""
-
-#: ../../include/text.php:1721
-msgid "Page layout"
-msgstr ""
-
-#: ../../include/text.php:1721
-msgid "You can create your own with the layouts tool"
-msgstr ""
-
-#: ../../include/text.php:1763
-msgid "Page content type"
-msgstr ""
-
-#: ../../include/text.php:1797
-msgid "Select an alternate language"
-msgstr ""
-
-#: ../../include/text.php:1929
-msgid "activity"
+#: ../../include/dir_fns.php:139
+msgid "Directory Options"
 msgstr ""
 
-#: ../../include/text.php:2224
-msgid "Design Tools"
+#: ../../include/dir_fns.php:141
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/text.php:2227 ../../mod/blocks.php:147
-msgid "Blocks"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:102
+#: ../../mod/admin.php:415 ../../mod/settings.php:577 ../../mod/photos.php:626
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:447
+#: ../../mod/events.php:448 ../../mod/events.php:457 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1492
+msgid "No"
 msgstr ""
 
-#: ../../include/text.php:2228 ../../mod/menu.php:103
-msgid "Menus"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/api.php:101 ../../mod/admin.php:417 ../../mod/settings.php:577
+#: ../../mod/photos.php:626 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1492
+msgid "Yes"
 msgstr ""
 
-#: ../../include/text.php:2229 ../../mod/layouts.php:174
-msgid "Layouts"
+#: ../../include/dir_fns.php:142
+msgid "Public Forums Only"
 msgstr ""
 
-#: ../../include/text.php:2230
-msgid "Pages"
+#: ../../include/dir_fns.php:143
+msgid "This Website Only"
 msgstr ""
 
 #: ../../include/group.php:26
@@ -3731,7 +3746,7 @@ msgstr ""
 msgid "Add new connections to this collection (privacy group)"
 msgstr ""
 
-#: ../../include/group.php:251 ../../mod/admin.php:814
+#: ../../include/group.php:251 ../../mod/admin.php:826
 msgid "All Channels"
 msgstr ""
 
@@ -3755,6 +3770,23 @@ msgstr ""
 msgid "Channels not in any collection"
 msgstr ""
 
+#: ../../include/zot.php:676
+msgid "Invalid data packet"
+msgstr ""
+
+#: ../../include/zot.php:692
+msgid "Unable to verify channel signature"
+msgstr ""
+
+#: ../../include/zot.php:2268
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr ""
+
+#: ../../include/zot.php:3584
+msgid "invalid target signature"
+msgstr ""
+
 #: ../../include/page_widgets.php:6
 msgid "New Page"
 msgstr ""
@@ -3786,30 +3818,22 @@ msgstr ""
 msgid "Edited"
 msgstr ""
 
-#: ../../include/dba/dba_driver.php:141
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr ""
-
-#: ../../include/photos.php:112
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr ""
-
-#: ../../include/photos.php:119
-msgid "Image file is empty."
+#: ../../include/network.php:630
+msgid "view full size"
 msgstr ""
 
-#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
-msgid "Unable to process image"
+#: ../../include/network.php:1655 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
+msgid "Administrator"
 msgstr ""
 
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
+#: ../../include/network.php:1669
+msgid "No Subject"
 msgstr ""
 
-#: ../../include/photos.php:487
-msgid "Upload New Photos"
+#: ../../include/dba/dba_driver.php:141
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
 #: ../../include/ItemObject.php:130
@@ -3860,11 +3884,11 @@ msgstr ""
 msgid "Add Tag"
 msgstr ""
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:1026
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:1027
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
 msgid "I don't like this (toggle)"
 msgstr ""
 
@@ -3920,18 +3944,18 @@ msgstr ""
 msgid "Mark all seen"
 msgstr ""
 
-#: ../../include/ItemObject.php:378 ../../mod/photos.php:1212
+#: ../../include/ItemObject.php:378 ../../mod/photos.php:1209
 msgctxt "noun"
 msgid "Likes"
 msgstr ""
 
-#: ../../include/ItemObject.php:379 ../../mod/photos.php:1213
+#: ../../include/ItemObject.php:379 ../../mod/photos.php:1210
 msgctxt "noun"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../include/ItemObject.php:694 ../../mod/photos.php:1045
-#: ../../mod/photos.php:1163
+#: ../../include/ItemObject.php:694 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
 msgid "This is you"
 msgstr ""
 
@@ -3947,78 +3971,6 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: ../../include/account.php:27
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../../include/account.php:29
-msgid "Your email domain is not among those allowed on this site"
-msgstr ""
-
-#: ../../include/account.php:35
-msgid "Your email address is already registered at this site."
-msgstr ""
-
-#: ../../include/account.php:67
-msgid "An invitation is required."
-msgstr ""
-
-#: ../../include/account.php:71
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: ../../include/account.php:121
-msgid "Please enter the required information."
-msgstr ""
-
-#: ../../include/account.php:188
-msgid "Failed to store account information."
-msgstr ""
-
-#: ../../include/account.php:248
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr ""
-
-#: ../../include/account.php:314
-#, php-format
-msgid "Registration request at %s"
-msgstr ""
-
-#: ../../include/account.php:338
-msgid "your registration password"
-msgstr ""
-
-#: ../../include/account.php:341 ../../include/account.php:401
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: ../../include/account.php:410
-msgid "Account approved."
-msgstr ""
-
-#: ../../include/account.php:449
-#, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: ../../include/account.php:494
-msgid "Account verified. Please login."
-msgstr ""
-
-#: ../../include/account.php:707 ../../include/account.php:709
-msgid "Click here to upgrade."
-msgstr ""
-
-#: ../../include/account.php:715
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr ""
-
-#: ../../include/account.php:720
-msgid "This action is not available under your subscription plan."
-msgstr ""
-
 #: ../../include/apps.php:128
 msgid "Site Admin"
 msgstr ""
@@ -4199,12 +4151,84 @@ msgstr ""
 msgid "Custom/Expert Mode"
 msgstr ""
 
-#: ../../include/photo/photo_driver.php:719 ../../mod/photos.php:94
-#: ../../mod/photos.php:699 ../../mod/profile_photo.php:147
+#: ../../include/photo/photo_driver.php:719 ../../mod/profile_photo.php:147
 #: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:379
+#: ../../mod/photos.php:94 ../../mod/photos.php:699
 msgid "Profile Photos"
 msgstr ""
 
+#: ../../include/account.php:27
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../../include/account.php:29
+msgid "Your email domain is not among those allowed on this site"
+msgstr ""
+
+#: ../../include/account.php:35
+msgid "Your email address is already registered at this site."
+msgstr ""
+
+#: ../../include/account.php:67
+msgid "An invitation is required."
+msgstr ""
+
+#: ../../include/account.php:71
+msgid "Invitation could not be verified."
+msgstr ""
+
+#: ../../include/account.php:121
+msgid "Please enter the required information."
+msgstr ""
+
+#: ../../include/account.php:188
+msgid "Failed to store account information."
+msgstr ""
+
+#: ../../include/account.php:248
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr ""
+
+#: ../../include/account.php:314
+#, php-format
+msgid "Registration request at %s"
+msgstr ""
+
+#: ../../include/account.php:338
+msgid "your registration password"
+msgstr ""
+
+#: ../../include/account.php:341 ../../include/account.php:401
+#, php-format
+msgid "Registration details for %s"
+msgstr ""
+
+#: ../../include/account.php:410
+msgid "Account approved."
+msgstr ""
+
+#: ../../include/account.php:449
+#, php-format
+msgid "Registration revoked for %s"
+msgstr ""
+
+#: ../../include/account.php:494
+msgid "Account verified. Please login."
+msgstr ""
+
+#: ../../include/account.php:707 ../../include/account.php:709
+msgid "Click here to upgrade."
+msgstr ""
+
+#: ../../include/account.php:715
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr ""
+
+#: ../../include/account.php:720
+msgid "This action is not available under your subscription plan."
+msgstr ""
+
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
 msgstr ""
@@ -4297,36 +4321,36 @@ msgstr ""
 msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../mod/item.php:173
+#: ../../mod/item.php:174
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:417
+#: ../../mod/item.php:418
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:457
+#: ../../mod/item.php:458
 msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../mod/item.php:822
+#: ../../mod/item.php:823
 msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../mod/item.php:953
+#: ../../mod/item.php:954
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:1220
+#: ../../mod/item.php:1221
 msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../mod/item.php:1227
+#: ../../mod/item.php:1228
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../mod/item.php:1234
+#: ../../mod/item.php:1235
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
@@ -4406,7 +4430,8 @@ msgstr ""
 msgid "OpenID protocol error. No ID returned."
 msgstr ""
 
-#: ../../mod/openid.php:72 ../../mod/openid.php:179 ../../mod/post.php:285
+#: ../../mod/openid.php:72 ../../mod/openid.php:179
+#: ../../Zotlabs/Zot/Auth.php:248
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr ""
@@ -4642,7 +4667,7 @@ msgstr ""
 msgid "Channel not found."
 msgstr ""
 
-#: ../../mod/page.php:89 ../../mod/display.php:110 ../../mod/help.php:214
+#: ../../mod/page.php:89 ../../mod/display.php:110 ../../mod/help.php:216
 #: ../../mod/block.php:75 ../../index.php:241
 msgid "Page not found."
 msgstr ""
@@ -4757,8 +4782,8 @@ msgstr ""
 msgid "No ratings"
 msgstr ""
 
-#: ../../mod/ratings.php:82 ../../mod/search.php:13 ../../mod/directory.php:59
-#: ../../mod/photos.php:490 ../../mod/display.php:13
+#: ../../mod/ratings.php:82 ../../mod/display.php:13
+#: ../../mod/directory.php:59 ../../mod/photos.php:490 ../../mod/search.php:13
 #: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr ""
@@ -4815,8 +4840,8 @@ msgstr ""
 msgid "System check"
 msgstr ""
 
-#: ../../mod/setup.php:285 ../../mod/photos.php:914 ../../mod/events.php:668
-#: ../../mod/events.php:675
+#: ../../mod/setup.php:285 ../../mod/photos.php:911 ../../mod/events.php:653
+#: ../../mod/events.php:660
 msgid "Next"
 msgstr ""
 
@@ -5202,15 +5227,6 @@ msgstr ""
 msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:157
-msgid "$Projectname"
-msgstr ""
-
-#: ../../mod/home.php:75
-#, php-format
-msgid "Welcome to %s"
-msgstr ""
-
 #: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
 msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
@@ -5315,7 +5331,7 @@ msgstr ""
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:457 ../../mod/admin.php:974
+#: ../../mod/profiles.php:457 ../../mod/admin.php:986
 msgid "Address"
 msgstr ""
 
@@ -5499,16 +5515,6 @@ msgstr ""
 msgid "Include desirable objects in your profile"
 msgstr ""
 
-#: ../../mod/search.php:212
-#, php-format
-msgid "Items tagged with: %s"
-msgstr ""
-
-#: ../../mod/search.php:214
-#, php-format
-msgid "Search results for: %s"
-msgstr ""
-
 #: ../../mod/connedit.php:75
 msgid "Could not access contact record."
 msgstr ""
@@ -5568,11 +5574,11 @@ msgstr ""
 msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../mod/connedit.php:519 ../../mod/admin.php:811
+#: ../../mod/connedit.php:519 ../../mod/admin.php:823
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/connedit.php:519 ../../mod/admin.php:810
+#: ../../mod/connedit.php:519 ../../mod/admin.php:822
 msgid "Block"
 msgstr ""
 
@@ -5728,7 +5734,7 @@ msgid ""
 "communication."
 msgstr ""
 
-#: ../../mod/connedit.php:710 ../../mod/admin.php:807
+#: ../../mod/connedit.php:710 ../../mod/admin.php:819
 msgid "Approve"
 msgstr ""
 
@@ -5900,19 +5906,19 @@ msgstr ""
 msgid "posted an event"
 msgstr ""
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
+#: ../../mod/api.php:74 ../../mod/api.php:98
 msgid "Authorize application connection"
 msgstr ""
 
-#: ../../mod/api.php:77
+#: ../../mod/api.php:75
 msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: ../../mod/api.php:89
+#: ../../mod/api.php:85
 msgid "Please login to continue."
 msgstr ""
 
-#: ../../mod/api.php:104
+#: ../../mod/api.php:100
 msgid ""
 "Do you want to authorize this application to access your posts and contacts, "
 "and/or create new posts for you?"
@@ -5938,7 +5944,7 @@ msgstr ""
 msgid "URL of bookmark"
 msgstr ""
 
-#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:465
+#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:450
 msgid "Description"
 msgstr ""
 
@@ -6041,7 +6047,7 @@ msgstr ""
 msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../mod/tagrm.php:133 ../../mod/photos.php:954
+#: ../../mod/tagrm.php:133 ../../mod/photos.php:951
 msgid "Remove"
 msgstr ""
 
@@ -6152,7 +6158,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1494
+#: ../../mod/lostpass.php:86 ../../boot.php:1496
 msgid "Password Reset"
 msgstr ""
 
@@ -6309,155 +6315,73 @@ msgid ""
 "only once and leave this page open until finished."
 msgstr ""
 
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr ""
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
+#: ../../mod/invite.php:25
+msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: ../../mod/photos.php:171 ../../mod/photos.php:1009
-msgid "Delete Photo"
+#: ../../mod/invite.php:49
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../mod/photos.php:501
-msgid "No photos selected"
+#: ../../mod/invite.php:59
+msgid "Please join us on $Projectname"
 msgstr ""
 
-#: ../../mod/photos.php:550
-msgid "Access to this item is restricted."
+#: ../../mod/invite.php:70
+msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: ../../mod/photos.php:589
+#: ../../mod/invite.php:75
 #, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../mod/photos.php:592
+#: ../../mod/invite.php:79
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../mod/photos.php:620
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:624
-msgid "Enter an album name"
-msgstr ""
-
-#: ../../mod/photos.php:625
-msgid "or select an existing album (doubleclick)"
-msgstr ""
-
-#: ../../mod/photos.php:626
-msgid "Create a status post for this upload"
-msgstr ""
-
-#: ../../mod/photos.php:627
-msgid "Caption (optional):"
-msgstr ""
-
-#: ../../mod/photos.php:628
-msgid "Description (optional):"
-msgstr ""
-
-#: ../../mod/photos.php:655
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../mod/photos.php:699 ../../mod/photos.php:1236
-#: ../../mod/photos.php:1253
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../mod/photos.php:727
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../mod/photos.php:729
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../mod/photos.php:827
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../mod/photos.php:829
-msgid "Photo not available"
-msgstr ""
-
-#: ../../mod/photos.php:887
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../mod/photos.php:894
-msgid "Private Photo"
-msgstr ""
-
-#: ../../mod/photos.php:905 ../../mod/events.php:667 ../../mod/events.php:674
-msgid "Previous"
-msgstr ""
-
-#: ../../mod/photos.php:909
-msgid "View Full Size"
-msgstr ""
-
-#: ../../mod/photos.php:988
-msgid "Edit photo"
-msgstr ""
-
-#: ../../mod/photos.php:990
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../mod/photos.php:991
-msgid "Rotate CCW (left)"
-msgstr ""
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/photos.php:994
-msgid "Enter a new album name"
+#: ../../mod/invite.php:98
+msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../mod/photos.php:995
-msgid "or select an existing one (doubleclick)"
+#: ../../mod/invite.php:129
+msgid "Send invitations"
 msgstr ""
 
-#: ../../mod/photos.php:998
-msgid "Caption"
+#: ../../mod/invite.php:130
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/photos.php:1000
-msgid "Add a Tag"
+#: ../../mod/invite.php:131 ../../mod/mail.php:246
+msgid "Your message:"
 msgstr ""
 
-#: ../../mod/photos.php:1004
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../mod/invite.php:132
+msgid "Please join my community on $Projectname."
 msgstr ""
 
-#: ../../mod/photos.php:1007
-msgid "Flag as adult in album view"
+#: ../../mod/invite.php:134
+msgid "You will need to supply this invitation code: "
 msgstr ""
 
-#: ../../mod/photos.php:1199
-msgid "In This Photo:"
+#: ../../mod/invite.php:135
+msgid "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr ""
 
-#: ../../mod/photos.php:1204
-msgid "Map"
+#: ../../mod/invite.php:137
+msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr ""
 
-#: ../../mod/photos.php:1292
-msgid "View Album"
+#: ../../mod/invite.php:138
+msgid "or visit "
 msgstr ""
 
-#: ../../mod/photos.php:1315
-msgid "Recent Photos"
+#: ../../mod/invite.php:140
+msgid "3. Click [Connect]"
 msgstr ""
 
 #: ../../mod/probe.php:24 ../../mod/probe.php:30
@@ -6683,6 +6607,10 @@ msgstr ""
 msgid "Search Results For:"
 msgstr ""
 
+#: ../../mod/network.php:169 ../../mod/channel.php:131 ../../mod/rpost.php:114
+msgid "Public"
+msgstr ""
+
 #: ../../mod/network.php:207
 msgid "Collection is empty"
 msgstr ""
@@ -6728,806 +6656,816 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../../mod/register.php:117
+#: ../../mod/register.php:119
 msgid ""
 "Registration successful. Please check your email for validation instructions."
 msgstr ""
 
-#: ../../mod/register.php:123
+#: ../../mod/register.php:125
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:126
+#: ../../mod/register.php:128
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:163
+#: ../../mod/register.php:165
 msgid "Registration on this site/hub is by approval only."
 msgstr ""
 
-#: ../../mod/register.php:164
+#: ../../mod/register.php:166
 msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
 msgstr ""
 
-#: ../../mod/register.php:174
+#: ../../mod/register.php:176
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/register.php:185
+#: ../../mod/register.php:187
 msgid "Terms of Service"
 msgstr ""
 
-#: ../../mod/register.php:191
+#: ../../mod/register.php:193
 #, php-format
 msgid "I accept the %s for this website"
 msgstr ""
 
-#: ../../mod/register.php:193
+#: ../../mod/register.php:195
 #, php-format
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr ""
 
-#: ../../mod/register.php:207 ../../mod/admin.php:436
+#: ../../mod/register.php:209 ../../mod/admin.php:448
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:212
+#: ../../mod/register.php:214
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:213
+#: ../../mod/register.php:215
 msgid "Please enter your invitation code"
 msgstr ""
 
-#: ../../mod/register.php:216
+#: ../../mod/register.php:218
 msgid "Your email address"
 msgstr ""
 
-#: ../../mod/register.php:217
+#: ../../mod/register.php:219
 msgid "Choose a password"
 msgstr ""
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:220
 msgid "Please re-enter your password"
 msgstr ""
 
-#: ../../mod/admin.php:52
+#: ../../mod/admin.php:54
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:160
+#: ../../mod/admin.php:162
 msgid "# Accounts"
 msgstr ""
 
-#: ../../mod/admin.php:161
+#: ../../mod/admin.php:163
 msgid "# blocked accounts"
 msgstr ""
 
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:164
 msgid "# expired accounts"
 msgstr ""
 
-#: ../../mod/admin.php:163
+#: ../../mod/admin.php:165
 msgid "# expiring accounts"
 msgstr ""
 
-#: ../../mod/admin.php:174
+#: ../../mod/admin.php:176
 msgid "# Channels"
 msgstr ""
 
-#: ../../mod/admin.php:175
+#: ../../mod/admin.php:177
 msgid "# primary"
 msgstr ""
 
-#: ../../mod/admin.php:176
+#: ../../mod/admin.php:178
 msgid "# clones"
 msgstr ""
 
-#: ../../mod/admin.php:182
+#: ../../mod/admin.php:184
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:198 ../../mod/admin.php:433 ../../mod/admin.php:532
-#: ../../mod/admin.php:800 ../../mod/admin.php:964 ../../mod/admin.php:1061
-#: ../../mod/admin.php:1101 ../../mod/admin.php:1261 ../../mod/admin.php:1295
-#: ../../mod/admin.php:1380
+#: ../../mod/admin.php:200 ../../mod/admin.php:445 ../../mod/admin.php:545
+#: ../../mod/admin.php:812 ../../mod/admin.php:976 ../../mod/admin.php:1073
+#: ../../mod/admin.php:1113 ../../mod/admin.php:1273 ../../mod/admin.php:1307
+#: ../../mod/admin.php:1392
 msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:199
+#: ../../mod/admin.php:201
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:202
+#: ../../mod/admin.php:204
 msgid "Registered accounts"
 msgstr ""
 
-#: ../../mod/admin.php:203 ../../mod/admin.php:536
+#: ../../mod/admin.php:205 ../../mod/admin.php:549
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:204
+#: ../../mod/admin.php:206
 msgid "Registered channels"
 msgstr ""
 
-#: ../../mod/admin.php:205 ../../mod/admin.php:537
+#: ../../mod/admin.php:207 ../../mod/admin.php:550
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:206
+#: ../../mod/admin.php:208
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:324
+#: ../../mod/admin.php:329
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:361 ../../mod/settings.php:793
+#: ../../mod/admin.php:366 ../../mod/settings.php:793
 msgid "mobile"
 msgstr ""
 
-#: ../../mod/admin.php:363
+#: ../../mod/admin.php:368
 msgid "experimental"
 msgstr ""
 
-#: ../../mod/admin.php:365
+#: ../../mod/admin.php:370
 msgid "unsupported"
 msgstr ""
 
-#: ../../mod/admin.php:411
+#: ../../mod/admin.php:416
 msgid "Yes - with approval"
 msgstr ""
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:422
 msgid "My site is not a public server"
 msgstr ""
 
-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:423
 msgid "My site has paid access only"
 msgstr ""
 
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:424
 msgid "My site has free access only"
 msgstr ""
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:425
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:449
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:450
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid "Administrator Information"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:458
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:460
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:460
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:465
+msgid "Invitation only"
+msgstr ""
+
+#: ../../mod/admin.php:465
+msgid ""
+"Only allow new member registrations with an invitation code. Above register "
+"policy must be set to Yes."
+msgstr ""
+
+#: ../../mod/admin.php:466
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:467
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:467
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:468
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:468
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:469
 msgid "Preserve site homepage URL"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:469
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:470
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:470
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:471
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:471
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:472
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:472
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:473
 msgid "Not allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:473
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr ""
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:474
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:474
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:475
 msgid "Verify Email Addresses"
 msgstr ""
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:475
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:476
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:476
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:464
-msgid "Disable discovery tab"
+#: ../../mod/admin.php:477
+msgid "Import Public Streams"
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:477
 msgid ""
-"Remove the tab in the network view with public content pulled from sources "
-"chosen for this site."
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:478
 msgid "login on Homepage"
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:478
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:480
 msgid "Directory Server URL"
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:480
 msgid "Default directory server"
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:482
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:483
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:484
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:484
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:485
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:485
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:486
 msgid "Deliveries per process"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:486
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust "
 "if necessary to tune system performance. Recommend: 1-5."
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:487
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:487
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:488
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:488
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:489
 msgid "Expiration period in days for imported (matrix/network) content"
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:489
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../mod/admin.php:524
+#: ../../mod/admin.php:537
 msgid "No server found"
 msgstr ""
 
-#: ../../mod/admin.php:531 ../../mod/admin.php:814
+#: ../../mod/admin.php:544 ../../mod/admin.php:826
 msgid "ID"
 msgstr ""
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:544
 msgid "for channel"
 msgstr ""
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:544
 msgid "on server"
 msgstr ""
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:544
 msgid "Status"
 msgstr ""
 
-#: ../../mod/admin.php:533
+#: ../../mod/admin.php:546
 msgid "Server"
 msgstr ""
 
-#: ../../mod/admin.php:550
+#: ../../mod/admin.php:563
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:560
+#: ../../mod/admin.php:573
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:563
+#: ../../mod/admin.php:576
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:567
+#: ../../mod/admin.php:580
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:583
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:586
+#: ../../mod/admin.php:599
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:590
+#: ../../mod/admin.php:603
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:592
+#: ../../mod/admin.php:605
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:593
+#: ../../mod/admin.php:606
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:625
+#: ../../mod/admin.php:637
 msgid "Queue Statistics"
 msgstr ""
 
-#: ../../mod/admin.php:626
+#: ../../mod/admin.php:638
 msgid "Total Entries"
 msgstr ""
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:639
 msgid "Priority"
 msgstr ""
 
-#: ../../mod/admin.php:628
+#: ../../mod/admin.php:640
 msgid "Destination URL"
 msgstr ""
 
-#: ../../mod/admin.php:629
+#: ../../mod/admin.php:641
 msgid "Mark hub permanently offline"
 msgstr ""
 
-#: ../../mod/admin.php:630
+#: ../../mod/admin.php:642
 msgid "Empty queue for this hub"
 msgstr ""
 
-#: ../../mod/admin.php:631
+#: ../../mod/admin.php:643
 msgid "Last known contact"
 msgstr ""
 
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:679
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:675
+#: ../../mod/admin.php:687
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:711
+#: ../../mod/admin.php:723
 msgid "Account not found"
 msgstr ""
 
-#: ../../mod/admin.php:723
+#: ../../mod/admin.php:735
 #, php-format
 msgid "Account '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:731
+#: ../../mod/admin.php:743
 #, php-format
 msgid "Account '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:739
+#: ../../mod/admin.php:751
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:801 ../../mod/admin.php:813
+#: ../../mod/admin.php:813 ../../mod/admin.php:825
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:803 ../../mod/admin.php:967
+#: ../../mod/admin.php:815 ../../mod/admin.php:979
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:804
+#: ../../mod/admin.php:816
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:805
+#: ../../mod/admin.php:817
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:806
+#: ../../mod/admin.php:818
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:808
+#: ../../mod/admin.php:820
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Expires"
 msgstr ""
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Service Class"
 msgstr ""
 
-#: ../../mod/admin.php:816
+#: ../../mod/admin.php:828
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
 "on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:817
+#: ../../mod/admin.php:829
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:853
+#: ../../mod/admin.php:865
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:862
+#: ../../mod/admin.php:874
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:869
+#: ../../mod/admin.php:881
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:889
+#: ../../mod/admin.php:901
 msgid "Channel not found"
 msgstr ""
 
-#: ../../mod/admin.php:900
+#: ../../mod/admin.php:912
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:924
 #, php-format
 msgid "Channel '%s' censored"
 msgstr ""
 
-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:924
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr ""
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:935
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr ""
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:935
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr ""
 
-#: ../../mod/admin.php:969
+#: ../../mod/admin.php:981
 msgid "Censor"
 msgstr ""
 
-#: ../../mod/admin.php:970
+#: ../../mod/admin.php:982
 msgid "Uncensor"
 msgstr ""
 
-#: ../../mod/admin.php:971
+#: ../../mod/admin.php:983
 msgid "Allow Code"
 msgstr ""
 
-#: ../../mod/admin.php:972
+#: ../../mod/admin.php:984
 msgid "Disallow Code"
 msgstr ""
 
-#: ../../mod/admin.php:974
+#: ../../mod/admin.php:986
 msgid "UID"
 msgstr ""
 
-#: ../../mod/admin.php:976
+#: ../../mod/admin.php:988
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:977
+#: ../../mod/admin.php:989
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:1017
+#: ../../mod/admin.php:1029
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:1021
+#: ../../mod/admin.php:1033
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:1031 ../../mod/admin.php:1234
+#: ../../mod/admin.php:1043 ../../mod/admin.php:1246
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:1034 ../../mod/admin.php:1236
+#: ../../mod/admin.php:1046 ../../mod/admin.php:1248
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:1063 ../../mod/admin.php:1263
+#: ../../mod/admin.php:1075 ../../mod/admin.php:1275
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:1071 ../../mod/admin.php:1273
+#: ../../mod/admin.php:1083 ../../mod/admin.php:1285
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:1072 ../../mod/admin.php:1274
+#: ../../mod/admin.php:1084 ../../mod/admin.php:1286
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:1199
+#: ../../mod/admin.php:1211
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:1255
+#: ../../mod/admin.php:1267
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1301
+#: ../../mod/admin.php:1313
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1302
+#: ../../mod/admin.php:1314
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1326
+#: ../../mod/admin.php:1338
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1383
+#: ../../mod/admin.php:1395
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1389
+#: ../../mod/admin.php:1401
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1390
+#: ../../mod/admin.php:1402
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1390
+#: ../../mod/admin.php:1402
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr ""
 
-#: ../../mod/admin.php:1391
+#: ../../mod/admin.php:1403
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1437
+#: ../../mod/admin.php:1449
 msgid "New Profile Field"
 msgstr ""
 
-#: ../../mod/admin.php:1438 ../../mod/admin.php:1458
+#: ../../mod/admin.php:1450 ../../mod/admin.php:1470
 msgid "Field nickname"
 msgstr ""
 
-#: ../../mod/admin.php:1438 ../../mod/admin.php:1458
+#: ../../mod/admin.php:1450 ../../mod/admin.php:1470
 msgid "System name of field"
 msgstr ""
 
-#: ../../mod/admin.php:1439 ../../mod/admin.php:1459
+#: ../../mod/admin.php:1451 ../../mod/admin.php:1471
 msgid "Input type"
 msgstr ""
 
-#: ../../mod/admin.php:1440 ../../mod/admin.php:1460
+#: ../../mod/admin.php:1452 ../../mod/admin.php:1472
 msgid "Field Name"
 msgstr ""
 
-#: ../../mod/admin.php:1440 ../../mod/admin.php:1460
+#: ../../mod/admin.php:1452 ../../mod/admin.php:1472
 msgid "Label on profile pages"
 msgstr ""
 
-#: ../../mod/admin.php:1441 ../../mod/admin.php:1461
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "Help text"
 msgstr ""
 
-#: ../../mod/admin.php:1441 ../../mod/admin.php:1461
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "Additional info (optional)"
 msgstr ""
 
-#: ../../mod/admin.php:1451
+#: ../../mod/admin.php:1463
 msgid "Field definition not found"
 msgstr ""
 
-#: ../../mod/admin.php:1457
+#: ../../mod/admin.php:1469
 msgid "Edit Profile Field"
 msgstr ""
 
@@ -8245,184 +8183,193 @@ msgstr ""
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:61
+msgid "$Projectname"
 msgstr ""
 
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
+#: ../../mod/home.php:75
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
+#: ../../mod/regmod.php:11
+msgid "Please login."
 msgstr ""
 
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
+#: ../../mod/xchan.php:6
+msgid "Xchan Lookup"
 msgstr ""
 
-#: ../../mod/mail.php:132
-msgid "Messages"
+#: ../../mod/xchan.php:9
+msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: ../../mod/mail.php:167
-msgid "Message recalled."
+#: ../../mod/xchan.php:37 ../../mod/menu.php:162 ../../mod/mitem.php:116
+msgid "Not found."
 msgstr ""
 
-#: ../../mod/mail.php:180
-msgid "Conversation removed."
+#: ../../mod/channel.php:25 ../../mod/chat.php:19
+msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../mod/mail.php:223
-msgid "Requested channel is not in this network"
+#: ../../mod/channel.php:97
+msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: ../../mod/mail.php:231
-msgid "Send Private Message"
+#: ../../mod/attach.php:9
+msgid "Item not available."
 msgstr ""
 
-#: ../../mod/mail.php:232 ../../mod/mail.php:361
-msgid "To:"
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../mod/mail.php:235 ../../mod/mail.php:363
-msgid "Subject:"
+#: ../../mod/photos.php:100
+msgid "Album not found."
 msgstr ""
 
-#: ../../mod/mail.php:238 ../../mod/invite.php:131
-msgid "Your message:"
+#: ../../mod/photos.php:127
+msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/mail.php:242
-msgid "Send"
+#: ../../mod/photos.php:171 ../../mod/photos.php:1006
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/mail.php:333
-msgid "Delete message"
+#: ../../mod/photos.php:501
+msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/mail.php:334
-msgid "Delivery report"
+#: ../../mod/photos.php:550
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/mail.php:335
-msgid "Recall message"
+#: ../../mod/photos.php:589
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../mod/mail.php:337
-msgid "Message has been recalled."
+#: ../../mod/photos.php:592
+#, php-format
+msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../mod/mail.php:354
-msgid "Delete Conversation"
+#: ../../mod/photos.php:620
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/mail.php:356
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
+#: ../../mod/photos.php:624
+msgid "Enter an album name"
 msgstr ""
 
-#: ../../mod/mail.php:360
-msgid "Send Reply"
+#: ../../mod/photos.php:625
+msgid "or select an existing album (doubleclick)"
 msgstr ""
 
-#: ../../mod/mail.php:365
-#, php-format
-msgid "Your message for %s (%s):"
+#: ../../mod/photos.php:626
+msgid "Create a status post for this upload"
 msgstr ""
 
-#: ../../mod/regmod.php:11
-msgid "Please login."
+#: ../../mod/photos.php:627
+msgid "Caption (optional):"
 msgstr ""
 
-#: ../../mod/xchan.php:6
-msgid "Xchan Lookup"
+#: ../../mod/photos.php:628
+msgid "Description (optional):"
 msgstr ""
 
-#: ../../mod/xchan.php:9
-msgid "Lookup xchan beginning with (or webbie): "
+#: ../../mod/photos.php:655
+msgid "Album name could not be decoded"
 msgstr ""
 
-#: ../../mod/xchan.php:37 ../../mod/menu.php:162 ../../mod/mitem.php:116
-msgid "Not found."
+#: ../../mod/photos.php:699 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1250
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/channel.php:25 ../../mod/chat.php:19
-msgid "You must be logged in to see this page."
+#: ../../mod/photos.php:722
+msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/channel.php:97
-msgid "Insufficient permissions.  Request redirected to profile page."
+#: ../../mod/photos.php:724
+msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/attach.php:9
-msgid "Item not available."
+#: ../../mod/photos.php:824
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/invite.php:25
-msgid "Total invitation limit exceeded."
+#: ../../mod/photos.php:826
+msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/invite.php:49
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../mod/photos.php:884
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/invite.php:76
-msgid "Please join us on $Projectname"
+#: ../../mod/photos.php:891
+msgid "Private Photo"
 msgstr ""
 
-#: ../../mod/invite.php:87
-msgid "Invitation limit exceeded. Please contact your site administrator."
+#: ../../mod/photos.php:902 ../../mod/events.php:652 ../../mod/events.php:659
+msgid "Previous"
 msgstr ""
 
-#: ../../mod/invite.php:92
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../mod/photos.php:906
+msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/invite.php:96
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../mod/photos.php:985
+msgid "Edit photo"
+msgstr ""
 
-#: ../../mod/invite.php:115
-msgid "You have no more invitations available"
+#: ../../mod/photos.php:987
+msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/invite.php:129
-msgid "Send invitations"
+#: ../../mod/photos.php:988
+msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/invite.php:130
-msgid "Enter email addresses, one per line:"
+#: ../../mod/photos.php:991
+msgid "Enter a new album name"
 msgstr ""
 
-#: ../../mod/invite.php:132
-msgid "Please join my community on $Projectname."
+#: ../../mod/photos.php:992
+msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: ../../mod/invite.php:134
-msgid "You will need to supply this invitation code: "
+#: ../../mod/photos.php:995
+msgid "Caption"
 msgstr ""
 
-#: ../../mod/invite.php:135
-msgid "1. Register at any $Projectname location (they are all inter-connected)"
+#: ../../mod/photos.php:997
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/invite.php:137
-msgid "2. Enter my $Projectname network address into the site searchbar."
+#: ../../mod/photos.php:1001
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 
-#: ../../mod/invite.php:138
-msgid "or visit "
+#: ../../mod/photos.php:1004
+msgid "Flag as adult in album view"
 msgstr ""
 
-#: ../../mod/invite.php:140
-msgid "3. Click [Connect]"
+#: ../../mod/photos.php:1196
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../mod/photos.php:1201
+msgid "Map"
+msgstr ""
+
+#: ../../mod/photos.php:1289
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/photos.php:1300 ../../mod/photos.php:1313
+#: ../../mod/photos.php:1314
+msgid "Recent Photos"
 msgstr ""
 
 #: ../../mod/lockview.php:37
@@ -8574,6 +8521,16 @@ msgstr ""
 msgid "%1$s's Chatrooms"
 msgstr ""
 
+#: ../../mod/search.php:212
+#, php-format
+msgid "Items tagged with: %s"
+msgstr ""
+
+#: ../../mod/search.php:214
+#, php-format
+msgid "Search results for: %s"
+msgstr ""
+
 #: ../../mod/viewsrc.php:40
 msgid "Source of Item"
 msgstr ""
@@ -8667,22 +8624,6 @@ msgstr ""
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/help.php:147
-msgid "Documentation Search"
-msgstr ""
-
-#: ../../mod/help.php:184 ../../mod/help.php:190 ../../mod/help.php:196
-msgid "Help:"
-msgstr ""
-
-#: ../../mod/help.php:211 ../../index.php:238
-msgid "Not Found"
-msgstr ""
-
-#: ../../mod/help.php:235
-msgid "$Projectname Documentation"
-msgstr ""
-
 #: ../../mod/manage.php:130
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
@@ -8814,71 +8755,164 @@ msgstr ""
 msgid "Allow bookmarks"
 msgstr ""
 
-#: ../../mod/post.php:234
+#: ../../mod/mail.php:34
+msgid "Unable to lookup recipient."
+msgstr ""
+
+#: ../../mod/mail.php:42
+msgid "Unable to communicate with requested channel."
+msgstr ""
+
+#: ../../mod/mail.php:49
+msgid "Cannot verify requested channel."
+msgstr ""
+
+#: ../../mod/mail.php:75
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr ""
+
+#: ../../mod/mail.php:140
+msgid "Messages"
+msgstr ""
+
+#: ../../mod/mail.php:175
+msgid "Message recalled."
+msgstr ""
+
+#: ../../mod/mail.php:188
+msgid "Conversation removed."
+msgstr ""
+
+#: ../../mod/mail.php:231
+msgid "Requested channel is not in this network"
+msgstr ""
+
+#: ../../mod/mail.php:239
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../mod/mail.php:240 ../../mod/mail.php:370
+msgid "To:"
+msgstr ""
+
+#: ../../mod/mail.php:243 ../../mod/mail.php:372
+msgid "Subject:"
+msgstr ""
+
+#: ../../mod/mail.php:250
+msgid "Send"
+msgstr ""
+
+#: ../../mod/mail.php:342
+msgid "Delete message"
+msgstr ""
+
+#: ../../mod/mail.php:343
+msgid "Delivery report"
+msgstr ""
+
+#: ../../mod/mail.php:344
+msgid "Recall message"
+msgstr ""
+
+#: ../../mod/mail.php:346
+msgid "Message has been recalled."
+msgstr ""
+
+#: ../../mod/mail.php:363
+msgid "Delete Conversation"
+msgstr ""
+
+#: ../../mod/mail.php:365
 msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../mod/mail.php:369
+msgid "Send Reply"
+msgstr ""
+
+#: ../../mod/mail.php:374
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr ""
+
+#: ../../mod/help.php:148
+msgid "Documentation Search"
+msgstr ""
+
+#: ../../mod/help.php:186 ../../mod/help.php:192 ../../mod/help.php:198
+msgid "Help:"
+msgstr ""
+
+#: ../../mod/help.php:213 ../../index.php:238
+msgid "Not Found"
+msgstr ""
+
+#: ../../mod/help.php:237
+msgid "$Projectname Documentation"
 msgstr ""
 
 #: ../../mod/service_limits.php:19
 msgid "No service class restrictions found."
 msgstr ""
 
-#: ../../mod/siteinfo.php:111
+#: ../../mod/siteinfo.php:15
 #, php-format
 msgid "Version %s"
 msgstr ""
 
-#: ../../mod/siteinfo.php:132
+#: ../../mod/siteinfo.php:36
 msgid "Installed plugins/addons/apps:"
 msgstr ""
 
-#: ../../mod/siteinfo.php:145
+#: ../../mod/siteinfo.php:49
 msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/siteinfo.php:158
+#: ../../mod/siteinfo.php:62
 msgid ""
 "This is a hub of $Projectname - a global cooperative network of "
 "decentralized privacy enhanced websites."
 msgstr ""
 
-#: ../../mod/siteinfo.php:160
+#: ../../mod/siteinfo.php:64
 msgid "Tag: "
 msgstr ""
 
-#: ../../mod/siteinfo.php:162
+#: ../../mod/siteinfo.php:66
 msgid "Last background fetch: "
 msgstr ""
 
-#: ../../mod/siteinfo.php:164
+#: ../../mod/siteinfo.php:68
 msgid "Current load average: "
 msgstr ""
 
-#: ../../mod/siteinfo.php:167
+#: ../../mod/siteinfo.php:71
 msgid "Running at web location"
 msgstr ""
 
-#: ../../mod/siteinfo.php:168
+#: ../../mod/siteinfo.php:72
 msgid ""
 "Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
 "about $Projectname."
 msgstr ""
 
-#: ../../mod/siteinfo.php:169
+#: ../../mod/siteinfo.php:73
 msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/siteinfo.php:171
+#: ../../mod/siteinfo.php:75
 msgid "$projectname issues"
 msgstr ""
 
-#: ../../mod/siteinfo.php:172
+#: ../../mod/siteinfo.php:76
 msgid ""
 "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
 msgstr ""
 
-#: ../../mod/siteinfo.php:174
+#: ../../mod/siteinfo.php:78
 msgid "Site Administrators"
 msgstr ""
 
@@ -8912,77 +8946,105 @@ msgstr ""
 msgid "Event not found."
 msgstr ""
 
-#: ../../mod/events.php:452
-msgid "Event Title"
+#: ../../mod/events.php:437
+msgid "Edit event titel"
+msgstr ""
+
+#: ../../mod/events.php:437
+msgid "Event titel"
 msgstr ""
 
-#: ../../mod/events.php:454
+#: ../../mod/events.php:439
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/events.php:455
+#: ../../mod/events.php:440
+msgid "Edit Category"
+msgstr ""
+
+#: ../../mod/events.php:440
 msgid "Category"
 msgstr ""
 
-#: ../../mod/events.php:458
+#: ../../mod/events.php:443
+msgid "Edit start date and time"
+msgstr ""
+
+#: ../../mod/events.php:443
 msgid "Start date and time"
 msgstr ""
 
-#: ../../mod/events.php:459 ../../mod/events.php:462
+#: ../../mod/events.php:444 ../../mod/events.php:447
 msgid "Finish date and time are not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:461
+#: ../../mod/events.php:446
+msgid "Edit finish date and time"
+msgstr ""
+
+#: ../../mod/events.php:446
 msgid "Finish date and time"
 msgstr ""
 
-#: ../../mod/events.php:463 ../../mod/events.php:464
+#: ../../mod/events.php:448 ../../mod/events.php:449
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:463
+#: ../../mod/events.php:448
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr ""
 
-#: ../../mod/events.php:470 ../../mod/events.php:472
+#: ../../mod/events.php:450
+msgid "Edit Description"
+msgstr ""
+
+#: ../../mod/events.php:452
+msgid "Edit Location"
+msgstr ""
+
+#: ../../mod/events.php:455 ../../mod/events.php:457
 msgid "Share this event"
 msgstr ""
 
-#: ../../mod/events.php:477
+#: ../../mod/events.php:462
 msgid "Advanced Options"
 msgstr ""
 
-#: ../../mod/events.php:589
+#: ../../mod/events.php:574
 msgid "l, F j"
 msgstr ""
 
-#: ../../mod/events.php:611
+#: ../../mod/events.php:596
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:613
+#: ../../mod/events.php:598
 msgid "Delete event"
 msgstr ""
 
-#: ../../mod/events.php:647
+#: ../../mod/events.php:632
 msgid "calendar"
 msgstr ""
 
-#: ../../mod/events.php:666
-msgid "New Event"
+#: ../../mod/events.php:651
+msgid "Edit Event"
+msgstr ""
+
+#: ../../mod/events.php:651
+msgid "Create Event"
 msgstr ""
 
-#: ../../mod/events.php:676
+#: ../../mod/events.php:661
 msgid "Today"
 msgstr ""
 
-#: ../../mod/events.php:707
+#: ../../mod/events.php:692
 msgid "Event removed"
 msgstr ""
 
-#: ../../mod/events.php:710
+#: ../../mod/events.php:695
 msgid "Failed to remove event"
 msgstr ""
 
@@ -9114,10 +9176,6 @@ msgstr ""
 msgid "Link text"
 msgstr ""
 
-#: ../../mod/wholikesme.php:13
-msgid "Who likes me?"
-msgstr ""
-
 #: ../../mod/sharedwithme.php:94
 msgid "Files: shared with me"
 msgstr ""
@@ -9279,51 +9337,57 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1291
+#: ../../Zotlabs/Zot/Auth.php:140
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please "
+"logout and retry."
+msgstr ""
+
+#: ../../boot.php:1299
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1294
+#: ../../boot.php:1302
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1461
+#: ../../boot.php:1469
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr ""
 
-#: ../../boot.php:1489
+#: ../../boot.php:1491
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1490
+#: ../../boot.php:1492
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1493
+#: ../../boot.php:1495
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2113
+#: ../../boot.php:2115
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2248
+#: ../../boot.php:2250
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2251
+#: ../../boot.php:2253
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2288
+#: ../../boot.php:2290
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2292
+#: ../../boot.php:2294
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
diff --git a/hubzilla_er/Makefile b/util/hubzilla_er/Makefile
index f36f01007..f36f01007 100644
--- a/hubzilla_er/Makefile
+++ b/util/hubzilla_er/Makefile
diff --git a/util/typo.php b/util/typo.php
index 4e51cd37c..2e25c8306 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -33,6 +33,13 @@
 		include_once($file);
 	}
 
+	echo "Directory: Zotlabs\n";
+	$files = glob('Zotlabs/*/*.php');
+	foreach($files as $file) {
+		echo $file . "\n";
+		include_once($file);
+	}
+
 
 	echo "Directory: include/photo\n";
 	$files = glob('include/photo/*.php');
diff --git a/version.inc b/version.inc
index 8282941e1..479ab9124 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-12-03.1235
+2016-01-01.1264
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index 5a2b8d443..9bfea856d 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -4,8 +4,8 @@
 	border: none;
 }
 
-.directory-item {
-	margin-bottom: 20px;
+.section-content-tools-wrapper {
+	padding-bottom: 20px;
 }
 
 .contact-photo-wrapper {
diff --git a/view/css/mod_home.css b/view/css/mod_home.css
new file mode 100644
index 000000000..d4cf37253
--- /dev/null
+++ b/view/css/mod_home.css
@@ -0,0 +1,15 @@
+.home-welcome {
+	text-align: center;
+}
+
+.generic-content-wrapper-styled {
+	margin-left: auto;
+	margin-right: auto;
+	max-width: 420px;
+	font-size: 1.1em;
+}
+
+#login-main {
+	max-width: 400px;
+	margin-top: 50px;
+}
diff --git a/view/css/mod_login.css b/view/css/mod_login.css
new file mode 100644
index 000000000..a086c50df
--- /dev/null
+++ b/view/css/mod_login.css
@@ -0,0 +1,23 @@
+.generic-content-wrapper-styled {
+	margin-left: auto;
+	margin-right: auto;
+	max-width: 420px;
+	font-size: 1.1em;
+}
+
+#login-main {
+	max-width: 400px;
+	margin-top: 50px;
+}
+
+@media (min-width: 768px) and (max-width: 991px) {
+	#region_1 {
+		display: none !important;
+	}
+}
+
+@media (min-width: 992px) and (max-width: 1199px) {
+	#region_3 {
+		display: table-cell !important;
+	}
+}
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index 1346eecd5..843d1274c 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -25,6 +25,10 @@
 	margin: 15px;
 }
 
+#prvmail-text {
+  height: 20.0em;
+}
+
 .mail-conv-outside-wrapper {
 	margin-bottom: 20px;
 }
diff --git a/view/css/mod_register.css b/view/css/mod_register.css
index b662610ae..618b7ce95 100644
--- a/view/css/mod_register.css
+++ b/view/css/mod_register.css
@@ -1,31 +1,35 @@
 
 h2 {
-	margin-left: 5%;
-	margin-top: 5%;
+	margin: 20px 0 20px 5%;
 }
 
-#register-form {
-	font-size: 1.4em;	
-	margin-left: 10%;
-	margin-top: 5%;
+.generic-content-wrapper-styled {
+	margin-left: auto;
+	margin-right: auto;
+	max-width: 820px;
+	font-size: 1.1em;
 }
 
-#register-desc, #register-text, #register-sites {
+
+#register-desc, #register-invite-desc, #register-text, #register-sites {
 	font-weight: bold;
 	margin-bottom: 15px;
 	padding: 8px;
 	border: 1px solid #ccc;
 }
 
-.register-label {
+@media (min-width: 560px) {
+.register-label, .register-input {
 	float: left;
-	width: 275px;
+	width: 50%;
+}
 }
 
-.register-input {
+@media (max-width: 559px) {
+.register-label, .register-input {
 	float: left;
-	width: 275px;
-	padding: 5px;
+	max-width: 400px;
+}
 }
 
 .register-feedback {
diff --git a/view/de/hmessages.po b/view/de/hmessages.po
index 3121c7c59..bfb2009df 100644
--- a/view/de/hmessages.po
+++ b/view/de/hmessages.po
@@ -17,12 +17,13 @@
 # sasiflo <transiflex@sasiflo.de>, 2014
 # Steff <steff@digitalesecho.de>, 2015
 # zottel <transifex@zottel.net>, 2015
+# sasiflo <transiflex@sasiflo.de>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-26 22:48-0700\n"
-"PO-Revision-Date: 2015-09-30 11:56+0000\n"
+"POT-Creation-Date: 2015-12-11 00:03-0800\n"
+"PO-Revision-Date: 2015-12-16 12:48+0000\n"
 "Last-Translator: zottel <transifex@zottel.net>\n"
 "Language-Team: German (http://www.transifex.com/Friendica/red-matrix/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -31,26 +32,116 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../include/Import/import_diaspora.php:17
-msgid "No username found in import file."
-msgstr "Kein Benutzername in der Importdatei gefunden."
+#: ../../include/Contact.php:101 ../../include/identity.php:947
+#: ../../include/widgets.php:137 ../../include/widgets.php:175
+#: ../../include/conversation.php:953 ../../mod/match.php:64
+#: ../../mod/directory.php:318 ../../mod/suggest.php:52
+msgid "Connect"
+msgstr "Verbinden"
+
+#: ../../include/Contact.php:118
+msgid "New window"
+msgstr "Neues Fenster"
+
+#: ../../include/Contact.php:119
+msgid "Open the selected location in a different window or browser tab"
+msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"
+
+#: ../../include/Contact.php:237
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Benutzer '%s' gelöscht"
 
-#: ../../include/Import/import_diaspora.php:42 ../../include/import.php:44
+#: ../../include/chat.php:23
+msgid "Missing room name"
+msgstr "Der Chatraum hat keinen Namen"
+
+#: ../../include/chat.php:32
+msgid "Duplicate room name"
+msgstr "Name des Chatraums bereits vergeben"
+
+#: ../../include/chat.php:82 ../../include/chat.php:90
+msgid "Invalid room specifier."
+msgstr "Ungültiger Raumbezeichner."
+
+#: ../../include/chat.php:122
+msgid "Room not found."
+msgstr "Chatraum konnte nicht gefunden werden."
+
+#: ../../include/chat.php:133 ../../include/items.php:4398
+#: ../../include/attach.php:140 ../../include/attach.php:188
+#: ../../include/attach.php:251 ../../include/attach.php:265
+#: ../../include/attach.php:272 ../../include/attach.php:337
+#: ../../include/attach.php:351 ../../include/attach.php:358
+#: ../../include/attach.php:436 ../../include/attach.php:884
+#: ../../include/attach.php:955 ../../include/attach.php:1107
+#: ../../include/photos.php:29 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/group.php:9 ../../mod/item.php:205
+#: ../../mod/item.php:213 ../../mod/item.php:1049 ../../mod/common.php:35
+#: ../../mod/achievements.php:30 ../../mod/rate.php:111
+#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/id.php:71
+#: ../../mod/like.php:177 ../../mod/page.php:31 ../../mod/page.php:86
+#: ../../mod/mood.php:112 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/setup.php:227
+#: ../../mod/bookmarks.php:48 ../../mod/poke.php:133
+#: ../../mod/profiles.php:198 ../../mod/profiles.php:584
+#: ../../mod/connedit.php:352 ../../mod/editwebpage.php:64
+#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
+#: ../../mod/editwebpage.php:125 ../../mod/profile.php:64
+#: ../../mod/profile.php:72 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/fsuggest.php:78 ../../mod/sources.php:66
+#: ../../mod/notifications.php:66 ../../mod/invite.php:13
+#: ../../mod/invite.php:87 ../../mod/profile_photo.php:341
+#: ../../mod/profile_photo.php:354 ../../mod/thing.php:271
+#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/editblock.php:65
+#: ../../mod/network.php:12 ../../mod/pdledit.php:21 ../../mod/register.php:72
+#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
+#: ../../mod/settings.php:568 ../../mod/webpages.php:69
+#: ../../mod/appman.php:66 ../../mod/layouts.php:69 ../../mod/layouts.php:76
+#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/regmod.php:17
+#: ../../mod/channel.php:100 ../../mod/channel.php:214
+#: ../../mod/channel.php:254 ../../mod/photos.php:70 ../../mod/editpost.php:13
+#: ../../mod/chat.php:94 ../../mod/chat.php:99 ../../mod/viewsrc.php:14
+#: ../../mod/authtest.php:13 ../../mod/connections.php:29
+#: ../../mod/manage.php:6 ../../mod/menu.php:74 ../../mod/mail.php:126
+#: ../../mod/service_limits.php:7 ../../mod/suggest.php:26
+#: ../../mod/events.php:260 ../../mod/message.php:16 ../../mod/block.php:22
+#: ../../mod/block.php:72 ../../mod/mitem.php:111 ../../mod/sharedwithme.php:7
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../index.php:182 ../../index.php:365
+msgid "Permission denied."
+msgstr "Berechtigung verweigert."
+
+#: ../../include/chat.php:143
+msgid "Room is full"
+msgstr "Der Raum ist voll"
+
+#: ../../include/import.php:23
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen."
+
+#: ../../include/import.php:44 ../../include/Import/import_diaspora.php:42
 msgid "Unable to create a unique channel address. Import failed."
 msgstr "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Import ist fehlgeschlagen."
 
-#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:480
-msgid "Import completed."
-msgstr "Import abgeschlossen."
+#: ../../include/import.php:70
+msgid "Channel clone failed. Import failed."
+msgstr "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen."
+
+#: ../../include/import.php:80 ../../mod/import.php:139
+msgid "Cloned channel not found. Import failed."
+msgstr "Geklonter Kanal nicht gefunden. Import fehlgeschlagen."
 
 #: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:265
+#: ../../include/RedDAV/RedBrowser.php:239
 msgid "parent"
 msgstr "Ãœbergeordnetes Verzeichnis"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2497
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2582
 msgid "Collection"
-msgstr "Ordner"
+msgstr "Sammlung"
 
 #: ../../include/RedDAV/RedBrowser.php:134
 msgid "Principal"
@@ -72,89 +163,97 @@ msgstr "Posteingang für überwachte Kalender"
 msgid "Schedule Outbox"
 msgstr "Postausgang für überwachte Kalender"
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1021
-#: ../../include/apps.php:355 ../../include/apps.php:410
-#: ../../mod/photos.php:720 ../../mod/photos.php:1159
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1330
+#: ../../include/conversation.php:1027 ../../include/apps.php:360
+#: ../../include/apps.php:415 ../../mod/photos.php:754
+#: ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../../include/RedDAV/RedBrowser.php:227
-#, php-format
-msgid "%1$s used"
-msgstr "%1$s verwendet"
-
-#: ../../include/RedDAV/RedBrowser.php:232
-#, php-format
-msgid "%1$s used of %2$s (%3$s&#37;)"
-msgstr "%1$s von %2$s verwendet (%3$s&#37;)"
-
-#: ../../include/RedDAV/RedBrowser.php:251 ../../include/conversation.php:1611
-#: ../../include/apps.php:135 ../../include/nav.php:93
-#: ../../mod/fbrowser.php:114
+#: ../../include/RedDAV/RedBrowser.php:226 ../../include/conversation.php:1629
+#: ../../include/nav.php:93 ../../include/apps.php:135
+#: ../../mod/fbrowser.php:109
 msgid "Files"
 msgstr "Dateien"
 
-#: ../../include/RedDAV/RedBrowser.php:253
+#: ../../include/RedDAV/RedBrowser.php:227
 msgid "Total"
 msgstr "Summe"
 
-#: ../../include/RedDAV/RedBrowser.php:255
+#: ../../include/RedDAV/RedBrowser.php:229
 msgid "Shared"
 msgstr "Geteilt"
 
-#: ../../include/RedDAV/RedBrowser.php:256
-#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/layouts.php:175
-#: ../../mod/menu.php:114 ../../mod/new_channel.php:121
-#: ../../mod/webpages.php:180 ../../mod/blocks.php:152
+#: ../../include/RedDAV/RedBrowser.php:230
+#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/blocks.php:152
+#: ../../mod/new_channel.php:121 ../../mod/webpages.php:180
+#: ../../mod/layouts.php:175 ../../mod/menu.php:114
 msgid "Create"
 msgstr "Erstelle"
 
-#: ../../include/RedDAV/RedBrowser.php:257
-#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:745
-#: ../../mod/photos.php:1278 ../../mod/profile_photo.php:450
+#: ../../include/RedDAV/RedBrowser.php:231
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1343
+#: ../../mod/profile_photo.php:453 ../../mod/photos.php:781
+#: ../../mod/photos.php:1316
 msgid "Upload"
 msgstr "Hochladen"
 
-#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:948
-#: ../../mod/settings.php:585 ../../mod/settings.php:611
+#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:981
+#: ../../mod/settings.php:588 ../../mod/settings.php:614
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
 msgstr "Name"
 
-#: ../../include/RedDAV/RedBrowser.php:262
+#: ../../include/RedDAV/RedBrowser.php:236
 msgid "Type"
 msgstr "Typ"
 
-#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97
+#: ../../include/RedDAV/RedBrowser.php:237 ../../include/text.php:1248
+#: ../../mod/sharedwithme.php:97
 msgid "Size"
 msgstr "Größe"
 
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98
+#: ../../include/RedDAV/RedBrowser.php:238 ../../mod/sharedwithme.php:98
 msgid "Last Modified"
 msgstr "Zuletzt geändert"
 
-#: ../../include/RedDAV/RedBrowser.php:266 ../../include/menu.php:108
+#: ../../include/RedDAV/RedBrowser.php:240 ../../include/menu.php:108
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../include/apps.php:254 ../../include/ItemObject.php:100
-#: ../../mod/layouts.php:183 ../../mod/editpost.php:113
-#: ../../mod/editblock.php:135 ../../mod/menu.php:108
-#: ../../mod/webpages.php:181 ../../mod/blocks.php:153 ../../mod/thing.php:257
-#: ../../mod/settings.php:645 ../../mod/connections.php:235
+#: ../../include/ItemObject.php:100 ../../include/apps.php:259
+#: ../../mod/blocks.php:153 ../../mod/editwebpage.php:176
+#: ../../mod/thing.php:257 ../../mod/editblock.php:135
+#: ../../mod/editlayout.php:134 ../../mod/settings.php:648
+#: ../../mod/webpages.php:181 ../../mod/layouts.php:183
+#: ../../mod/editpost.php:112 ../../mod/connections.php:235
 #: ../../mod/connections.php:248 ../../mod/connections.php:267
-#: ../../mod/editlayout.php:134 ../../mod/editwebpage.php:176
+#: ../../mod/menu.php:108
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../../include/RedDAV/RedBrowser.php:267 ../../include/conversation.php:662
-#: ../../include/apps.php:255 ../../include/ItemObject.php:120
-#: ../../mod/connedit.php:547 ../../mod/editblock.php:181
-#: ../../mod/admin.php:783 ../../mod/admin.php:942 ../../mod/photos.php:1090
-#: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258
-#: ../../mod/settings.php:646 ../../mod/editlayout.php:179
-#: ../../mod/editwebpage.php:223 ../../mod/group.php:173
+#: ../../include/RedDAV/RedBrowser.php:241 ../../include/conversation.php:657
+#: ../../include/ItemObject.php:120 ../../include/apps.php:260
+#: ../../mod/group.php:173 ../../mod/blocks.php:155 ../../mod/connedit.php:551
+#: ../../mod/editwebpage.php:223 ../../mod/thing.php:258
+#: ../../mod/editblock.php:181 ../../mod/admin.php:816 ../../mod/admin.php:975
+#: ../../mod/editlayout.php:179 ../../mod/settings.php:649
+#: ../../mod/webpages.php:183 ../../mod/photos.php:1126
 msgid "Delete"
 msgstr "Löschen"
 
+#: ../../include/RedDAV/RedBrowser.php:282
+#, php-format
+msgid "You are using %1$s of your available file storage."
+msgstr "Sie verwenden %1$s von Ihrem verfügbaren Dateispeicher."
+
+#: ../../include/RedDAV/RedBrowser.php:287
+#, php-format
+msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
+msgstr "Sie verwenden %1$s von %2$s verfügbarem Dateispeicher. (%3$s&#37;)"
+
+#: ../../include/RedDAV/RedBrowser.php:299
+msgid "WARNING:"
+msgstr "WARNUNG:"
+
 #: ../../include/RedDAV/RedBrowser.php:302
 msgid "Create new folder"
 msgstr "Neuen Ordner anlegen"
@@ -163,292 +262,1286 @@ msgstr "Neuen Ordner anlegen"
 msgid "Upload file"
 msgstr "Datei hochladen"
 
-#: ../../include/permissions.php:26
-msgid "Can view my normal stream and posts"
-msgstr "Kann meine normalen Beiträge sehen"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
+msgstr "Dieses Element löschen?"
 
-#: ../../include/permissions.php:27
-msgid "Can view my default channel profile"
-msgstr "Kann mein Standardprofil sehen"
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:696
+#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
+msgid "Comment"
+msgstr "Kommentar"
 
-#: ../../include/permissions.php:28
-msgid "Can view my connections"
-msgstr "Kann meine Verbindungen sehen"
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:413
+msgid "[+] show all"
+msgstr "[+] Alle anzeigen"
 
-#: ../../include/permissions.php:29
-msgid "Can view my file storage and photos"
-msgstr "Kann meine Datei- und Bilderordner sehen"
+#: ../../include/js_strings.php:8
+msgid "[-] show less"
+msgstr "[-] Weniger anzeigen"
 
-#: ../../include/permissions.php:30
-msgid "Can view my webpages"
-msgstr "Kann meine Webseiten sehen"
+#: ../../include/js_strings.php:9
+msgid "[+] expand"
+msgstr "[+] aufklappen"
 
-#: ../../include/permissions.php:33
-msgid "Can send me their channel stream and posts"
-msgstr "Kann mir die Beiträge aus seinem/ihrem Kanal schicken"
+#: ../../include/js_strings.php:10
+msgid "[-] collapse"
+msgstr "[-] einklappen"
 
-#: ../../include/permissions.php:34
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
+#: ../../include/js_strings.php:11
+msgid "Password too short"
+msgstr "Kennwort zu kurz"
 
-#: ../../include/permissions.php:35
-msgid "Can comment on or like my posts"
-msgstr "Darf meine Beiträge kommentieren und mögen/nicht mögen"
+#: ../../include/js_strings.php:12
+msgid "Passwords do not match"
+msgstr "Kennwörter stimmen nicht überein"
 
-#: ../../include/permissions.php:36
-msgid "Can send me private mail messages"
-msgstr "Kann mir private Nachrichten schicken"
+#: ../../include/js_strings.php:13 ../../mod/photos.php:41
+msgid "everybody"
+msgstr "alle"
 
-#: ../../include/permissions.php:37
-msgid "Can like/dislike stuff"
-msgstr "Kann andere Elemente mögen/nicht mögen"
+#: ../../include/js_strings.php:14
+msgid "Secret Passphrase"
+msgstr "geheime Passphrase"
 
-#: ../../include/permissions.php:37
-msgid "Profiles and things other than posts/comments"
-msgstr "Profile und alles außer Beiträge und Kommentare"
+#: ../../include/js_strings.php:15
+msgid "Passphrase hint"
+msgstr "Hinweis zur Passphrase"
 
-#: ../../include/permissions.php:39
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
+#: ../../include/js_strings.php:16
+msgid "Notice: Permissions have changed but have not yet been submitted."
+msgstr "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert."
 
-#: ../../include/permissions.php:39
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
+#: ../../include/js_strings.php:17
+msgid "close all"
+msgstr "Alle schließen"
 
-#: ../../include/permissions.php:40
-msgid "Can chat with me (when available)"
-msgstr "Kann mit mir chatten (wenn verfügbar)"
+#: ../../include/js_strings.php:18
+msgid "Nothing new here"
+msgstr "Nichts Neues hier"
 
-#: ../../include/permissions.php:41
-msgid "Can write to my file storage and photos"
-msgstr "Kann in meine Datei- und Bilderordner schreiben"
+#: ../../include/js_strings.php:19
+msgid "Rate This Channel (this is public)"
+msgstr "Diesen Kanal bewerten (öffentlich sichtbar)"
 
-#: ../../include/permissions.php:42
-msgid "Can edit my webpages"
-msgstr "Kann meine Webseiten bearbeiten"
+#: ../../include/js_strings.php:20 ../../mod/rate.php:157
+#: ../../mod/connedit.php:694
+msgid "Rating"
+msgstr "Bewertung"
 
-#: ../../include/permissions.php:44
-msgid "Can source my public posts in derived channels"
-msgstr "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden"
+#: ../../include/js_strings.php:21
+msgid "Describe (optional)"
+msgstr "Beschreibung (optional)"
 
-#: ../../include/permissions.php:44
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften"
+#: ../../include/js_strings.php:22 ../../include/widgets.php:676
+#: ../../include/widgets.php:688 ../../include/ItemObject.php:697
+#: ../../mod/filestorage.php:156 ../../mod/group.php:81
+#: ../../mod/connect.php:93 ../../mod/rate.php:168 ../../mod/mood.php:135
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/pconfig.php:108
+#: ../../mod/poke.php:171 ../../mod/profiles.php:675
+#: ../../mod/connedit.php:715 ../../mod/fsuggest.php:108
+#: ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/import.php:527 ../../mod/invite.php:142 ../../mod/thing.php:313
+#: ../../mod/thing.php:359 ../../mod/import_items.php:122
+#: ../../mod/pdledit.php:58 ../../mod/admin.php:442 ../../mod/admin.php:809
+#: ../../mod/admin.php:973 ../../mod/admin.php:1110 ../../mod/admin.php:1304
+#: ../../mod/admin.php:1389 ../../mod/settings.php:586
+#: ../../mod/settings.php:698 ../../mod/settings.php:726
+#: ../../mod/settings.php:749 ../../mod/settings.php:834
+#: ../../mod/settings.php:1023 ../../mod/appman.php:99 ../../mod/locs.php:116
+#: ../../mod/xchan.php:11 ../../mod/photos.php:637 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1045 ../../mod/photos.php:1163 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/mail.php:380 ../../mod/events.php:461
+#: ../../mod/events.php:658 ../../mod/mitem.php:231
+#: ../../view/theme/redbasic/php/config.php:99
+msgid "Submit"
+msgstr "Bestätigen"
 
-#: ../../include/permissions.php:46
-msgid "Can administer my channel resources"
-msgstr "Kann meine Kanäle administrieren"
+#: ../../include/js_strings.php:23
+msgid "Please enter a link URL"
+msgstr "Gib eine URL ein:"
 
-#: ../../include/permissions.php:46
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust"
+#: ../../include/js_strings.php:24
+msgid "Unsaved changes. Are you sure you wish to leave this page?"
+msgstr "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlassen möchtest?"
 
-#: ../../include/permissions.php:867
-msgid "Social Networking"
-msgstr "Soziales Netzwerk"
+#: ../../include/js_strings.php:25 ../../mod/pubsites.php:28
+#: ../../mod/profiles.php:464 ../../mod/events.php:452
+msgid "Location"
+msgstr "Ort"
 
-#: ../../include/permissions.php:867 ../../include/permissions.php:868
-#: ../../include/permissions.php:869
-msgid "Mostly Public"
-msgstr "Weitgehend öffentlich"
+#: ../../include/js_strings.php:27
+msgid "timeago.prefixAgo"
+msgstr "timeago.prefixAgo"
 
-#: ../../include/permissions.php:867 ../../include/permissions.php:868
-#: ../../include/permissions.php:869
-msgid "Restricted"
-msgstr "Beschränkt"
+#: ../../include/js_strings.php:28
+msgid "timeago.prefixFromNow"
+msgstr " "
 
-#: ../../include/permissions.php:867 ../../include/permissions.php:868
-msgid "Private"
-msgstr "Privat"
+#: ../../include/js_strings.php:29
+msgid "ago"
+msgstr "her"
 
-#: ../../include/permissions.php:868
-msgid "Community Forum"
-msgstr "Forum"
+#: ../../include/js_strings.php:30
+msgid "from now"
+msgstr "von jetzt"
 
-#: ../../include/permissions.php:869
-msgid "Feed Republish"
-msgstr "Teilen von Feeds"
+#: ../../include/js_strings.php:31
+msgid "less than a minute"
+msgstr "weniger als eine Minute"
 
-#: ../../include/permissions.php:870
-msgid "Special Purpose"
-msgstr "Für besondere Zwecke"
+#: ../../include/js_strings.php:32
+msgid "about a minute"
+msgstr "ungefähr eine Minute"
 
-#: ../../include/permissions.php:870
-msgid "Celebrity/Soapbox"
-msgstr "Mitteilungs-Kanal (keine Kommentare)"
+#: ../../include/js_strings.php:33
+#, php-format
+msgid "%d minutes"
+msgstr "%d Minuten"
 
-#: ../../include/permissions.php:870
-msgid "Group Repository"
-msgstr "Gruppenarchiv"
+#: ../../include/js_strings.php:34
+msgid "about an hour"
+msgstr "ungefähr eine Stunde"
 
-#: ../../include/permissions.php:871 ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-#: ../../include/profile_selectors.php:61
-#: ../../include/profile_selectors.php:97
-msgid "Other"
-msgstr "Andere"
+#: ../../include/js_strings.php:35
+#, php-format
+msgid "about %d hours"
+msgstr "ungefähr %d Stunden"
 
-#: ../../include/permissions.php:871
-msgid "Custom/Expert Mode"
-msgstr "Benutzerdefiniert/Expertenmodus"
+#: ../../include/js_strings.php:36
+msgid "a day"
+msgstr "ein Tag"
 
-#: ../../include/chat.php:23
-msgid "Missing room name"
-msgstr "Der Chatraum hat keinen Namen"
+#: ../../include/js_strings.php:37
+#, php-format
+msgid "%d days"
+msgstr "%d Tage"
 
-#: ../../include/chat.php:32
-msgid "Duplicate room name"
-msgstr "Name des Chatraums bereits vergeben"
+#: ../../include/js_strings.php:38
+msgid "about a month"
+msgstr "ungefähr ein Monat"
 
-#: ../../include/chat.php:82 ../../include/chat.php:90
-msgid "Invalid room specifier."
-msgstr "Ungültiger Raumbezeichner."
+#: ../../include/js_strings.php:39
+#, php-format
+msgid "%d months"
+msgstr "%d Monate"
 
-#: ../../include/chat.php:122
-msgid "Room not found."
-msgstr "Chatraum konnte nicht gefunden werden."
+#: ../../include/js_strings.php:40
+msgid "about a year"
+msgstr "ungefähr ein Jahr"
 
-#: ../../include/chat.php:133 ../../include/photos.php:26
-#: ../../include/attach.php:137 ../../include/attach.php:185
-#: ../../include/attach.php:248 ../../include/attach.php:262
-#: ../../include/attach.php:269 ../../include/attach.php:334
-#: ../../include/attach.php:348 ../../include/attach.php:355
-#: ../../include/attach.php:433 ../../include/attach.php:840
-#: ../../include/attach.php:911 ../../include/attach.php:1064
-#: ../../include/items.php:4342 ../../mod/achievements.php:30
-#: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
-#: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
-#: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
-#: ../../mod/mitem.php:111 ../../mod/connedit.php:348 ../../mod/mood.php:112
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
-#: ../../mod/poke.php:133 ../../mod/network.php:12 ../../mod/chat.php:91
-#: ../../mod/chat.php:96 ../../mod/message.php:16 ../../mod/channel.php:100
-#: ../../mod/channel.php:215 ../../mod/channel.php:255
-#: ../../mod/editpost.php:13 ../../mod/editblock.php:65 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:992 ../../mod/appman.php:66
-#: ../../mod/profile.php:64 ../../mod/profile.php:72 ../../mod/menu.php:74
-#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
-#: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/rate.php:110
-#: ../../mod/events.php:256 ../../mod/profile_photo.php:338
-#: ../../mod/profile_photo.php:351 ../../mod/mail.php:114
-#: ../../mod/webpages.php:69 ../../mod/register.php:72 ../../mod/blocks.php:69
-#: ../../mod/blocks.php:76 ../../mod/service_limits.php:7
-#: ../../mod/sources.php:66 ../../mod/regmod.php:17 ../../mod/thing.php:271
-#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/viewsrc.php:14
-#: ../../mod/settings.php:565 ../../mod/manage.php:6 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/connections.php:29
-#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
-#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
-#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
-#: ../../mod/group.php:9 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/locs.php:82
-#: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7
-#: ../../mod/suggest.php:26 ../../mod/profiles.php:188
-#: ../../mod/profiles.php:576 ../../index.php:178 ../../index.php:361
-msgid "Permission denied."
-msgstr "Zugang verweigert"
+#: ../../include/js_strings.php:41
+#, php-format
+msgid "%d years"
+msgstr "%d Jahre"
 
-#: ../../include/chat.php:143
-msgid "Room is full"
-msgstr "Der Raum ist voll"
+#: ../../include/js_strings.php:42
+msgid " "
+msgstr " "
 
-#: ../../include/datetime.php:48
-msgid "Miscellaneous"
-msgstr "Verschiedenes"
+#: ../../include/js_strings.php:43
+msgid "timeago.numbers"
+msgstr "timeago.numbers"
 
-#: ../../include/datetime.php:132
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "JJJJ-MM-TT oder MM-TT"
+#: ../../include/js_strings.php:45 ../../include/text.php:1165
+msgid "January"
+msgstr "Januar"
 
-#: ../../include/datetime.php:235 ../../mod/appman.php:91
-#: ../../mod/appman.php:92 ../../mod/events.php:689
-msgid "Required"
-msgstr "Benötigt"
+#: ../../include/js_strings.php:46 ../../include/text.php:1165
+msgid "February"
+msgstr "Februar"
 
-#: ../../include/datetime.php:262 ../../boot.php:2306
-msgid "never"
-msgstr "Nie"
+#: ../../include/js_strings.php:47 ../../include/text.php:1165
+msgid "March"
+msgstr "März"
 
-#: ../../include/datetime.php:268
-msgid "less than a second ago"
-msgstr "Vor weniger als einer Sekunde"
+#: ../../include/js_strings.php:48 ../../include/text.php:1165
+msgid "April"
+msgstr "April"
 
-#: ../../include/datetime.php:271
-msgid "year"
-msgstr "Jahr"
+#: ../../include/js_strings.php:49
+msgctxt "long"
+msgid "May"
+msgstr "Mai"
 
-#: ../../include/datetime.php:271
-msgid "years"
-msgstr "Jahre"
+#: ../../include/js_strings.php:50 ../../include/text.php:1165
+msgid "June"
+msgstr "Juni"
 
-#: ../../include/datetime.php:272
+#: ../../include/js_strings.php:51 ../../include/text.php:1165
+msgid "July"
+msgstr "Juli"
+
+#: ../../include/js_strings.php:52 ../../include/text.php:1165
+msgid "August"
+msgstr "August"
+
+#: ../../include/js_strings.php:53 ../../include/text.php:1165
+msgid "September"
+msgstr "September"
+
+#: ../../include/js_strings.php:54 ../../include/text.php:1165
+msgid "October"
+msgstr "Oktober"
+
+#: ../../include/js_strings.php:55 ../../include/text.php:1165
+msgid "November"
+msgstr "November"
+
+#: ../../include/js_strings.php:56 ../../include/text.php:1165
+msgid "December"
+msgstr "Dezember"
+
+#: ../../include/js_strings.php:57
+msgid "Jan"
+msgstr "Jan"
+
+#: ../../include/js_strings.php:58
+msgid "Feb"
+msgstr "Feb"
+
+#: ../../include/js_strings.php:59
+msgid "Mar"
+msgstr "Mär"
+
+#: ../../include/js_strings.php:60
+msgid "Apr"
+msgstr "Apr"
+
+#: ../../include/js_strings.php:61
+msgctxt "short"
+msgid "May"
+msgstr "Mai"
+
+#: ../../include/js_strings.php:62
+msgid "Jun"
+msgstr "Jun"
+
+#: ../../include/js_strings.php:63
+msgid "Jul"
+msgstr "Jul"
+
+#: ../../include/js_strings.php:64
+msgid "Aug"
+msgstr "Aug"
+
+#: ../../include/js_strings.php:65
+msgid "Sep"
+msgstr "Sep"
+
+#: ../../include/js_strings.php:66
+msgid "Oct"
+msgstr "Okt"
+
+#: ../../include/js_strings.php:67
+msgid "Nov"
+msgstr "Nov"
+
+#: ../../include/js_strings.php:68
+msgid "Dec"
+msgstr "Dez"
+
+#: ../../include/js_strings.php:69 ../../include/text.php:1161
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: ../../include/js_strings.php:70 ../../include/text.php:1161
+msgid "Monday"
+msgstr "Montag"
+
+#: ../../include/js_strings.php:71 ../../include/text.php:1161
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: ../../include/js_strings.php:72 ../../include/text.php:1161
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: ../../include/js_strings.php:73 ../../include/text.php:1161
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: ../../include/js_strings.php:74 ../../include/text.php:1161
+msgid "Friday"
+msgstr "Freitag"
+
+#: ../../include/js_strings.php:75 ../../include/text.php:1161
+msgid "Saturday"
+msgstr "Samstag"
+
+#: ../../include/js_strings.php:76
+msgid "Sun"
+msgstr "So"
+
+#: ../../include/js_strings.php:77
+msgid "Mon"
+msgstr "Mp"
+
+#: ../../include/js_strings.php:78
+msgid "Tue"
+msgstr "Di"
+
+#: ../../include/js_strings.php:79
+msgid "Wed"
+msgstr "Mi"
+
+#: ../../include/js_strings.php:80
+msgid "Thu"
+msgstr "Do"
+
+#: ../../include/js_strings.php:81
+msgid "Fri"
+msgstr "Fr"
+
+#: ../../include/js_strings.php:82
+msgid "Sat"
+msgstr "Sa"
+
+#: ../../include/js_strings.php:83
+msgctxt "calendar"
+msgid "today"
+msgstr "heute"
+
+#: ../../include/js_strings.php:84
+msgctxt "calendar"
 msgid "month"
 msgstr "Monat"
 
-#: ../../include/datetime.php:272
-msgid "months"
-msgstr "Monate"
-
-#: ../../include/datetime.php:273
+#: ../../include/js_strings.php:85
+msgctxt "calendar"
 msgid "week"
 msgstr "Woche"
 
-#: ../../include/datetime.php:273
-msgid "weeks"
-msgstr "Wochen"
-
-#: ../../include/datetime.php:274
+#: ../../include/js_strings.php:86
+msgctxt "calendar"
 msgid "day"
 msgstr "Tag"
 
-#: ../../include/datetime.php:274
-msgid "days"
-msgstr "Tage"
+#: ../../include/js_strings.php:87
+msgctxt "calendar"
+msgid "All day"
+msgstr "Ganztägig"
 
-#: ../../include/datetime.php:275
-msgid "hour"
-msgstr "Stunde"
+#: ../../include/Import/import_diaspora.php:17
+msgid "No username found in import file."
+msgstr "Kein Benutzername in der Importdatei gefunden."
 
-#: ../../include/datetime.php:275
-msgid "hours"
-msgstr "Stunden"
+#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:487
+msgid "Import completed."
+msgstr "Import abgeschlossen."
 
-#: ../../include/datetime.php:276
-msgid "minute"
-msgstr "Minute"
+#: ../../include/comanche.php:34 ../../mod/admin.php:351
+msgid "Default"
+msgstr "Standard"
 
-#: ../../include/datetime.php:276
-msgid "minutes"
-msgstr "Minuten"
+#: ../../include/items.php:423 ../../mod/group.php:68 ../../mod/like.php:280
+#: ../../mod/dreport.php:6 ../../mod/dreport.php:45 ../../mod/subthread.php:58
+#: ../../mod/import_items.php:114 ../../mod/profperm.php:23
+#: ../../index.php:364
+msgid "Permission denied"
+msgstr "Keine Berechtigung"
 
-#: ../../include/datetime.php:277
-msgid "second"
-msgstr "Sekunde"
+#: ../../include/items.php:1130 ../../include/items.php:1176
+msgid "(Unknown)"
+msgstr "(Unbekannt)"
 
-#: ../../include/datetime.php:277
-msgid "seconds"
-msgstr "Sekunden"
+#: ../../include/items.php:1373
+msgid "Visible to anybody on the internet."
+msgstr "Für jeden im Internet sichtbar."
+
+#: ../../include/items.php:1375
+msgid "Visible to you only."
+msgstr "Nur für Dich sichtbar."
+
+#: ../../include/items.php:1377
+msgid "Visible to anybody in this network."
+msgstr "Für jedes $Projectname-Mitglied sichtbar."
 
-#: ../../include/datetime.php:285
+#: ../../include/items.php:1379
+msgid "Visible to anybody authenticated."
+msgstr "Für jeden sichtbar, der angemeldet ist."
+
+#: ../../include/items.php:1381
 #, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr "vor %1$d %2$s"
+msgid "Visible to anybody on %s."
+msgstr "Für jeden auf %s sichtbar."
+
+#: ../../include/items.php:1383
+msgid "Visible to all connections."
+msgstr "Für alle Verbindungen sichtbar."
+
+#: ../../include/items.php:1385
+msgid "Visible to approved connections."
+msgstr "Nur für akzeptierte Verbindungen sichtbar."
+
+#: ../../include/items.php:1387
+msgid "Visible to specific connections."
+msgstr "Sichtbar für bestimmte Verbindungen."
+
+#: ../../include/items.php:4319 ../../mod/filestorage.php:27
+#: ../../mod/thing.php:86 ../../mod/admin.php:127 ../../mod/admin.php:1012
+#: ../../mod/admin.php:1217 ../../mod/display.php:36 ../../mod/viewsrc.php:20
+msgid "Item not found."
+msgstr "Element nicht gefunden."
+
+#: ../../include/items.php:4831 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Collection not found."
+msgstr "Sammlung nicht gefunden"
+
+#: ../../include/items.php:4847
+msgid "Collection is empty."
+msgstr "Sammlung ist leer."
 
-#: ../../include/datetime.php:519
+#: ../../include/items.php:4854
 #, php-format
-msgid "%1$s's birthday"
-msgstr "%1$ss Geburtstag"
+msgid "Collection: %s"
+msgstr "Sammlung: %s"
 
-#: ../../include/datetime.php:520
+#: ../../include/items.php:4864 ../../mod/connedit.php:683
 #, php-format
-msgid "Happy Birthday %1$s"
-msgstr "Alles Gute zum Geburtstag, %1$s"
+msgid "Connection: %s"
+msgstr "Verbindung: %s"
+
+#: ../../include/items.php:4866
+msgid "Connection not found."
+msgstr "Die Verbindung wurde nicht gefunden."
+
+#: ../../include/event.php:22 ../../include/bb2diaspora.php:471
+#: ../../include/text.php:1392
+msgid "l F d, Y \\@ g:i A"
+msgstr "l, d. F Y, H:i"
+
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:477
+#: ../../include/text.php:1396
+msgid "Starts:"
+msgstr "Beginnt:"
+
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:485
+#: ../../include/text.php:1400
+msgid "Finishes:"
+msgstr "Endet:"
+
+#: ../../include/event.php:52 ../../include/identity.php:998
+#: ../../include/bb2diaspora.php:493 ../../include/text.php:1407
+#: ../../mod/directory.php:304
+msgid "Location:"
+msgstr "Ort:"
+
+#: ../../include/event.php:768
+msgid "This event has been added to your calendar."
+msgstr "Dieser Termin wurde zu Deinem Kalender hinzugefügt"
+
+#: ../../include/event.php:904 ../../include/conversation.php:123
+#: ../../include/text.php:1919 ../../mod/tagger.php:47 ../../mod/like.php:363
+#: ../../mod/events.php:249
+msgid "event"
+msgstr "Termin"
+
+#: ../../include/event.php:967
+msgid "Not specified"
+msgstr "Keine Angabe"
+
+#: ../../include/event.php:968
+msgid "Needs Action"
+msgstr "Aktion erforderlich"
+
+#: ../../include/event.php:969
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#: ../../include/event.php:970
+msgid "In Process"
+msgstr "In Bearbeitung"
+
+#: ../../include/event.php:971
+msgid "Cancelled"
+msgstr "gestrichen"
+
+#: ../../include/identity.php:32
+msgid "Unable to obtain identity information from database"
+msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
+
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr "Namensfeld leer"
+
+#: ../../include/identity.php:69
+msgid "Name too long"
+msgstr "Name ist zu lang"
+
+#: ../../include/identity.php:181
+msgid "No account identifier"
+msgstr "Keine Account-Kennung"
+
+#: ../../include/identity.php:193
+msgid "Nickname is required."
+msgstr "Spitzname ist erforderlich."
+
+#: ../../include/identity.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Reservierter Kurzname. Bitte wähle einen anderen."
+
+#: ../../include/identity.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
+
+#: ../../include/identity.php:288
+msgid "Unable to retrieve created identity"
+msgstr "Kann die erstellte Identität nicht empfangen"
+
+#: ../../include/identity.php:346
+msgid "Default Profile"
+msgstr "Standard-Profil"
+
+#: ../../include/identity.php:390 ../../include/identity.php:391
+#: ../../include/identity.php:398 ../../include/widgets.php:430
+#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:573
+#: ../../mod/settings.php:338 ../../mod/settings.php:342
+#: ../../mod/settings.php:343 ../../mod/settings.php:346
+#: ../../mod/settings.php:357
+msgid "Friends"
+msgstr "Freunde"
+
+#: ../../include/identity.php:770
+msgid "Requested channel is not available."
+msgstr "Angeforderte Kanal nicht verfügbar."
+
+#: ../../include/identity.php:816 ../../mod/filestorage.php:54
+#: ../../mod/connect.php:13 ../../mod/achievements.php:11
+#: ../../mod/blocks.php:29 ../../mod/hcard.php:8 ../../mod/editwebpage.php:28
+#: ../../mod/profile.php:16 ../../mod/editblock.php:29
+#: ../../mod/editlayout.php:27 ../../mod/webpages.php:29
+#: ../../mod/layouts.php:29
+msgid "Requested profile is not available."
+msgstr "Erwünschte Profil ist nicht verfügbar."
+
+#: ../../include/identity.php:960 ../../mod/profiles.php:782
+msgid "Change profile photo"
+msgstr "Profilfoto ändern"
+
+#: ../../include/identity.php:966
+msgid "Profiles"
+msgstr "Profile"
+
+#: ../../include/identity.php:966
+msgid "Manage/edit profiles"
+msgstr "Profile verwalten/bearbeiten"
+
+#: ../../include/identity.php:967 ../../mod/profiles.php:783
+msgid "Create New Profile"
+msgstr "Neues Profil erstellen"
+
+#: ../../include/identity.php:970 ../../include/nav.php:90
+msgid "Edit Profile"
+msgstr "Profile bearbeiten"
+
+#: ../../include/identity.php:982 ../../mod/profiles.php:794
+msgid "Profile Image"
+msgstr "Profilfoto:"
+
+#: ../../include/identity.php:985
+msgid "visible to everybody"
+msgstr "sichtbar für jeden"
+
+#: ../../include/identity.php:986 ../../mod/profiles.php:677
+#: ../../mod/profiles.php:798
+msgid "Edit visibility"
+msgstr "Sichtbarkeit bearbeiten"
+
+#: ../../include/identity.php:1002 ../../include/identity.php:1242
+msgid "Gender:"
+msgstr "Geschlecht:"
+
+#: ../../include/identity.php:1003 ../../include/identity.php:1286
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../include/identity.php:1004 ../../include/identity.php:1297
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: ../../include/identity.php:1005
+msgid "Online Now"
+msgstr "gerade online"
+
+#: ../../include/identity.php:1089 ../../include/identity.php:1167
+#: ../../mod/ping.php:318
+msgid "g A l F d"
+msgstr "l, d. F, G:i \\U\\h\\r"
+
+#: ../../include/identity.php:1090 ../../include/identity.php:1168
+msgid "F d"
+msgstr "d. F"
+
+#: ../../include/identity.php:1135 ../../include/identity.php:1207
+#: ../../mod/ping.php:341
+msgid "[today]"
+msgstr "[Heute]"
+
+#: ../../include/identity.php:1146
+msgid "Birthday Reminders"
+msgstr "Geburtstags Erinnerungen"
+
+#: ../../include/identity.php:1147
+msgid "Birthdays this week:"
+msgstr "Geburtstage in dieser Woche:"
+
+#: ../../include/identity.php:1200
+msgid "[No description]"
+msgstr "[Keine Beschreibung]"
+
+#: ../../include/identity.php:1218
+msgid "Event Reminders"
+msgstr "Termin-Erinnerungen"
+
+#: ../../include/identity.php:1219
+msgid "Events this week:"
+msgstr "Termine in dieser Woche:"
+
+#: ../../include/identity.php:1232 ../../include/identity.php:1349
+#: ../../include/apps.php:138 ../../mod/profperm.php:112
+msgid "Profile"
+msgstr "Profil"
+
+#: ../../include/identity.php:1240 ../../mod/settings.php:1029
+msgid "Full Name:"
+msgstr "Voller Name:"
+
+#: ../../include/identity.php:1247
+msgid "Like this channel"
+msgstr "Dieser Kanal gefällt mir"
+
+#: ../../include/identity.php:1258 ../../include/taxonomy.php:414
+#: ../../include/conversation.php:1721 ../../include/ItemObject.php:179
+#: ../../mod/photos.php:1083
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Gefällt mir"
+msgstr[1] "Gefällt mir"
+
+#: ../../include/identity.php:1271
+msgid "j F, Y"
+msgstr "j. F Y"
+
+#: ../../include/identity.php:1272
+msgid "j F"
+msgstr "j. F"
+
+#: ../../include/identity.php:1279
+msgid "Birthday:"
+msgstr "Geburtstag:"
+
+#: ../../include/identity.php:1283 ../../mod/directory.php:299
+msgid "Age:"
+msgstr "Alter:"
+
+#: ../../include/identity.php:1292
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "seit %1$d %2$s"
+
+#: ../../include/identity.php:1295 ../../mod/profiles.php:699
+msgid "Sexual Preference:"
+msgstr "Sexuelle Orientierung:"
+
+#: ../../include/identity.php:1299 ../../mod/profiles.php:701
+#: ../../mod/directory.php:315
+msgid "Hometown:"
+msgstr "Heimatstadt:"
+
+#: ../../include/identity.php:1301
+msgid "Tags:"
+msgstr "Schlagworte:"
+
+#: ../../include/identity.php:1303 ../../mod/profiles.php:702
+msgid "Political Views:"
+msgstr "Politische Ansichten:"
+
+#: ../../include/identity.php:1305
+msgid "Religion:"
+msgstr "Religion:"
+
+#: ../../include/identity.php:1307 ../../mod/directory.php:317
+msgid "About:"
+msgstr "Ãœber:"
+
+#: ../../include/identity.php:1309
+msgid "Hobbies/Interests:"
+msgstr "Hobbys/Interessen:"
+
+#: ../../include/identity.php:1311 ../../mod/profiles.php:705
+msgid "Likes:"
+msgstr "Gefällt:"
+
+#: ../../include/identity.php:1313 ../../mod/profiles.php:706
+msgid "Dislikes:"
+msgstr "Gefällt nicht:"
+
+#: ../../include/identity.php:1315
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktinformation und soziale Netzwerke:"
+
+#: ../../include/identity.php:1317
+msgid "My other channels:"
+msgstr "Meine anderen Kanäle:"
+
+#: ../../include/identity.php:1319
+msgid "Musical interests:"
+msgstr "Musikalische Interessen:"
+
+#: ../../include/identity.php:1321
+msgid "Books, literature:"
+msgstr "Bücher, Literatur:"
+
+#: ../../include/identity.php:1323
+msgid "Television:"
+msgstr "Fernsehen:"
+
+#: ../../include/identity.php:1325
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/Tanz/Kultur/Unterhaltung:"
+
+#: ../../include/identity.php:1327
+msgid "Love/Romance:"
+msgstr "Liebe/Romantik:"
+
+#: ../../include/identity.php:1329
+msgid "Work/employment:"
+msgstr "Arbeit/Anstellung:"
+
+#: ../../include/identity.php:1331
+msgid "School/education:"
+msgstr "Schule/Ausbildung:"
+
+#: ../../include/identity.php:1351
+msgid "Like this thing"
+msgstr "Gefällt mir"
+
+#: ../../include/taxonomy.php:240 ../../include/taxonomy.php:261
+msgid "Tags"
+msgstr "Schlagwörter"
+
+#: ../../include/taxonomy.php:282 ../../include/widgets.php:36
+#: ../../include/contact_widgets.php:95
+msgid "Categories"
+msgstr "Kategorien"
+
+#: ../../include/taxonomy.php:305
+msgid "Keywords"
+msgstr "Schlüsselwörter"
+
+#: ../../include/taxonomy.php:326
+msgid "have"
+msgstr "habe"
+
+#: ../../include/taxonomy.php:326
+msgid "has"
+msgstr "hat"
+
+#: ../../include/taxonomy.php:327
+msgid "want"
+msgstr "will"
+
+#: ../../include/taxonomy.php:327
+msgid "wants"
+msgstr "will"
+
+#: ../../include/taxonomy.php:328 ../../include/ItemObject.php:254
+msgid "like"
+msgstr "mag"
+
+#: ../../include/taxonomy.php:328
+msgid "likes"
+msgstr "gefällt"
+
+#: ../../include/taxonomy.php:329 ../../include/ItemObject.php:255
+msgid "dislike"
+msgstr "verurteile"
+
+#: ../../include/taxonomy.php:329
+msgid "dislikes"
+msgstr "missfällt"
+
+#: ../../include/acl_selectors.php:240
+msgid "Visible to your default audience"
+msgstr "Standard-Sichtbarkeit"
+
+#: ../../include/acl_selectors.php:241
+msgid "Show"
+msgstr "Anzeigen"
+
+#: ../../include/acl_selectors.php:242
+msgid "Don't show"
+msgstr "Nicht anzeigen"
+
+#: ../../include/acl_selectors.php:247
+msgid "Other networks and post services"
+msgstr "Andere Netzwerke und Platformen"
+
+#: ../../include/acl_selectors.php:249 ../../mod/filestorage.php:147
+#: ../../mod/thing.php:310 ../../mod/thing.php:356 ../../mod/photos.php:631
+#: ../../mod/photos.php:998 ../../mod/chat.php:211
+msgid "Permissions"
+msgstr "Berechtigungen"
+
+#: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:384
+#: ../../mod/photos.php:1215
+msgid "Close"
+msgstr "Schließen"
+
+#: ../../include/activities.php:42
+msgid " and "
+msgstr "und"
+
+#: ../../include/activities.php:50
+msgid "public profile"
+msgstr "öffentliches Profil"
+
+#: ../../include/activities.php:59
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s hat %2$s auf &ldquo;%3$s&rdquo; geändert"
+
+#: ../../include/activities.php:60
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Besuche %1$s's %2$s"
+
+#: ../../include/activities.php:63
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
+
+#: ../../include/attach.php:246 ../../include/attach.php:332
+msgid "Item was not found."
+msgstr "Beitrag wurde nicht gefunden."
+
+#: ../../include/attach.php:496
+msgid "No source file."
+msgstr "Keine Quelldatei."
+
+#: ../../include/attach.php:514
+msgid "Cannot locate file to replace"
+msgstr "Kann Datei zum Ersetzen nicht finden"
+
+#: ../../include/attach.php:532
+msgid "Cannot locate file to revise/update"
+msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
+
+#: ../../include/attach.php:667
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Datei überschreitet das Größen-Limit von %d"
+
+#: ../../include/attach.php:681
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
+
+#: ../../include/attach.php:837
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
+
+#: ../../include/attach.php:850
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
+
+#: ../../include/attach.php:898 ../../include/attach.php:914
+msgid "Path not available."
+msgstr "Pfad nicht verfügbar."
+
+#: ../../include/attach.php:960 ../../include/attach.php:1112
+msgid "Empty pathname"
+msgstr "Leere Pfadangabe"
+
+#: ../../include/attach.php:986
+msgid "duplicate filename or path"
+msgstr "doppelter Dateiname oder Pfad"
+
+#: ../../include/attach.php:1008
+msgid "Path not found."
+msgstr "Pfad nicht gefunden."
+
+#: ../../include/attach.php:1066
+msgid "mkdir failed."
+msgstr "mkdir fehlgeschlagen."
+
+#: ../../include/attach.php:1070
+msgid "database storage failed."
+msgstr "Speichern in der Datenbank fehlgeschlagen."
+
+#: ../../include/attach.php:1118
+msgid "Empty path"
+msgstr "Leere Pfadangabe"
+
+#: ../../include/bb2diaspora.php:382
+msgid "Attachments:"
+msgstr "Anhänge:"
+
+#: ../../include/bb2diaspora.php:473
+msgid "$Projectname event notification:"
+msgstr "$Projectname-Terminbenachrichtigung:"
+
+#: ../../include/notify.php:20
+msgid "created a new post"
+msgstr "Neuer Beitrag wurde erzeugt"
+
+#: ../../include/notify.php:21
+#, php-format
+msgid "commented on %s's post"
+msgstr "hat %s's Beitrag kommentiert"
+
+#: ../../include/widgets.php:92 ../../include/nav.php:157
+#: ../../mod/apps.php:36
+msgid "Apps"
+msgstr "Apps"
+
+#: ../../include/widgets.php:93
+msgid "System"
+msgstr "System"
+
+#: ../../include/widgets.php:95 ../../include/conversation.php:1526
+msgid "Personal"
+msgstr "Persönlich"
+
+#: ../../include/widgets.php:96
+msgid "Create Personal App"
+msgstr "Persönliche App erstellen"
+
+#: ../../include/widgets.php:97
+msgid "Edit Personal App"
+msgstr "Persönliche App bearbeiten"
+
+#: ../../include/widgets.php:139 ../../mod/suggest.php:54
+msgid "Ignore/Hide"
+msgstr "Ignorieren/Verstecken"
+
+#: ../../include/widgets.php:144 ../../mod/connections.php:125
+msgid "Suggestions"
+msgstr "Vorschläge"
+
+#: ../../include/widgets.php:145
+msgid "See more..."
+msgstr "Mehr anzeigen …"
+
+#: ../../include/widgets.php:166
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."
+
+#: ../../include/widgets.php:172
+msgid "Add New Connection"
+msgstr "Neue Verbindung hinzufügen"
+
+#: ../../include/widgets.php:173
+msgid "Enter the channel address"
+msgstr "Adresse des Kanals eingeben"
+
+#: ../../include/widgets.php:174
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
+
+#: ../../include/widgets.php:190
+msgid "Notes"
+msgstr "Notizen"
+
+#: ../../include/widgets.php:192 ../../include/text.php:868
+#: ../../include/text.php:880 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100
+#: ../../mod/admin.php:1449 ../../mod/admin.php:1469 ../../mod/filer.php:49
+msgid "Save"
+msgstr "Speichern"
+
+#: ../../include/widgets.php:266
+msgid "Remove term"
+msgstr "Eintrag löschen"
+
+#: ../../include/widgets.php:274 ../../include/features.php:72
+msgid "Saved Searches"
+msgstr "Gespeicherte Suchanfragen"
+
+#: ../../include/widgets.php:275 ../../include/group.php:300
+msgid "add"
+msgstr "hinzufügen"
+
+#: ../../include/widgets.php:304 ../../include/features.php:85
+#: ../../include/contact_widgets.php:57
+msgid "Saved Folders"
+msgstr "Gespeicherte Ordner"
+
+#: ../../include/widgets.php:307 ../../include/contact_widgets.php:60
+#: ../../include/contact_widgets.php:98
+msgid "Everything"
+msgstr "Alles"
+
+#: ../../include/widgets.php:349
+msgid "Archives"
+msgstr "Archive"
+
+#: ../../include/widgets.php:428 ../../mod/connedit.php:571
+msgid "Me"
+msgstr "Ich"
+
+#: ../../include/widgets.php:429 ../../mod/connedit.php:572
+msgid "Family"
+msgstr "Familie"
+
+#: ../../include/widgets.php:431 ../../mod/connedit.php:574
+msgid "Acquaintances"
+msgstr "Bekannte"
+
+#: ../../include/widgets.php:432 ../../mod/connedit.php:575
+#: ../../mod/connections.php:88 ../../mod/connections.php:103
+msgid "All"
+msgstr "Alle"
+
+#: ../../include/widgets.php:451
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+#: ../../include/widgets.php:485
+msgid "Account settings"
+msgstr "Konto-Einstellungen"
+
+#: ../../include/widgets.php:491
+msgid "Channel settings"
+msgstr "Kanal-Einstellungen"
+
+#: ../../include/widgets.php:497
+msgid "Additional features"
+msgstr "Zusätzliche Funktionen"
+
+#: ../../include/widgets.php:503
+msgid "Feature/Addon settings"
+msgstr "Plugin-Einstellungen"
+
+#: ../../include/widgets.php:509
+msgid "Display settings"
+msgstr "Anzeige-Einstellungen"
+
+#: ../../include/widgets.php:515
+msgid "Connected apps"
+msgstr "Verbundene Apps"
+
+#: ../../include/widgets.php:521
+msgid "Export channel"
+msgstr "Kanal exportieren"
+
+#: ../../include/widgets.php:530 ../../mod/connedit.php:683
+msgid "Connection Default Permissions"
+msgstr "Standardzugriffsrechte für neue Verbindungen:"
+
+#: ../../include/widgets.php:538
+msgid "Premium Channel Settings"
+msgstr "Premium-Kanal-Einstellungen"
+
+#: ../../include/widgets.php:546 ../../include/features.php:59
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Kanal-Quellen"
+
+#: ../../include/widgets.php:554 ../../include/nav.php:202
+#: ../../include/apps.php:134 ../../mod/admin.php:1071
+#: ../../mod/admin.php:1271
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../../include/widgets.php:568
+msgid "Private Mail Menu"
+msgstr "Private Nachrichten"
+
+#: ../../include/widgets.php:570
+msgid "Combined View"
+msgstr "Kombinierte Anzeige"
+
+#: ../../include/widgets.php:575 ../../include/nav.php:191
+msgid "Inbox"
+msgstr "Eingang"
+
+#: ../../include/widgets.php:580 ../../include/nav.php:192
+msgid "Outbox"
+msgstr "Ausgang"
+
+#: ../../include/widgets.php:585 ../../include/nav.php:193
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: ../../include/widgets.php:604 ../../include/widgets.php:616
+msgid "Conversations"
+msgstr "Konversationen"
+
+#: ../../include/widgets.php:608
+msgid "Received Messages"
+msgstr "Erhaltene Nachrichten"
+
+#: ../../include/widgets.php:612
+msgid "Sent Messages"
+msgstr "Gesendete Nachrichten"
+
+#: ../../include/widgets.php:626
+msgid "No messages."
+msgstr "Keine Nachrichten."
+
+#: ../../include/widgets.php:644
+msgid "Delete conversation"
+msgstr "Unterhaltung löschen"
+
+#: ../../include/widgets.php:670
+msgid "Events Menu"
+msgstr "Kalendermenü"
+
+#: ../../include/widgets.php:671
+msgid "Day View"
+msgstr "Tagesansicht"
+
+#: ../../include/widgets.php:672
+msgid "Week View"
+msgstr "Wochenansicht"
+
+#: ../../include/widgets.php:673
+msgid "Month View"
+msgstr "Monatsansicht"
+
+#: ../../include/widgets.php:674 ../../mod/events.php:654
+msgid "Export"
+msgstr "Exportieren"
+
+#: ../../include/widgets.php:675 ../../mod/events.php:657
+msgid "Import"
+msgstr "Import"
+
+#: ../../include/widgets.php:685
+msgid "Events Tools"
+msgstr "Kalenderwerkzeuge"
+
+#: ../../include/widgets.php:686
+msgid "Export Calendar"
+msgstr "Kalender exportieren"
+
+#: ../../include/widgets.php:687
+msgid "Import Calendar"
+msgstr "Kalender importieren"
+
+#: ../../include/widgets.php:761
+msgid "Chat Rooms"
+msgstr "Chaträume"
+
+#: ../../include/widgets.php:781
+msgid "Bookmarked Chatrooms"
+msgstr "Gespeicherte Chatrooms"
+
+#: ../../include/widgets.php:801
+msgid "Suggested Chatrooms"
+msgstr "Chatraum-Vorschläge"
+
+#: ../../include/widgets.php:928 ../../include/widgets.php:986
+msgid "photo/image"
+msgstr "Foto/Bild"
+
+#: ../../include/widgets.php:1081 ../../include/widgets.php:1083
+msgid "Rate Me"
+msgstr "Bewerte mich"
+
+#: ../../include/widgets.php:1087
+msgid "View Ratings"
+msgstr "Bewertungen ansehen"
+
+#: ../../include/widgets.php:1098
+msgid "Public Hubs"
+msgstr "Öffentliche Hubs"
+
+#: ../../include/widgets.php:1146
+msgid "Forums"
+msgstr "Foren"
+
+#: ../../include/widgets.php:1175
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: ../../include/widgets.php:1184
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: ../../include/widgets.php:1186
+msgid "Project/Site Information"
+msgstr "Informationen über das Projekt und diesen Hub"
+
+#: ../../include/widgets.php:1187
+msgid "For Members"
+msgstr "Für Mitglieder"
+
+#: ../../include/widgets.php:1188
+msgid "For Administrators"
+msgstr "Für Administratoren"
+
+#: ../../include/widgets.php:1189
+msgid "For Developers"
+msgstr "Für Entwickler"
+
+#: ../../include/widgets.php:1214 ../../mod/admin.php:441
+msgid "Site"
+msgstr "Seite"
+
+#: ../../include/widgets.php:1215
+msgid "Accounts"
+msgstr "Konten"
+
+#: ../../include/widgets.php:1216 ../../mod/admin.php:972
+msgid "Channels"
+msgstr "Kanäle"
+
+#: ../../include/widgets.php:1217 ../../mod/admin.php:1069
+#: ../../mod/admin.php:1109
+msgid "Plugins"
+msgstr "Plug-Ins"
+
+#: ../../include/widgets.php:1218 ../../mod/admin.php:1269
+#: ../../mod/admin.php:1303
+msgid "Themes"
+msgstr "Themes"
+
+#: ../../include/widgets.php:1219
+msgid "Inspect queue"
+msgstr "Warteschlange kontrollieren"
+
+#: ../../include/widgets.php:1220
+msgid "Profile Config"
+msgstr "Profilkonfiguration"
+
+#: ../../include/widgets.php:1221
+msgid "DB updates"
+msgstr "DB-Aktualisierungen"
+
+#: ../../include/widgets.php:1239 ../../include/widgets.php:1245
+#: ../../mod/admin.php:1388
+msgid "Logs"
+msgstr "Protokolle"
+
+#: ../../include/widgets.php:1243 ../../include/nav.php:210
+msgid "Admin"
+msgstr "Administration"
+
+#: ../../include/widgets.php:1244
+msgid "Plugin Features"
+msgstr "Plug-In Funktionen"
+
+#: ../../include/widgets.php:1246
+msgid "User registrations waiting for confirmation"
+msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
+
+#: ../../include/widgets.php:1324 ../../mod/photos.php:748
+#: ../../mod/photos.php:1283
+msgid "View Photo"
+msgstr "Foto ansehen"
+
+#: ../../include/widgets.php:1341 ../../mod/photos.php:779
+msgid "Edit Album"
+msgstr "Album bearbeiten"
+
+#: ../../include/bookmarks.php:35
+#, php-format
+msgid "%1$s's bookmarks"
+msgstr "%1$ss Lesezeichen"
 
 #: ../../include/features.php:38
 msgid "General Features"
@@ -554,14 +1647,9 @@ msgstr "Große Fotos"
 
 #: ../../include/features.php:58
 msgid ""
-"Include large (640px) photo thumbnails in posts. If not enabled, use small "
-"(320px) photo thumbnails"
-msgstr "Große Vorschaubilder (640px) in Beiträgen anzeigen. Ist das deaktiviert, werden kleine Vorschaubilder (320px) angezeigt."
-
-#: ../../include/features.php:59 ../../include/widgets.php:545
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr "Kanal-Quellen"
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr "Große Vorschaubilder (1024px) in Beiträgen anzeigen. Falls nicht aktiviert, werden kleine Vorschaubilder (640px) verwendet."
 
 #: ../../include/features.php:59
 msgid "Automatically import channel content from other channels or feeds"
@@ -577,626 +1665,498 @@ msgid ""
 msgstr "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)"
 
 #: ../../include/features.php:61
-msgid "Enable voting tools"
+msgid "Enable Voting Tools"
 msgstr "Umfragewerkzeuge aktivieren"
 
 #: ../../include/features.php:61
 msgid "Provide a class of post which others can vote on"
 msgstr "Aktiviere die Umfragewerkzeuge, um anderen die Möglichkeit zu geben, Deinem Beitrag zuzustimmen, ihn abzulehnen oder sich zu enthalten. (Muss im Beitrag selbst noch aktiviert werden.)"
 
-#: ../../include/features.php:67
+#: ../../include/features.php:62
+msgid "Delayed Posting"
+msgstr "Verzögertes Senden"
+
+#: ../../include/features.php:62
+msgid "Allow posts to be published at a later date"
+msgstr "Ermöglicht es, Beiträge zu einem späteren Zeitpunkt zu veröffentlichen"
+
+#: ../../include/features.php:63
+msgid "Suppress Duplicate Posts/Comments"
+msgstr "Doppelte Beiträge unterdrücken"
+
+#: ../../include/features.php:63
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
+msgstr "Verhindert, dass innerhalb von zwei Minuten Beiträge mit identischem Inhalt veröffentlicht werden."
+
+#: ../../include/features.php:69
 msgid "Network and Stream Filtering"
 msgstr "Netzwerk- und Stream-Filter"
 
-#: ../../include/features.php:68
+#: ../../include/features.php:70
 msgid "Search by Date"
 msgstr "Suche nach Datum"
 
-#: ../../include/features.php:68
+#: ../../include/features.php:70
 msgid "Ability to select posts by date ranges"
 msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"
 
-#: ../../include/features.php:69
+#: ../../include/features.php:71
 msgid "Collections Filter"
 msgstr "Filter für Sammlung"
 
-#: ../../include/features.php:69
+#: ../../include/features.php:71
 msgid "Enable widget to display Network posts only from selected collections"
 msgstr "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen"
 
-#: ../../include/features.php:70 ../../include/widgets.php:273
-msgid "Saved Searches"
-msgstr "Gespeicherte Suchanfragen"
-
-#: ../../include/features.php:70
+#: ../../include/features.php:72
 msgid "Save search terms for re-use"
 msgstr "Suchbegriffe zur Wiederverwendung abspeichern"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:73
 msgid "Network Personal Tab"
 msgstr "Persönlicher Netzwerkreiter"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:73
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:74
 msgid "Network New Tab"
 msgstr "Netzwerkreiter Neu"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:74
 msgid "Enable tab to display all new Network activity"
 msgstr "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:75
 msgid "Affinity Tool"
 msgstr "Beziehungs-Tool"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:75
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filter Aktivitätenstream nach Tiefe der Beziehung"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:76
 msgid "Connection Filtering"
 msgstr "Filter für Sammlungen"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:76
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Filtert eingehende Beiträge anhand von Schlüsselwörtern."
 
-#: ../../include/features.php:75
+#: ../../include/features.php:77
 msgid "Suggest Channels"
 msgstr "Kanäle vorschlagen"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:77
 msgid "Show channel suggestions"
 msgstr "Kanalvorschläge anzeigen"
 
-#: ../../include/features.php:80
+#: ../../include/features.php:82
 msgid "Post/Comment Tools"
 msgstr "Beitrag-/Kommentar-Tools"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:83
 msgid "Tagging"
 msgstr "Verschlagworten"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:83
 msgid "Ability to tag existing posts"
 msgstr "Möglichkeit, um existierende Beiträge zu verschlagworten"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:84
 msgid "Post Categories"
 msgstr "Beitrags-Kategorien"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:84
 msgid "Add categories to your posts"
 msgstr "Kategorien für Beiträge"
 
-#: ../../include/features.php:83 ../../include/contact_widgets.php:57
-#: ../../include/widgets.php:303
-msgid "Saved Folders"
-msgstr "Gespeicherte Ordner"
-
-#: ../../include/features.php:83
+#: ../../include/features.php:85
 msgid "Ability to file posts under folders"
 msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:86
 msgid "Dislike Posts"
 msgstr "Gefällt-mir-nicht Beiträge"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:86
 msgid "Ability to dislike posts/comments"
 msgstr "„Gefällt mir nicht“ ermöglichen"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:87
 msgid "Star Posts"
 msgstr "Beiträge mit Sternchen versehen"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:87
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:88
 msgid "Tag Cloud"
 msgstr "Schlagwort-Wolke"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:88
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen"
 
-#: ../../include/comanche.php:34 ../../mod/admin.php:348
-msgid "Default"
-msgstr "Standard"
-
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
-msgstr "Dieses Element löschen?"
-
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:673
-#: ../../mod/photos.php:1008 ../../mod/photos.php:1126
-msgid "Comment"
-msgstr "Kommentar"
-
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:390
-msgid "[+] show all"
-msgstr "[+] Alle anzeigen"
-
-#: ../../include/js_strings.php:8
-msgid "[-] show less"
-msgstr "[-] Weniger anzeigen"
-
-#: ../../include/js_strings.php:9
-msgid "[+] expand"
-msgstr "[+] aufklappen"
-
-#: ../../include/js_strings.php:10
-msgid "[-] collapse"
-msgstr "[-] einklappen"
-
-#: ../../include/js_strings.php:11
-msgid "Password too short"
-msgstr "Kennwort zu kurz"
-
-#: ../../include/js_strings.php:12
-msgid "Passwords do not match"
-msgstr "Kennwörter stimmen nicht überein"
-
-#: ../../include/js_strings.php:13 ../../mod/photos.php:41
-msgid "everybody"
-msgstr "alle"
-
-#: ../../include/js_strings.php:14
-msgid "Secret Passphrase"
-msgstr "geheime Passphrase"
-
-#: ../../include/js_strings.php:15
-msgid "Passphrase hint"
-msgstr "Hinweis zur Passphrase"
-
-#: ../../include/js_strings.php:16
-msgid "Notice: Permissions have changed but have not yet been submitted."
-msgstr "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert."
-
-#: ../../include/js_strings.php:17
-msgid "close all"
-msgstr "Alle schließen"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
+msgid "Male"
+msgstr "Männlich"
 
-#: ../../include/js_strings.php:18
-msgid "Nothing new here"
-msgstr "Nichts Neues hier"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
+msgid "Female"
+msgstr "Weiblich"
 
-#: ../../include/js_strings.php:19
-msgid "Rate This Channel (this is public)"
-msgstr "Diesen Kanal bewerten (öffentlich sichtbar)"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Momentan männlich"
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:667
-#: ../../mod/rate.php:156
-msgid "Rating"
-msgstr "Bewertung"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Momentan weiblich"
 
-#: ../../include/js_strings.php:21
-msgid "Describe (optional)"
-msgstr "Beschreibung (optional)"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Größtenteils männlich"
 
-#: ../../include/js_strings.php:22 ../../include/ItemObject.php:674
-#: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
-#: ../../mod/connedit.php:688 ../../mod/mood.php:135 ../../mod/pconfig.php:108
-#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:181
-#: ../../mod/chat.php:209 ../../mod/admin.php:411 ../../mod/admin.php:776
-#: ../../mod/admin.php:940 ../../mod/admin.php:1072 ../../mod/admin.php:1266
-#: ../../mod/admin.php:1351 ../../mod/appman.php:99 ../../mod/pdledit.php:58
-#: ../../mod/photos.php:598 ../../mod/photos.php:969 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1127 ../../mod/rate.php:167 ../../mod/events.php:534
-#: ../../mod/events.php:710 ../../mod/mail.php:364 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/import.php:511 ../../mod/thing.php:313
-#: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/settings.php:583
-#: ../../mod/settings.php:695 ../../mod/settings.php:723
-#: ../../mod/settings.php:746 ../../mod/settings.php:831
-#: ../../mod/settings.php:1020 ../../mod/xchan.php:11 ../../mod/group.php:81
-#: ../../mod/connect.php:93 ../../mod/locs.php:108 ../../mod/setup.php:331
-#: ../../mod/setup.php:371 ../../mod/profiles.php:667
-#: ../../mod/import_items.php:122 ../../view/theme/redbasic/php/config.php:99
-msgid "Submit"
-msgstr "Bestätigen"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Größtenteils weiblich"
 
-#: ../../include/js_strings.php:23
-msgid "Please enter a link URL"
-msgstr "Gib eine URL ein:"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transsexuell"
 
-#: ../../include/js_strings.php:24
-msgid "Unsaved changes. Are you sure you wish to leave this page?"
-msgstr "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlassen möchtest?"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Zwischengeschlechtlich"
 
-#: ../../include/js_strings.php:26
-msgid "timeago.prefixAgo"
-msgstr "timeago.prefixAgo"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transsexuell"
 
-#: ../../include/js_strings.php:27
-msgid "timeago.prefixFromNow"
-msgstr " "
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Zwitter"
 
-#: ../../include/js_strings.php:28
-msgid "ago"
-msgstr "her"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Geschlechtslos"
 
-#: ../../include/js_strings.php:29
-msgid "from now"
-msgstr "von jetzt"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "unklar"
 
-#: ../../include/js_strings.php:30
-msgid "less than a minute"
-msgstr "weniger als eine Minute"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+#: ../../include/profile_selectors.php:61
+#: ../../include/profile_selectors.php:97 ../../include/permissions.php:871
+msgid "Other"
+msgstr "Andere"
 
-#: ../../include/js_strings.php:31
-msgid "about a minute"
-msgstr "ungefähr eine Minute"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Unentschieden"
 
-#: ../../include/js_strings.php:32
-#, php-format
-msgid "%d minutes"
-msgstr "%d Minuten"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Males"
+msgstr "Männer"
 
-#: ../../include/js_strings.php:33
-msgid "about an hour"
-msgstr "ungefähr eine Stunde"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Females"
+msgstr "Frauen"
 
-#: ../../include/js_strings.php:34
-#, php-format
-msgid "about %d hours"
-msgstr "ungefähr %d Stunden"
+#: ../../include/profile_selectors.php:42
+msgid "Gay"
+msgstr "Schwul"
 
-#: ../../include/js_strings.php:35
-msgid "a day"
-msgstr "ein Tag"
+#: ../../include/profile_selectors.php:42
+msgid "Lesbian"
+msgstr "Lesbisch"
 
-#: ../../include/js_strings.php:36
-#, php-format
-msgid "%d days"
-msgstr "%d Tage"
+#: ../../include/profile_selectors.php:42
+msgid "No Preference"
+msgstr "Keine Bevorzugung"
 
-#: ../../include/js_strings.php:37
-msgid "about a month"
-msgstr "ungefähr ein Monat"
+#: ../../include/profile_selectors.php:42
+msgid "Bisexual"
+msgstr "Bisexuell"
 
-#: ../../include/js_strings.php:38
-#, php-format
-msgid "%d months"
-msgstr "%d Monate"
+#: ../../include/profile_selectors.php:42
+msgid "Autosexual"
+msgstr "Autosexuell"
 
-#: ../../include/js_strings.php:39
-msgid "about a year"
-msgstr "ungefähr ein Jahr"
+#: ../../include/profile_selectors.php:42
+msgid "Abstinent"
+msgstr "Enthaltsam"
 
-#: ../../include/js_strings.php:40
-#, php-format
-msgid "%d years"
-msgstr "%d Jahre"
+#: ../../include/profile_selectors.php:42
+msgid "Virgin"
+msgstr "Jungfräulich"
 
-#: ../../include/js_strings.php:41
-msgid " "
-msgstr " "
+#: ../../include/profile_selectors.php:42
+msgid "Deviant"
+msgstr "Abweichend"
 
-#: ../../include/js_strings.php:42
-msgid "timeago.numbers"
-msgstr "timeago.numbers"
+#: ../../include/profile_selectors.php:42
+msgid "Fetish"
+msgstr "Fetisch"
 
-#: ../../include/js_strings.php:44 ../../include/text.php:1144
-msgid "January"
-msgstr "Januar"
+#: ../../include/profile_selectors.php:42
+msgid "Oodles"
+msgstr "Unmengen"
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1144
-msgid "February"
-msgstr "Februar"
+#: ../../include/profile_selectors.php:42
+msgid "Nonsexual"
+msgstr "Sexlos"
 
-#: ../../include/js_strings.php:46 ../../include/text.php:1144
-msgid "March"
-msgstr "März"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Single"
+msgstr "Single"
 
-#: ../../include/js_strings.php:47 ../../include/text.php:1144
-msgid "April"
-msgstr "April"
+#: ../../include/profile_selectors.php:80
+msgid "Lonely"
+msgstr "Einsam"
 
-#: ../../include/js_strings.php:48
-msgctxt "long"
-msgid "May"
-msgstr "Mai"
+#: ../../include/profile_selectors.php:80
+msgid "Available"
+msgstr "Verfügbar"
 
-#: ../../include/js_strings.php:49 ../../include/text.php:1144
-msgid "June"
-msgstr "Juni"
+#: ../../include/profile_selectors.php:80
+msgid "Unavailable"
+msgstr "Nicht verfügbar"
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1144
-msgid "July"
-msgstr "Juli"
+#: ../../include/profile_selectors.php:80
+msgid "Has crush"
+msgstr "Verguckt"
 
-#: ../../include/js_strings.php:51 ../../include/text.php:1144
-msgid "August"
-msgstr "August"
+#: ../../include/profile_selectors.php:80
+msgid "Infatuated"
+msgstr "Verknallt"
 
-#: ../../include/js_strings.php:52 ../../include/text.php:1144
-msgid "September"
-msgstr "September"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Dating"
+msgstr "Lerne gerade jemanden kennen"
 
-#: ../../include/js_strings.php:53 ../../include/text.php:1144
-msgid "October"
-msgstr "Oktober"
+#: ../../include/profile_selectors.php:80
+msgid "Unfaithful"
+msgstr "Treulos"
 
-#: ../../include/js_strings.php:54 ../../include/text.php:1144
-msgid "November"
-msgstr "November"
+#: ../../include/profile_selectors.php:80
+msgid "Sex Addict"
+msgstr "Sexabhängig"
 
-#: ../../include/js_strings.php:55 ../../include/text.php:1144
-msgid "December"
-msgstr "Dezember"
+#: ../../include/profile_selectors.php:80
+msgid "Friends/Benefits"
+msgstr "Freunde/Begünstigte"
 
-#: ../../include/js_strings.php:56
-msgid "Jan"
-msgstr "Jan"
+#: ../../include/profile_selectors.php:80
+msgid "Casual"
+msgstr "Lose"
 
-#: ../../include/js_strings.php:57
-msgid "Feb"
-msgstr "Feb"
+#: ../../include/profile_selectors.php:80
+msgid "Engaged"
+msgstr "Verlobt"
 
-#: ../../include/js_strings.php:58
-msgid "Mar"
-msgstr "Mär"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Married"
+msgstr "Verheiratet"
 
-#: ../../include/js_strings.php:59
-msgid "Apr"
-msgstr "Apr"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily married"
+msgstr "Gewissermaßen verheiratet"
 
-#: ../../include/js_strings.php:60
-msgctxt "short"
-msgid "May"
-msgstr "Mai"
+#: ../../include/profile_selectors.php:80
+msgid "Partners"
+msgstr "Partner"
 
-#: ../../include/js_strings.php:61
-msgid "Jun"
-msgstr "Jun"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Cohabiting"
+msgstr "Lebensgemeinschaft"
 
-#: ../../include/js_strings.php:62
-msgid "Jul"
-msgstr "Jul"
+#: ../../include/profile_selectors.php:80
+msgid "Common law"
+msgstr "Informelle Ehe"
 
-#: ../../include/js_strings.php:63
-msgid "Aug"
-msgstr "Aug"
+#: ../../include/profile_selectors.php:80
+msgid "Happy"
+msgstr "Glücklich"
 
-#: ../../include/js_strings.php:64
-msgid "Sep"
-msgstr "Sep"
+#: ../../include/profile_selectors.php:80
+msgid "Not looking"
+msgstr "Nicht Ausschau haltend"
 
-#: ../../include/js_strings.php:65
-msgid "Oct"
-msgstr "Okt"
+#: ../../include/profile_selectors.php:80
+msgid "Swinger"
+msgstr "Swinger"
 
-#: ../../include/js_strings.php:66
-msgid "Nov"
-msgstr "Nov"
+#: ../../include/profile_selectors.php:80
+msgid "Betrayed"
+msgstr "Betrogen"
 
-#: ../../include/js_strings.php:67
-msgid "Dec"
-msgstr "Dez"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Separated"
+msgstr "Getrennt"
 
-#: ../../include/js_strings.php:68 ../../include/text.php:1140
-msgid "Sunday"
-msgstr "Sonntag"
+#: ../../include/profile_selectors.php:80
+msgid "Unstable"
+msgstr "Labil"
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1140
-msgid "Monday"
-msgstr "Montag"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Divorced"
+msgstr "Geschieden"
 
-#: ../../include/js_strings.php:70 ../../include/text.php:1140
-msgid "Tuesday"
-msgstr "Dienstag"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily divorced"
+msgstr "Gewissermaßen geschieden"
 
-#: ../../include/js_strings.php:71 ../../include/text.php:1140
-msgid "Wednesday"
-msgstr "Mittwoch"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Widowed"
+msgstr "Verwitwet"
 
-#: ../../include/js_strings.php:72 ../../include/text.php:1140
-msgid "Thursday"
-msgstr "Donnerstag"
+#: ../../include/profile_selectors.php:80
+msgid "Uncertain"
+msgstr "Ungewiss"
 
-#: ../../include/js_strings.php:73 ../../include/text.php:1140
-msgid "Friday"
-msgstr "Freitag"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "It's complicated"
+msgstr "Es ist kompliziert"
 
-#: ../../include/js_strings.php:74 ../../include/text.php:1140
-msgid "Saturday"
-msgstr "Samstag"
+#: ../../include/profile_selectors.php:80
+msgid "Don't care"
+msgstr "Interessiert mich nicht"
 
-#: ../../include/js_strings.php:75
-msgid "Sun"
-msgstr "So"
+#: ../../include/profile_selectors.php:80
+msgid "Ask me"
+msgstr "Frag mich mal"
 
-#: ../../include/js_strings.php:76
-msgid "Mon"
-msgstr "Mp"
+#: ../../include/datetime.php:48
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
 
-#: ../../include/js_strings.php:77
-msgid "Tue"
-msgstr "Di"
+#: ../../include/datetime.php:132
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "JJJJ-MM-TT oder MM-TT"
 
-#: ../../include/js_strings.php:78
-msgid "Wed"
-msgstr "Mi"
+#: ../../include/datetime.php:236 ../../mod/appman.php:91
+#: ../../mod/appman.php:92 ../../mod/events.php:437 ../../mod/events.php:442
+msgid "Required"
+msgstr "Benötigt"
 
-#: ../../include/js_strings.php:79
-msgid "Thu"
-msgstr "Do"
+#: ../../include/datetime.php:263 ../../boot.php:2284
+msgid "never"
+msgstr "Nie"
 
-#: ../../include/js_strings.php:80
-msgid "Fri"
-msgstr "Fr"
+#: ../../include/datetime.php:269
+msgid "less than a second ago"
+msgstr "Vor weniger als einer Sekunde"
 
-#: ../../include/js_strings.php:81
-msgid "Sat"
-msgstr "Sa"
+#: ../../include/datetime.php:272
+msgid "year"
+msgstr "Jahr"
 
-#: ../../include/js_strings.php:82
-msgctxt "calendar"
-msgid "today"
-msgstr "heute"
+#: ../../include/datetime.php:272
+msgid "years"
+msgstr "Jahre"
 
-#: ../../include/js_strings.php:83
-msgctxt "calendar"
+#: ../../include/datetime.php:273
 msgid "month"
 msgstr "Monat"
 
-#: ../../include/js_strings.php:84
-msgctxt "calendar"
+#: ../../include/datetime.php:273
+msgid "months"
+msgstr "Monate"
+
+#: ../../include/datetime.php:274
 msgid "week"
 msgstr "Woche"
 
-#: ../../include/js_strings.php:85
-msgctxt "calendar"
+#: ../../include/datetime.php:274
+msgid "weeks"
+msgstr "Wochen"
+
+#: ../../include/datetime.php:275
 msgid "day"
 msgstr "Tag"
 
-#: ../../include/js_strings.php:86
-msgctxt "calendar"
-msgid "All day"
-msgstr "Ganztägig"
-
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr "Häufig"
-
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr "Stündlich"
-
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr "Zwei Mal am Tag"
-
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "Täglich"
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Wöchentlich"
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "Monatlich"
-
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/contact_selectors.php:79 ../../mod/id.php:15
-#: ../../mod/id.php:16 ../../mod/admin.php:779 ../../mod/admin.php:788
-#: ../../boot.php:1499
-msgid "Email"
-msgstr "E-Mail"
-
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
-msgstr "Zot!"
+#: ../../include/datetime.php:275
+msgid "days"
+msgstr "Tage"
 
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr "LinkedIn"
+#: ../../include/datetime.php:276
+msgid "hour"
+msgstr "Stunde"
 
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
+#: ../../include/datetime.php:276
+msgid "hours"
+msgstr "Stunden"
 
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
-msgstr "MySpace"
+#: ../../include/datetime.php:277
+msgid "minute"
+msgstr "Minute"
 
-#: ../../include/activities.php:42
-msgid " and "
-msgstr "und"
+#: ../../include/datetime.php:277
+msgid "minutes"
+msgstr "Minuten"
 
-#: ../../include/activities.php:50
-msgid "public profile"
-msgstr "öffentliches Profil"
+#: ../../include/datetime.php:278
+msgid "second"
+msgstr "Sekunde"
 
-#: ../../include/activities.php:59
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s hat %2$s auf &ldquo;%3$s&rdquo; geändert"
+#: ../../include/datetime.php:278
+msgid "seconds"
+msgstr "Sekunden"
 
-#: ../../include/activities.php:60
+#: ../../include/datetime.php:286
 #, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Besuche %1$s's %2$s"
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr "vor %1$d %2$s"
 
-#: ../../include/activities.php:63
+#: ../../include/datetime.php:520
 #, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
-
-#: ../../include/Contact.php:101 ../../include/conversation.php:947
-#: ../../include/identity.php:941 ../../include/widgets.php:136
-#: ../../include/widgets.php:174 ../../mod/directory.php:316
-#: ../../mod/match.php:64 ../../mod/suggest.php:52
-msgid "Connect"
-msgstr "Verbinden"
-
-#: ../../include/Contact.php:118
-msgid "New window"
-msgstr "Neues Fenster"
-
-#: ../../include/Contact.php:119
-msgid "Open the selected location in a different window or browser tab"
-msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"
+msgid "%1$s's birthday"
+msgstr "%1$ss Geburtstag"
 
-#: ../../include/Contact.php:237
+#: ../../include/datetime.php:521
 #, php-format
-msgid "User '%s' deleted"
-msgstr "Benutzer '%s' gelöscht"
+msgid "Happy Birthday %1$s"
+msgstr "Alles Gute zum Geburtstag, %1$s"
 
-#: ../../include/dba/dba_driver.php:141
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"
+#: ../../include/api.php:1301
+msgid "Public Timeline"
+msgstr "Öffentliche Zeitleiste"
 
-#: ../../include/conversation.php:120 ../../include/text.php:1832
-#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
+#: ../../include/conversation.php:120 ../../include/text.php:1916
+#: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
 msgid "photo"
 msgstr "Foto"
 
-#: ../../include/conversation.php:123 ../../include/text.php:1835
-#: ../../include/event.php:896 ../../mod/like.php:363 ../../mod/tagger.php:47
-#: ../../mod/events.php:245
-msgid "event"
-msgstr "Termin"
-
 #: ../../include/conversation.php:126 ../../mod/like.php:113
 msgid "channel"
 msgstr "Kanal"
 
-#: ../../include/conversation.php:148 ../../include/text.php:1838
-#: ../../mod/like.php:361 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
+#: ../../include/conversation.php:148 ../../include/text.php:1922
+#: ../../mod/like.php:361 ../../mod/subthread.php:83
 msgid "status"
 msgstr "Status"
 
-#: ../../include/conversation.php:150 ../../include/text.php:1840
+#: ../../include/conversation.php:150 ../../include/text.php:1924
 #: ../../mod/tagger.php:53
 msgid "comment"
 msgstr "Kommentar"
@@ -1221,7 +2181,7 @@ msgstr "%1$s ist jetzt mit %2$s verbunden"
 msgid "%1$s poked %2$s"
 msgstr "%1$s stupste %2$s an"
 
-#: ../../include/conversation.php:243 ../../include/text.php:933
+#: ../../include/conversation.php:243 ../../include/text.php:954
 msgid "poked"
 msgstr "stupste"
 
@@ -1231,619 +2191,788 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s ist %2$s"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1024
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Likes"
 msgstr "Gefällt mir"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1024
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Gefällt mir nicht"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Agree"
 msgstr "Zustimmungen"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Disagree"
 msgstr "Ablehnungen"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Abstain"
 msgstr "Enthaltungen"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Attending"
 msgstr "Zusagen"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Not attending"
 msgstr "Absagen"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Might attend"
 msgstr "Vielleicht"
 
-#: ../../include/conversation.php:661 ../../include/ItemObject.php:126
+#: ../../include/conversation.php:656 ../../include/ItemObject.php:126
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../../include/conversation.php:669 ../../include/ItemObject.php:89
+#: ../../include/conversation.php:664 ../../include/ItemObject.php:89
 msgid "Private Message"
 msgstr "Private Nachricht"
 
-#: ../../include/conversation.php:676 ../../include/ItemObject.php:227
+#: ../../include/conversation.php:671 ../../include/ItemObject.php:227
 msgid "Message signature validated"
 msgstr "Signatur überprüft"
 
-#: ../../include/conversation.php:677 ../../include/ItemObject.php:228
+#: ../../include/conversation.php:672 ../../include/ItemObject.php:228
 msgid "Message signature incorrect"
 msgstr "Signatur nicht korrekt"
 
-#: ../../include/conversation.php:694
+#: ../../include/conversation.php:691
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "%ss Profil auf %s ansehen"
 
-#: ../../include/conversation.php:709
+#: ../../include/conversation.php:710
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: ../../include/conversation.php:710
+#: ../../include/conversation.php:711
 msgid "Filed under:"
 msgstr "Gespeichert unter:"
 
-#: ../../include/conversation.php:718 ../../include/ItemObject.php:314
+#: ../../include/conversation.php:719 ../../include/ItemObject.php:334
 #, php-format
 msgid "from %s"
 msgstr "via %s"
 
-#: ../../include/conversation.php:721 ../../include/ItemObject.php:317
+#: ../../include/conversation.php:722 ../../include/ItemObject.php:337
 #, php-format
 msgid "last edited: %s"
 msgstr "zuletzt bearbeitet: %s"
 
-#: ../../include/conversation.php:722 ../../include/ItemObject.php:318
+#: ../../include/conversation.php:723 ../../include/ItemObject.php:338
 #, php-format
 msgid "Expires: %s"
 msgstr "Verfällt: %s"
 
-#: ../../include/conversation.php:737
+#: ../../include/conversation.php:738
 msgid "View in context"
 msgstr "Im Zusammenhang anschauen"
 
-#: ../../include/conversation.php:739 ../../include/conversation.php:1212
-#: ../../include/ItemObject.php:366 ../../mod/editpost.php:130
-#: ../../mod/editblock.php:150 ../../mod/photos.php:990 ../../mod/mail.php:237
-#: ../../mod/mail.php:365 ../../mod/editlayout.php:148
-#: ../../mod/editwebpage.php:190
+#: ../../include/conversation.php:740 ../../include/conversation.php:1227
+#: ../../include/ItemObject.php:389 ../../mod/editwebpage.php:190
+#: ../../mod/editblock.php:150 ../../mod/editlayout.php:148
+#: ../../mod/photos.php:1026 ../../mod/editpost.php:129
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: ../../include/conversation.php:848
+#: ../../include/conversation.php:850
 msgid "remove"
 msgstr "lösche"
 
-#: ../../include/conversation.php:852 ../../include/nav.php:241
+#: ../../include/conversation.php:854 ../../include/nav.php:241
 msgid "Loading..."
 msgstr "Lädt ..."
 
-#: ../../include/conversation.php:853
+#: ../../include/conversation.php:855
 msgid "Delete Selected Items"
 msgstr "Lösche die ausgewählten Elemente"
 
-#: ../../include/conversation.php:941
+#: ../../include/conversation.php:946
 msgid "View Source"
 msgstr "Quelle anzeigen"
 
-#: ../../include/conversation.php:942
+#: ../../include/conversation.php:947
 msgid "Follow Thread"
 msgstr "Unterhaltung folgen"
 
-#: ../../include/conversation.php:943
+#: ../../include/conversation.php:948
+msgid "Unfollow Thread"
+msgstr "Unterhaltung nicht mehr folgen"
+
+#: ../../include/conversation.php:949
 msgid "View Status"
 msgstr "Status ansehen"
 
-#: ../../include/conversation.php:944 ../../include/nav.php:86
-#: ../../mod/connedit.php:494
+#: ../../include/conversation.php:950 ../../include/nav.php:86
+#: ../../mod/connedit.php:498
 msgid "View Profile"
 msgstr "Profil ansehen"
 
-#: ../../include/conversation.php:945
+#: ../../include/conversation.php:951
 msgid "View Photos"
 msgstr "Fotos ansehen"
 
-#: ../../include/conversation.php:946
+#: ../../include/conversation.php:952
 msgid "Activity/Posts"
 msgstr "Aktivitäten/Beiträge"
 
-#: ../../include/conversation.php:948
+#: ../../include/conversation.php:954
 msgid "Edit Connection"
 msgstr "Verbindung bearbeiten"
 
-#: ../../include/conversation.php:949
+#: ../../include/conversation.php:955
 msgid "Send PM"
 msgstr "Sende PN"
 
-#: ../../include/conversation.php:950 ../../include/apps.php:145
+#: ../../include/conversation.php:956 ../../include/apps.php:145
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: ../../include/conversation.php:1064
+#: ../../include/conversation.php:1070
 #, php-format
 msgid "%s likes this."
 msgstr "%s gefällt das."
 
-#: ../../include/conversation.php:1064
+#: ../../include/conversation.php:1070
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s gefällt das nicht."
 
-#: ../../include/conversation.php:1068
+#: ../../include/conversation.php:1074
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] "<span  %1$s>%2$d Person</span> gefällt das."
 msgstr[1] "<span  %1$s>%2$d Leuten</span> gefällt das."
 
-#: ../../include/conversation.php:1070
+#: ../../include/conversation.php:1076
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] "<span  %1$s>%2$d Person</span> gefällt das nicht."
 msgstr[1] "<span  %1$s>%2$d Leuten</span> gefällt das nicht."
 
-#: ../../include/conversation.php:1076
+#: ../../include/conversation.php:1082
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:1079
+#: ../../include/conversation.php:1085
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ""
 msgstr[1] ", und %d andere"
 
-#: ../../include/conversation.php:1080
+#: ../../include/conversation.php:1086
 #, php-format
 msgid "%s like this."
 msgstr "%s gefällt das."
 
-#: ../../include/conversation.php:1080
+#: ../../include/conversation.php:1086
 #, php-format
 msgid "%s don't like this."
 msgstr "%s gefällt das nicht."
 
-#: ../../include/conversation.php:1143
+#: ../../include/conversation.php:1154
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Sichtbar für <strong>jeden</strong>"
 
-#: ../../include/conversation.php:1144 ../../mod/mail.php:170
-#: ../../mod/mail.php:299
+#: ../../include/conversation.php:1155 ../../mod/mail.php:202
+#: ../../mod/mail.php:316
 msgid "Please enter a link URL:"
 msgstr "Gib eine URL ein:"
 
-#: ../../include/conversation.php:1145
+#: ../../include/conversation.php:1156
 msgid "Please enter a video link/URL:"
 msgstr "Gib einen Video-Link/URL ein:"
 
-#: ../../include/conversation.php:1146
+#: ../../include/conversation.php:1157
 msgid "Please enter an audio link/URL:"
 msgstr "Gib einen Audio-Link/URL ein:"
 
-#: ../../include/conversation.php:1147
+#: ../../include/conversation.php:1158
 msgid "Tag term:"
 msgstr "Schlagwort:"
 
-#: ../../include/conversation.php:1148 ../../mod/filer.php:48
+#: ../../include/conversation.php:1159 ../../mod/filer.php:48
 msgid "Save to Folder:"
 msgstr "Speichern in Ordner:"
 
-#: ../../include/conversation.php:1149
+#: ../../include/conversation.php:1160
 msgid "Where are you right now?"
 msgstr "Wo bist Du jetzt grade?"
 
-#: ../../include/conversation.php:1150 ../../mod/editpost.php:54
-#: ../../mod/mail.php:171 ../../mod/mail.php:300
+#: ../../include/conversation.php:1161 ../../mod/editpost.php:56
+#: ../../mod/mail.php:203 ../../mod/mail.php:317
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verfällt YYYY-MM-DD HH;MM"
 
-#: ../../include/conversation.php:1158 ../../include/page_widgets.php:40
-#: ../../include/ItemObject.php:683 ../../mod/editpost.php:150
-#: ../../mod/editblock.php:171 ../../mod/photos.php:1010
-#: ../../mod/events.php:707 ../../mod/webpages.php:188
-#: ../../mod/editwebpage.php:212
+#: ../../include/conversation.php:1169 ../../include/page_widgets.php:40
+#: ../../include/ItemObject.php:706 ../../mod/editwebpage.php:212
+#: ../../mod/editblock.php:171 ../../mod/webpages.php:188
+#: ../../mod/photos.php:1046 ../../mod/editpost.php:149
+#: ../../mod/events.php:458
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../include/conversation.php:1177 ../../mod/layouts.php:184
-#: ../../mod/photos.php:989 ../../mod/webpages.php:182
-#: ../../mod/blocks.php:154
+#: ../../include/conversation.php:1192 ../../mod/blocks.php:154
+#: ../../mod/webpages.php:182 ../../mod/layouts.php:184
+#: ../../mod/photos.php:1025
 msgid "Share"
 msgstr "Teilen"
 
-#: ../../include/conversation.php:1179
+#: ../../include/conversation.php:1194
 msgid "Page link name"
 msgstr "Link zur Seite"
 
-#: ../../include/conversation.php:1182
+#: ../../include/conversation.php:1197
 msgid "Post as"
 msgstr "Veröffentlichen als"
 
-#: ../../include/conversation.php:1184 ../../include/ItemObject.php:675
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:136
-#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
+#: ../../include/conversation.php:1199 ../../include/ItemObject.php:698
+#: ../../mod/editwebpage.php:177 ../../mod/editblock.php:136
+#: ../../mod/editlayout.php:135 ../../mod/editpost.php:113
 msgid "Bold"
 msgstr "Fett"
 
-#: ../../include/conversation.php:1185 ../../include/ItemObject.php:676
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:137
-#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
+#: ../../include/conversation.php:1200 ../../include/ItemObject.php:699
+#: ../../mod/editwebpage.php:178 ../../mod/editblock.php:137
+#: ../../mod/editlayout.php:136 ../../mod/editpost.php:114
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../include/conversation.php:1186 ../../include/ItemObject.php:677
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:138
-#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
+#: ../../include/conversation.php:1201 ../../include/ItemObject.php:700
+#: ../../mod/editwebpage.php:179 ../../mod/editblock.php:138
+#: ../../mod/editlayout.php:137 ../../mod/editpost.php:115
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../../include/conversation.php:1187 ../../include/ItemObject.php:678
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:139
-#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
+#: ../../include/conversation.php:1202 ../../include/ItemObject.php:701
+#: ../../mod/editwebpage.php:180 ../../mod/editblock.php:139
+#: ../../mod/editlayout.php:138 ../../mod/editpost.php:116
 msgid "Quote"
 msgstr "Zitat"
 
-#: ../../include/conversation.php:1188 ../../include/ItemObject.php:679
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:140
-#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
+#: ../../include/conversation.php:1203 ../../include/ItemObject.php:702
+#: ../../mod/editwebpage.php:181 ../../mod/editblock.php:140
+#: ../../mod/editlayout.php:139 ../../mod/editpost.php:117
 msgid "Code"
 msgstr "Code"
 
-#: ../../include/conversation.php:1189 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:142 ../../mod/mail.php:234 ../../mod/mail.php:361
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:182
+#: ../../include/conversation.php:1204 ../../mod/editwebpage.php:182
+#: ../../mod/editblock.php:142 ../../mod/editlayout.php:140
+#: ../../mod/editpost.php:118
 msgid "Upload photo"
 msgstr "Foto hochladen"
 
-#: ../../include/conversation.php:1190
+#: ../../include/conversation.php:1205
 msgid "upload photo"
 msgstr "Foto hochladen"
 
-#: ../../include/conversation.php:1191 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:143 ../../mod/mail.php:235 ../../mod/mail.php:362
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183
+#: ../../include/conversation.php:1206 ../../mod/editwebpage.php:183
+#: ../../mod/editblock.php:143 ../../mod/editlayout.php:141
+#: ../../mod/editpost.php:119 ../../mod/mail.php:248 ../../mod/mail.php:378
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: ../../include/conversation.php:1192
+#: ../../include/conversation.php:1207
 msgid "attach file"
 msgstr "Datei anfügen"
 
-#: ../../include/conversation.php:1193 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:144 ../../mod/mail.php:236 ../../mod/mail.php:363
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184
+#: ../../include/conversation.php:1208 ../../mod/editwebpage.php:184
+#: ../../mod/editblock.php:144 ../../mod/editlayout.php:142
+#: ../../mod/editpost.php:120 ../../mod/mail.php:249 ../../mod/mail.php:379
 msgid "Insert web link"
 msgstr "Link einfügen"
 
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1209
 msgid "web link"
 msgstr "Web-Link"
 
-#: ../../include/conversation.php:1195
+#: ../../include/conversation.php:1210
 msgid "Insert video link"
 msgstr "Video-Link einfügen"
 
-#: ../../include/conversation.php:1196
+#: ../../include/conversation.php:1211
 msgid "video link"
 msgstr "Video-Link"
 
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1212
 msgid "Insert audio link"
 msgstr "Audio-Link einfügen"
 
-#: ../../include/conversation.php:1198
+#: ../../include/conversation.php:1213
 msgid "audio link"
 msgstr "Audio-Link"
 
-#: ../../include/conversation.php:1199 ../../mod/editpost.php:125
+#: ../../include/conversation.php:1214 ../../mod/editwebpage.php:188
 #: ../../mod/editblock.php:148 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:188
+#: ../../mod/editpost.php:124
 msgid "Set your location"
 msgstr "Standort"
 
-#: ../../include/conversation.php:1200
+#: ../../include/conversation.php:1215
 msgid "set location"
 msgstr "Standort"
 
-#: ../../include/conversation.php:1201 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1216 ../../mod/editpost.php:126
 msgid "Toggle voting"
 msgstr "Umfragewerkzeug aktivieren"
 
-#: ../../include/conversation.php:1204 ../../mod/editpost.php:126
+#: ../../include/conversation.php:1219 ../../mod/editwebpage.php:189
 #: ../../mod/editblock.php:149 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:189
+#: ../../mod/editpost.php:125
 msgid "Clear browser location"
 msgstr "Browser-Standort löschen"
 
-#: ../../include/conversation.php:1205
+#: ../../include/conversation.php:1220
 msgid "clear location"
 msgstr "Standort löschen"
 
-#: ../../include/conversation.php:1207 ../../mod/editpost.php:142
-#: ../../mod/editblock.php:162 ../../mod/editwebpage.php:205
+#: ../../include/conversation.php:1222 ../../mod/editwebpage.php:205
+#: ../../mod/editblock.php:162 ../../mod/editpost.php:141
 msgid "Title (optional)"
 msgstr "Titel (optional)"
 
-#: ../../include/conversation.php:1211 ../../mod/editpost.php:144
+#: ../../include/conversation.php:1226 ../../mod/editwebpage.php:207
 #: ../../mod/editblock.php:165 ../../mod/editlayout.php:163
-#: ../../mod/editwebpage.php:207
+#: ../../mod/editpost.php:143
 msgid "Categories (optional, comma-separated list)"
 msgstr "Kategorien (optional, kommagetrennte Liste)"
 
-#: ../../include/conversation.php:1213 ../../mod/editpost.php:131
+#: ../../include/conversation.php:1228 ../../mod/editwebpage.php:191
 #: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
-#: ../../mod/editwebpage.php:191
+#: ../../mod/editpost.php:130 ../../mod/events.php:459
 msgid "Permission settings"
 msgstr "Berechtigungs-Einstellungen"
 
-#: ../../include/conversation.php:1214
+#: ../../include/conversation.php:1229
 msgid "permissions"
 msgstr "Berechtigungen"
 
-#: ../../include/conversation.php:1222 ../../mod/editpost.php:139
+#: ../../include/conversation.php:1237 ../../mod/editwebpage.php:200
 #: ../../mod/editblock.php:159 ../../mod/editlayout.php:156
-#: ../../mod/editwebpage.php:200
+#: ../../mod/editpost.php:138
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: ../../include/conversation.php:1224 ../../mod/editpost.php:145
+#: ../../include/conversation.php:1239 ../../mod/editwebpage.php:208
 #: ../../mod/editblock.php:166 ../../mod/editlayout.php:164
-#: ../../mod/editwebpage.php:208
+#: ../../mod/editpost.php:144
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Beispiel: bob@example.com, mary@example.com"
 
-#: ../../include/conversation.php:1237 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:176 ../../mod/mail.php:241 ../../mod/mail.php:368
-#: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217
+#: ../../include/conversation.php:1252 ../../mod/editwebpage.php:217
+#: ../../mod/editblock.php:176 ../../mod/editlayout.php:173
+#: ../../mod/editpost.php:155 ../../mod/mail.php:253 ../../mod/mail.php:383
 msgid "Set expiration date"
 msgstr "Verfallsdatum"
 
-#: ../../include/conversation.php:1239 ../../include/ItemObject.php:686
-#: ../../mod/editpost.php:158 ../../mod/mail.php:243 ../../mod/mail.php:370
+#: ../../include/conversation.php:1255
+msgid "Set publish date"
+msgstr "Veröffentlichungsdatum festlegen"
+
+#: ../../include/conversation.php:1257 ../../include/ItemObject.php:709
+#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385
 msgid "Encrypt text"
 msgstr "Text verschlüsseln"
 
-#: ../../include/conversation.php:1241 ../../mod/editpost.php:160
-#: ../../mod/events.php:691
+#: ../../include/conversation.php:1259 ../../mod/editpost.php:159
 msgid "OK"
 msgstr "Ok"
 
-#: ../../include/conversation.php:1242 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
-#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-#: ../../mod/settings.php:584 ../../mod/settings.php:610
+#: ../../include/conversation.php:1260 ../../mod/fbrowser.php:77
+#: ../../mod/fbrowser.php:112 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
+#: ../../mod/editpost.php:160
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../../include/conversation.php:1485
+#: ../../include/conversation.php:1503
 msgid "Discover"
 msgstr "Entdecken"
 
-#: ../../include/conversation.php:1488
+#: ../../include/conversation.php:1506
 msgid "Imported public streams"
 msgstr "Importierte öffentliche Beiträge"
 
-#: ../../include/conversation.php:1493
+#: ../../include/conversation.php:1511
 msgid "Commented Order"
 msgstr "Neueste Kommentare"
 
-#: ../../include/conversation.php:1496
+#: ../../include/conversation.php:1514
 msgid "Sort by Comment Date"
 msgstr "Nach Kommentardatum sortiert"
 
-#: ../../include/conversation.php:1500
+#: ../../include/conversation.php:1518
 msgid "Posted Order"
 msgstr "Neueste Beiträge"
 
-#: ../../include/conversation.php:1503
+#: ../../include/conversation.php:1521
 msgid "Sort by Post Date"
 msgstr "Nach Beitragsdatum sortiert"
 
-#: ../../include/conversation.php:1508 ../../include/widgets.php:94
-msgid "Personal"
-msgstr "Persönlich"
-
-#: ../../include/conversation.php:1511
+#: ../../include/conversation.php:1529
 msgid "Posts that mention or involve you"
 msgstr "Beiträge mit Beteiligung Deinerseits"
 
-#: ../../include/conversation.php:1517 ../../mod/menu.php:112
-#: ../../mod/connections.php:72 ../../mod/connections.php:82
+#: ../../include/conversation.php:1535 ../../mod/connections.php:72
+#: ../../mod/connections.php:82 ../../mod/menu.php:112
 msgid "New"
 msgstr "Neu"
 
-#: ../../include/conversation.php:1520
+#: ../../include/conversation.php:1538
 msgid "Activity Stream - by date"
 msgstr "Activity Stream – nach Datum sortiert"
 
-#: ../../include/conversation.php:1526
+#: ../../include/conversation.php:1544
 msgid "Starred"
 msgstr "Markiert"
 
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1547
 msgid "Favourite Posts"
 msgstr "Markierte Beiträge"
 
-#: ../../include/conversation.php:1536
+#: ../../include/conversation.php:1554
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../include/conversation.php:1539
+#: ../../include/conversation.php:1557
 msgid "Posts flagged as SPAM"
 msgstr "Nachrichten, die als SPAM markiert wurden"
 
-#: ../../include/conversation.php:1583 ../../mod/admin.php:947
+#: ../../include/conversation.php:1601 ../../mod/admin.php:980
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../../include/conversation.php:1586
+#: ../../include/conversation.php:1604
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../include/conversation.php:1595
+#: ../../include/conversation.php:1613
 msgid "About"
 msgstr "Ãœber"
 
-#: ../../include/conversation.php:1598
+#: ../../include/conversation.php:1616
 msgid "Profile Details"
 msgstr "Profil-Details"
 
-#: ../../include/conversation.php:1604 ../../include/apps.php:139
-#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
+#: ../../include/conversation.php:1622 ../../include/nav.php:92
+#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr "Fotos"
 
-#: ../../include/conversation.php:1607 ../../include/photos.php:422
+#: ../../include/conversation.php:1625 ../../include/photos.php:483
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
-#: ../../include/conversation.php:1614
+#: ../../include/conversation.php:1632
 msgid "Files and Storage"
 msgstr "Dateien und Speicher"
 
-#: ../../include/conversation.php:1624 ../../include/conversation.php:1627
+#: ../../include/conversation.php:1642 ../../include/conversation.php:1645
 msgid "Chatrooms"
 msgstr "Chaträume"
 
-#: ../../include/conversation.php:1637 ../../include/apps.php:129
-#: ../../include/nav.php:103
+#: ../../include/conversation.php:1655 ../../include/nav.php:103
+#: ../../include/apps.php:129
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: ../../include/conversation.php:1640
+#: ../../include/conversation.php:1658
 msgid "Saved Bookmarks"
 msgstr "Gespeicherte Lesezeichen"
 
-#: ../../include/conversation.php:1647 ../../include/apps.php:136
-#: ../../include/nav.php:107 ../../mod/webpages.php:178
+#: ../../include/conversation.php:1665 ../../include/nav.php:107
+#: ../../include/apps.php:136 ../../mod/webpages.php:178
 msgid "Webpages"
 msgstr "Webseiten"
 
-#: ../../include/conversation.php:1650
+#: ../../include/conversation.php:1668
 msgid "Manage Webpages"
 msgstr "Webseiten verwalten"
 
-#: ../../include/conversation.php:1679 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1043
-#: ../../mod/photos.php:1055
+#: ../../include/conversation.php:1697 ../../include/ItemObject.php:175
+#: ../../include/ItemObject.php:187 ../../mod/photos.php:1079
+#: ../../mod/photos.php:1091
 msgid "View all"
 msgstr "Alles anzeigen"
 
-#: ../../include/conversation.php:1703 ../../include/taxonomy.php:403
-#: ../../include/identity.php:1252 ../../include/ItemObject.php:179
-#: ../../mod/photos.php:1047
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Gefällt mir"
-msgstr[1] "Gefällt mir"
-
-#: ../../include/conversation.php:1706 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1052
+#: ../../include/conversation.php:1724 ../../include/ItemObject.php:184
+#: ../../mod/photos.php:1088
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "Gefällt nicht"
 msgstr[1] "Gefällt nicht"
 
-#: ../../include/conversation.php:1709
+#: ../../include/conversation.php:1727
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Zusage"
 msgstr[1] "Zusagen"
 
-#: ../../include/conversation.php:1712
+#: ../../include/conversation.php:1730
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Absage"
 msgstr[1] "Absagen"
 
-#: ../../include/conversation.php:1715
+#: ../../include/conversation.php:1733
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] " Unentschlossen"
 msgstr[1] "Unentschlossene"
 
-#: ../../include/conversation.php:1718
+#: ../../include/conversation.php:1736
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "Zustimmung"
 msgstr[1] "Zustimmungen"
 
-#: ../../include/conversation.php:1721
+#: ../../include/conversation.php:1739
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "Ablehnung"
 msgstr[1] "Ablehnungen"
 
-#: ../../include/conversation.php:1724
+#: ../../include/conversation.php:1742
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "Enthaltung"
 msgstr[1] "Enthaltungen"
 
-#: ../../include/api.php:1290
-msgid "Public Timeline"
-msgstr "Öffentliche Zeitleiste"
+#: ../../include/auth.php:132
+msgid "Logged out."
+msgstr "Ausgeloggt."
+
+#: ../../include/auth.php:273
+msgid "Failed authentication"
+msgstr "Authentifizierung fehlgeschlagen"
+
+#: ../../include/auth.php:287 ../../mod/openid.php:189
+msgid "Login failed."
+msgstr "Login fehlgeschlagen."
+
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr "Häufig"
+
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr "Stündlich"
+
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr "Zwei Mal am Tag"
+
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr "Täglich"
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Wöchentlich"
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "Monatlich"
+
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/contact_selectors.php:79 ../../mod/id.php:15
+#: ../../mod/id.php:16 ../../mod/admin.php:812 ../../mod/admin.php:821
+#: ../../boot.php:1483
+msgid "Email"
+msgstr "E-Mail"
+
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr "Zot!"
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:794
+#: ../../include/bbcode.php:797 ../../include/bbcode.php:802
+#: ../../include/bbcode.php:805 ../../include/bbcode.php:808
+#: ../../include/bbcode.php:811 ../../include/bbcode.php:816
+#: ../../include/bbcode.php:819 ../../include/bbcode.php:824
+#: ../../include/bbcode.php:827 ../../include/bbcode.php:830
+#: ../../include/bbcode.php:833
+msgid "Image/photo"
+msgstr "Bild/Foto"
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:844
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
 
-#: ../../include/photos.php:109
+#: ../../include/bbcode.php:179
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Bild überschreitet das Limit der Webseite von %lu bytes"
+msgid "Install %s element: "
+msgstr "Element %s installieren: "
 
-#: ../../include/photos.php:116
-msgid "Image file is empty."
-msgstr "Bilddatei ist leer."
+#: ../../include/bbcode.php:183
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren."
 
-#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
-msgid "Unable to process image"
-msgstr "Kann Bild nicht verarbeiten"
+#: ../../include/bbcode.php:193 ../../mod/impel.php:37
+msgid "webpage"
+msgstr "Webseite"
 
-#: ../../include/photos.php:219
-msgid "Photo storage failed."
-msgstr "Foto speichern schlug fehl"
+#: ../../include/bbcode.php:196 ../../mod/impel.php:47
+msgid "layout"
+msgstr "Layout"
 
-#: ../../include/photos.php:426
-msgid "Upload New Photos"
-msgstr "Lade neue Fotos hoch"
+#: ../../include/bbcode.php:199 ../../mod/impel.php:42
+msgid "block"
+msgstr "Block"
 
-#: ../../include/enotify.php:57 ../../include/network.php:1613
+#: ../../include/bbcode.php:202 ../../mod/impel.php:54
+msgid "menu"
+msgstr "Menü"
+
+#: ../../include/bbcode.php:257
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schrieb den folgenden %2$s %3$s"
+
+#: ../../include/bbcode.php:259 ../../mod/tagger.php:51
+msgid "post"
+msgstr "Beitrag"
+
+#: ../../include/bbcode.php:547
+msgid "Different viewers will see this text differently"
+msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen"
+
+#: ../../include/bbcode.php:755
+msgid "$1 spoiler"
+msgstr "$1 Spoiler"
+
+#: ../../include/bbcode.php:782
+msgid "$1 wrote:"
+msgstr "$1 schrieb:"
+
+#: ../../include/contact_widgets.php:14
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d Einladung verfügbar"
+msgstr[1] "%d Einladungen verfügbar"
+
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:446
+msgid "Advanced"
+msgstr "Fortgeschritten"
+
+#: ../../include/contact_widgets.php:22
+msgid "Find Channels"
+msgstr "Finde Kanäle"
+
+#: ../../include/contact_widgets.php:23
+msgid "Enter name or interest"
+msgstr "Name oder Interessen eingeben"
+
+#: ../../include/contact_widgets.php:24
+msgid "Connect/Follow"
+msgstr "Verbinden/Folgen"
+
+#: ../../include/contact_widgets.php:25
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Beispiele: Robert Morgenstein, Angeln"
+
+#: ../../include/contact_widgets.php:26 ../../mod/directory.php:381
+#: ../../mod/directory.php:386 ../../mod/connections.php:266
+msgid "Find"
+msgstr "Finde"
+
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:385
+#: ../../mod/suggest.php:60
+msgid "Channel Suggestions"
+msgstr "Kanal-Vorschläge"
+
+#: ../../include/contact_widgets.php:29
+msgid "Random Profile"
+msgstr "Zufallsprofil"
+
+#: ../../include/contact_widgets.php:30
+msgid "Invite Friends"
+msgstr "Lade Freunde ein"
+
+#: ../../include/contact_widgets.php:32
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Fortgeschrittenes Beispiel: name=fred and country=iceland"
+
+#: ../../include/contact_widgets.php:128
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d gemeinsame Verbindung"
+msgstr[1] "%d gemeinsame Verbindungen"
+
+#: ../../include/contact_widgets.php:133
+msgid "show more"
+msgstr "mehr zeigen"
+
+#: ../../include/enotify.php:57 ../../include/network.php:1608
 msgid "$Projectname Notification"
 msgstr "$Projectname-Benachrichtigung"
 
-#: ../../include/enotify.php:58 ../../include/network.php:1614
+#: ../../include/enotify.php:58 ../../include/network.php:1609
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../include/enotify.php:60 ../../include/network.php:1616
+#: ../../include/enotify.php:60 ../../include/network.php:1611
 msgid "Thank You,"
 msgstr "Danke."
 
-#: ../../include/enotify.php:62 ../../include/network.php:1618
+#: ../../include/enotify.php:62 ../../include/network.php:1613
 #, php-format
 msgid "%s Administrator"
 msgstr "der Administrator von %s"
@@ -1855,8 +2984,8 @@ msgstr "%s <!item_type!>"
 
 #: ../../include/enotify.php:100
 #, php-format
-msgid "[Red:Notify] New mail received at %s"
-msgstr "[Red:Benachrichtigung] Neue Mail auf %s empfangen"
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr "[Hubzilla:Benachrichtigung] Neue Mail empfangen auf %s"
 
 #: ../../include/enotify.php:102
 #, php-format
@@ -1877,539 +3006,777 @@ msgstr "eine private Nachricht"
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
 
-#: ../../include/enotify.php:158
+#: ../../include/enotify.php:160
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s, %2$s hat [zrl=%3$s]einen %4$s[/zrl] kommentiert"
 
-#: ../../include/enotify.php:166
+#: ../../include/enotify.php:168
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
 
-#: ../../include/enotify.php:175
+#: ../../include/enotify.php:177
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen %4$s[/zrl] kommentiert"
 
-#: ../../include/enotify.php:186
+#: ../../include/enotify.php:188
 #, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Hubzilla:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
 
-#: ../../include/enotify.php:187
+#: ../../include/enotify.php:189
 #, php-format
 msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr "%1$s, %2$s hat eine Unterhaltung kommentiert, der Du folgst."
 
-#: ../../include/enotify.php:190 ../../include/enotify.php:205
-#: ../../include/enotify.php:231 ../../include/enotify.php:249
-#: ../../include/enotify.php:263
+#: ../../include/enotify.php:192 ../../include/enotify.php:207
+#: ../../include/enotify.php:233 ../../include/enotify.php:251
+#: ../../include/enotify.php:265
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."
 
-#: ../../include/enotify.php:196
+#: ../../include/enotify.php:198
 #, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
-msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand"
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr "[Hubzilla:Benachrichtigung] %s schrieb auf Deine Pinnwand"
 
-#: ../../include/enotify.php:198
+#: ../../include/enotify.php:200
 #, php-format
 msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr "%1$s, %2$s hat auf Deine Pinnwand auf %3$s geschrieben"
 
-#: ../../include/enotify.php:200
+#: ../../include/enotify.php:202
 #, php-format
 msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr "%1$s, %2$s hat auf [zrl=%3$s]Deine Pinnwand[/zrl] geschrieben"
 
-#: ../../include/enotify.php:224
+#: ../../include/enotify.php:226
 #, php-format
-msgid "[Red:Notify] %s tagged you"
-msgstr "[Red:Benachrichtigung] %s hat Dich erwähnt"
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr "[Hubzilla:Benachrichtigung] %s hat Dich erwähnt"
 
-#: ../../include/enotify.php:225
+#: ../../include/enotify.php:227
 #, php-format
 msgid "%1$s, %2$s tagged you at %3$s"
 msgstr "%1$s, %2$s hat Dich auf %3$s erwähnt"
 
-#: ../../include/enotify.php:226
+#: ../../include/enotify.php:228
 #, php-format
 msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%3$s]hat Dich erwähnt[/zrl]."
 
-#: ../../include/enotify.php:238
+#: ../../include/enotify.php:240
 #, php-format
-msgid "[Red:Notify] %1$s poked you"
-msgstr "[Red:Benachrichtigung] %1$s hat Dich angestupst"
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr "[Hubzilla:Benachrichtigung] %1$s hat Dich angestupst"
 
-#: ../../include/enotify.php:239
+#: ../../include/enotify.php:241
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
 msgstr "%1$s, %2$s hat Dich auf %3$s angestupst"
 
-#: ../../include/enotify.php:240
+#: ../../include/enotify.php:242
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%2$s]hat Dich angestupst[/zrl]."
 
-#: ../../include/enotify.php:256
+#: ../../include/enotify.php:258
 #, php-format
-msgid "[Red:Notify] %s tagged your post"
-msgstr "[Red:Benachrichtigung] %s hat Deinen Beitrag verschlagwortet"
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr "[Hubzilla:Benachrichtigung] %s  hat Deinen Beitrag verschlagwortet"
 
-#: ../../include/enotify.php:257
+#: ../../include/enotify.php:259
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr "%1$s, %2$s hat Deinen Beitrag auf %3$s verschlagwortet"
 
-#: ../../include/enotify.php:258
+#: ../../include/enotify.php:260
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen Beitrag[/zrl] verschlagwortet"
 
-#: ../../include/enotify.php:270
-msgid "[Red:Notify] Introduction received"
-msgstr "[Red:Benachrichtigung] Vorstellung erhalten"
+#: ../../include/enotify.php:272
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr "[Hubzilla:Benachrichtigung] Vorstellung erhalten"
 
-#: ../../include/enotify.php:271
+#: ../../include/enotify.php:273
 #, php-format
 msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
 msgstr "%1$s, Du hast eine neue Verbindungsanfrage von '%2$s' auf %3$s erhalten"
 
-#: ../../include/enotify.php:272
+#: ../../include/enotify.php:274
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr "%1$s, Du hast [zrl=%2$s]eine neue Verbindungsanfrage[/zrl] von %3$s erhalten."
 
-#: ../../include/enotify.php:276 ../../include/enotify.php:295
+#: ../../include/enotify.php:278 ../../include/enotify.php:297
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Du kannst Dir das Profil unter %s ansehen"
 
-#: ../../include/enotify.php:278
+#: ../../include/enotify.php:280
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen."
 
-#: ../../include/enotify.php:285
-msgid "[Red:Notify] Friend suggestion received"
-msgstr "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten"
+#: ../../include/enotify.php:287
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr "[Hubzilla:Benachrichtigung] Freundschaftsvorschlag erhalten"
 
-#: ../../include/enotify.php:286
+#: ../../include/enotify.php:288
 #, php-format
 msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr "%1$s, Du hast einen Kontaktvorschlag von „%2$s“ auf %3$s erhalten"
 
-#: ../../include/enotify.php:287
+#: ../../include/enotify.php:289
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
 "%4$s."
 msgstr "%1$s, Du hast [zrl=%2$s]einen Kontaktvorschlag[/zrl] für %3$s von %4$s erhalten."
 
-#: ../../include/enotify.php:293
+#: ../../include/enotify.php:295
 msgid "Name:"
 msgstr "Name:"
 
-#: ../../include/enotify.php:294
+#: ../../include/enotify.php:296
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../include/enotify.php:297
+#: ../../include/enotify.php:299
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
 
-#: ../../include/enotify.php:508
-msgid "[Red:Notify]"
-msgstr "[Red:Benachrichtigung]"
+#: ../../include/enotify.php:514
+msgid "[Hubzilla:Notify]"
+msgstr "[Hubzilla:Benachrichtigung]"
 
-#: ../../include/network.php:635
-msgid "view full size"
-msgstr "In Vollbildansicht anschauen"
+#: ../../include/follow.php:28
+msgid "Channel is blocked on this site."
+msgstr "Der Kanal ist auf dieser Seite blockiert "
 
-#: ../../include/network.php:1660 ../../include/account.php:314
-#: ../../include/account.php:341 ../../include/account.php:401
-msgid "Administrator"
-msgstr "Administrator"
+#: ../../include/follow.php:33
+msgid "Channel location missing."
+msgstr "Adresse des Kanals fehlt."
 
-#: ../../include/network.php:1674
-msgid "No Subject"
-msgstr "Kein Betreff"
+#: ../../include/follow.php:82
+msgid "Response from remote channel was incomplete."
+msgstr "Antwort des entfernten Kanals war unvollständig."
 
-#: ../../include/bookmarks.php:35
+#: ../../include/follow.php:99
+msgid "Channel was deleted and no longer exists."
+msgstr "Kanal wurde gelöscht und existiert nicht mehr."
+
+#: ../../include/follow.php:152 ../../include/follow.php:181
+msgid "Protocol disabled."
+msgstr "Protokoll deaktiviert."
+
+#: ../../include/follow.php:171
+msgid "Channel discovery failed."
+msgstr "Kanalsuche fehlgeschlagen"
+
+#: ../../include/follow.php:197
+msgid "local account not found."
+msgstr "Lokales Konto nicht gefunden."
+
+#: ../../include/follow.php:221
+msgid "Cannot connect to yourself."
+msgstr "Du kannst Dich nicht mit Dir selbst verbinden."
+
+#: ../../include/oembed.php:213
+msgid "Embedded content"
+msgstr "Eingebetteter Inhalt"
+
+#: ../../include/oembed.php:222
+msgid "Embedding disabled"
+msgstr "Einbetten ausgeschaltet"
+
+#: ../../include/message.php:19
+msgid "No recipient provided."
+msgstr "Kein Empfänger angegeben"
+
+#: ../../include/message.php:24
+msgid "[no subject]"
+msgstr "[no subject]"
+
+#: ../../include/message.php:44
+msgid "Unable to determine sender."
+msgstr "Kann Absender nicht bestimmen."
+
+#: ../../include/message.php:219
+msgid "Stored post could not be verified."
+msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
+
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1480
+msgid "Logout"
+msgstr "Abmelden"
+
+#: ../../include/nav.php:82 ../../include/nav.php:114
+msgid "End this session"
+msgstr "Beende diese Sitzung"
+
+#: ../../include/nav.php:85 ../../include/nav.php:145
+msgid "Home"
+msgstr "Home"
+
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
+msgstr "Deine Beiträge und Unterhaltungen"
+
+#: ../../include/nav.php:86
+msgid "Your profile page"
+msgstr "Deine Profilseite"
+
+#: ../../include/nav.php:88
+msgid "Edit Profiles"
+msgstr "Profile bearbeiten"
+
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
+msgstr "Profile verwalten"
+
+#: ../../include/nav.php:90
+msgid "Edit your profile"
+msgstr "Profil bearbeiten"
+
+#: ../../include/nav.php:92
+msgid "Your photos"
+msgstr "Deine Bilder"
+
+#: ../../include/nav.php:93
+msgid "Your files"
+msgstr "Deine Dateien"
+
+#: ../../include/nav.php:97 ../../include/apps.php:146
+msgid "Chat"
+msgstr "Chat"
+
+#: ../../include/nav.php:97
+msgid "Your chatrooms"
+msgstr "Deine Chaträume"
+
+#: ../../include/nav.php:103
+msgid "Your bookmarks"
+msgstr "Deine Lesezeichen"
+
+#: ../../include/nav.php:107
+msgid "Your webpages"
+msgstr "Deine Webseiten"
+
+#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1481
+msgid "Login"
+msgstr "Anmelden"
+
+#: ../../include/nav.php:111
+msgid "Sign in"
+msgstr "Anmelden"
+
+#: ../../include/nav.php:128
 #, php-format
-msgid "%1$s's bookmarks"
-msgstr "%1$ss Lesezeichen"
+msgid "%s - click to logout"
+msgstr "%s - Klick zum Abmelden"
+
+#: ../../include/nav.php:131
+msgid "Remote authentication"
+msgstr "Ãœber Konto auf anderem Server einloggen"
+
+#: ../../include/nav.php:131
+msgid "Click to authenticate to your home hub"
+msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
+
+#: ../../include/nav.php:145
+msgid "Home Page"
+msgstr "Homepage"
+
+#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1463
+msgid "Register"
+msgstr "Registrieren"
+
+#: ../../include/nav.php:149
+msgid "Create an account"
+msgstr "Erzeuge ein Konto"
+
+#: ../../include/nav.php:154 ../../include/apps.php:142
+#: ../../mod/layouts.php:176 ../../mod/help.php:202 ../../mod/help.php:207
+msgid "Help"
+msgstr "Hilfe"
+
+#: ../../include/nav.php:154
+msgid "Help and documentation"
+msgstr "Hilfe und Dokumentation"
+
+#: ../../include/nav.php:157
+msgid "Applications, utilities, links, games"
+msgstr "Anwendungen (Apps), Zubehör, Links, Spiele"
+
+#: ../../include/nav.php:159 ../../include/text.php:867
+#: ../../include/text.php:879 ../../include/apps.php:147
+#: ../../mod/search.php:40
+msgid "Search"
+msgstr "Suche"
+
+#: ../../include/nav.php:159
+msgid "Search site @name, #tag, ?docs, content"
+msgstr "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt"
 
-#: ../../include/text.php:391
+#: ../../include/nav.php:162 ../../include/apps.php:141
+msgid "Directory"
+msgstr "Verzeichnis"
+
+#: ../../include/nav.php:162
+msgid "Channel Directory"
+msgstr "Kanal-Verzeichnis"
+
+#: ../../include/nav.php:174 ../../include/apps.php:133
+msgid "Grid"
+msgstr "Grid"
+
+#: ../../include/nav.php:174
+msgid "Your grid"
+msgstr "Dein Grid"
+
+#: ../../include/nav.php:175
+msgid "Mark all grid notifications seen"
+msgstr "Alle Grid-Benachrichtigungen als angesehen markieren"
+
+#: ../../include/nav.php:177 ../../include/apps.php:137
+msgid "Channel Home"
+msgstr "Mein Kanal"
+
+#: ../../include/nav.php:177
+msgid "Channel home"
+msgstr "Mein Kanal"
+
+#: ../../include/nav.php:178
+msgid "Mark all channel notifications seen"
+msgstr "Markiere alle Kanal-Benachrichtigungen als angesehen"
+
+#: ../../include/nav.php:181 ../../mod/connections.php:260
+msgid "Connections"
+msgstr "Verbindungen"
+
+#: ../../include/nav.php:184
+msgid "Notices"
+msgstr "Benachrichtigungen"
+
+#: ../../include/nav.php:184
+msgid "Notifications"
+msgstr "Benachrichtigungen"
+
+#: ../../include/nav.php:185
+msgid "See all notifications"
+msgstr "Alle Benachrichtigungen ansehen"
+
+#: ../../include/nav.php:186 ../../mod/notifications.php:99
+msgid "Mark all system notifications seen"
+msgstr "Markiere alle System-Benachrichtigungen als gesehen"
+
+#: ../../include/nav.php:188 ../../include/apps.php:143
+msgid "Mail"
+msgstr "Mail"
+
+#: ../../include/nav.php:188
+msgid "Private mail"
+msgstr "Persönliche Mail"
+
+#: ../../include/nav.php:189
+msgid "See all private messages"
+msgstr "Alle persönlichen Nachrichten ansehen"
+
+#: ../../include/nav.php:190
+msgid "Mark all private messages seen"
+msgstr "Markiere alle persönlichen Nachrichten als gesehen"
+
+#: ../../include/nav.php:196 ../../include/apps.php:140
+msgid "Events"
+msgstr "Termine"
+
+#: ../../include/nav.php:196
+msgid "Event Calendar"
+msgstr "Terminkalender"
+
+#: ../../include/nav.php:197
+msgid "See all events"
+msgstr "Alle Termine ansehen"
+
+#: ../../include/nav.php:198
+msgid "Mark all events seen"
+msgstr "Markiere alle Termine als gesehen"
+
+#: ../../include/nav.php:200 ../../include/apps.php:132
+#: ../../mod/manage.php:160
+msgid "Channel Manager"
+msgstr "Kanal-Manager"
+
+#: ../../include/nav.php:200
+msgid "Manage Your Channels"
+msgstr "Verwalte Deine Kanäle"
+
+#: ../../include/nav.php:202
+msgid "Account/Channel Settings"
+msgstr "Konto-/Kanal-Einstellungen"
+
+#: ../../include/nav.php:210
+msgid "Site Setup and Configuration"
+msgstr "Seiten-Einrichtung und -Konfiguration"
+
+#: ../../include/nav.php:246
+msgid "@name, #tag, ?doc, content"
+msgstr "@Name, #Schlagwort, ?Dokumentation, Inhalt"
+
+#: ../../include/nav.php:247
+msgid "Please wait..."
+msgstr "Bitte warten..."
+
+#: ../../include/security.php:381
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
+
+#: ../../include/text.php:394
 msgid "prev"
 msgstr "vorherige"
 
-#: ../../include/text.php:393
+#: ../../include/text.php:396
 msgid "first"
 msgstr "erste"
 
-#: ../../include/text.php:422
+#: ../../include/text.php:425
 msgid "last"
 msgstr "letzte"
 
-#: ../../include/text.php:425
+#: ../../include/text.php:428
 msgid "next"
 msgstr "nächste"
 
-#: ../../include/text.php:435
+#: ../../include/text.php:438
 msgid "older"
 msgstr "älter"
 
-#: ../../include/text.php:437
+#: ../../include/text.php:440
 msgid "newer"
 msgstr "neuer"
 
-#: ../../include/text.php:775
+#: ../../include/text.php:785
 msgid "No connections"
 msgstr "Keine Verbindungen"
 
-#: ../../include/text.php:787
+#: ../../include/text.php:797
 #, php-format
 msgid "%d Connection"
 msgid_plural "%d Connections"
 msgstr[0] "%d Verbindung"
 msgstr[1] "%d Verbindungen"
 
-#: ../../include/text.php:800 ../../mod/viewconnections.php:101
+#: ../../include/text.php:810 ../../mod/viewconnections.php:101
 msgid "View Connections"
 msgstr "Verbindungen anzeigen"
 
-#: ../../include/text.php:857 ../../include/text.php:869
-#: ../../include/apps.php:147 ../../include/nav.php:159
-#: ../../mod/search.php:38
-msgid "Search"
-msgstr "Suche"
-
-#: ../../include/text.php:858 ../../include/text.php:870
-#: ../../include/widgets.php:191 ../../mod/filer.php:49
-#: ../../mod/admin.php:1411 ../../mod/admin.php:1431 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98
-msgid "Save"
-msgstr "Speichern"
-
-#: ../../include/text.php:933
+#: ../../include/text.php:954
 msgid "poke"
 msgstr "anstupsen"
 
-#: ../../include/text.php:934
+#: ../../include/text.php:955
 msgid "ping"
 msgstr "anpingen"
 
-#: ../../include/text.php:934
+#: ../../include/text.php:955
 msgid "pinged"
 msgstr "pingte"
 
-#: ../../include/text.php:935
+#: ../../include/text.php:956
 msgid "prod"
 msgstr "knuffen"
 
-#: ../../include/text.php:935
+#: ../../include/text.php:956
 msgid "prodded"
 msgstr "knuffte"
 
-#: ../../include/text.php:936
+#: ../../include/text.php:957
 msgid "slap"
 msgstr "ohrfeigen"
 
-#: ../../include/text.php:936
+#: ../../include/text.php:957
 msgid "slapped"
 msgstr "ohrfeigte"
 
-#: ../../include/text.php:937
+#: ../../include/text.php:958
 msgid "finger"
 msgstr "befummeln"
 
-#: ../../include/text.php:937
+#: ../../include/text.php:958
 msgid "fingered"
 msgstr "befummelte"
 
-#: ../../include/text.php:938
+#: ../../include/text.php:959
 msgid "rebuff"
 msgstr "eine Abfuhr erteilen"
 
-#: ../../include/text.php:938
+#: ../../include/text.php:959
 msgid "rebuffed"
 msgstr "zurückgewiesen"
 
-#: ../../include/text.php:948
+#: ../../include/text.php:969
 msgid "happy"
 msgstr "glücklich"
 
-#: ../../include/text.php:949
+#: ../../include/text.php:970
 msgid "sad"
 msgstr "traurig"
 
-#: ../../include/text.php:950
+#: ../../include/text.php:971
 msgid "mellow"
 msgstr "sanft"
 
-#: ../../include/text.php:951
+#: ../../include/text.php:972
 msgid "tired"
 msgstr "müde"
 
-#: ../../include/text.php:952
+#: ../../include/text.php:973
 msgid "perky"
 msgstr "frech"
 
-#: ../../include/text.php:953
+#: ../../include/text.php:974
 msgid "angry"
 msgstr "sauer"
 
-#: ../../include/text.php:954
+#: ../../include/text.php:975
 msgid "stupified"
 msgstr "verblüfft"
 
-#: ../../include/text.php:955
+#: ../../include/text.php:976
 msgid "puzzled"
 msgstr "verwirrt"
 
-#: ../../include/text.php:956
+#: ../../include/text.php:977
 msgid "interested"
 msgstr "interessiert"
 
-#: ../../include/text.php:957
+#: ../../include/text.php:978
 msgid "bitter"
 msgstr "verbittert"
 
-#: ../../include/text.php:958
+#: ../../include/text.php:979
 msgid "cheerful"
 msgstr "fröhlich"
 
-#: ../../include/text.php:959
+#: ../../include/text.php:980
 msgid "alive"
 msgstr "lebendig"
 
-#: ../../include/text.php:960
+#: ../../include/text.php:981
 msgid "annoyed"
 msgstr "verärgert"
 
-#: ../../include/text.php:961
+#: ../../include/text.php:982
 msgid "anxious"
 msgstr "unruhig"
 
-#: ../../include/text.php:962
+#: ../../include/text.php:983
 msgid "cranky"
 msgstr "schrullig"
 
-#: ../../include/text.php:963
+#: ../../include/text.php:984
 msgid "disturbed"
 msgstr "verstört"
 
-#: ../../include/text.php:964
+#: ../../include/text.php:985
 msgid "frustrated"
 msgstr "frustriert"
 
-#: ../../include/text.php:965
+#: ../../include/text.php:986
 msgid "depressed"
 msgstr "deprimiert"
 
-#: ../../include/text.php:966
+#: ../../include/text.php:987
 msgid "motivated"
 msgstr "motiviert"
 
-#: ../../include/text.php:967
+#: ../../include/text.php:988
 msgid "relaxed"
 msgstr "entspannt"
 
-#: ../../include/text.php:968
+#: ../../include/text.php:989
 msgid "surprised"
 msgstr "überrascht"
 
-#: ../../include/text.php:1144
+#: ../../include/text.php:1165
 msgid "May"
 msgstr "Mai"
 
-#: ../../include/text.php:1247
-msgid "unknown.???"
-msgstr "unbekannt.???"
+#: ../../include/text.php:1242 ../../include/text.php:1246
+msgid "Unknown Attachment"
+msgstr "Unbekannter Anhang"
 
 #: ../../include/text.php:1248
-msgid "bytes"
-msgstr "Bytes"
+msgid "unknown"
+msgstr "unbekannt"
 
 #: ../../include/text.php:1284
 msgid "remove category"
 msgstr "Kategorie entfernen"
 
-#: ../../include/text.php:1359
+#: ../../include/text.php:1361
 msgid "remove from file"
 msgstr "aus der Datei entfernen"
 
-#: ../../include/text.php:1443 ../../include/text.php:1454
+#: ../../include/text.php:1507 ../../include/text.php:1518
 msgid "Click to open/close"
 msgstr "Klicke zum Öffnen/Schließen"
 
-#: ../../include/text.php:1609 ../../mod/events.php:497
+#: ../../include/text.php:1692 ../../mod/events.php:623
 msgid "Link to Source"
 msgstr "Link zur Quelle"
 
-#: ../../include/text.php:1630 ../../include/text.php:1701
+#: ../../include/text.php:1713 ../../include/text.php:1785
 msgid "default"
 msgstr "Standard"
 
-#: ../../include/text.php:1638
+#: ../../include/text.php:1721
 msgid "Page layout"
 msgstr "Seiten-Layout"
 
-#: ../../include/text.php:1638
+#: ../../include/text.php:1721
 msgid "You can create your own with the layouts tool"
 msgstr "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen"
 
-#: ../../include/text.php:1679
+#: ../../include/text.php:1763
 msgid "Page content type"
 msgstr "Art des Seiteninhalts"
 
-#: ../../include/text.php:1713
+#: ../../include/text.php:1797
 msgid "Select an alternate language"
 msgstr "Wähle eine alternative Sprache"
 
-#: ../../include/text.php:1845
+#: ../../include/text.php:1929
 msgid "activity"
 msgstr "Aktivität"
 
-#: ../../include/text.php:2140
+#: ../../include/text.php:2224
 msgid "Design Tools"
 msgstr "Gestaltungswerkzeuge"
 
-#: ../../include/text.php:2143 ../../mod/blocks.php:147
+#: ../../include/text.php:2227 ../../mod/blocks.php:147
 msgid "Blocks"
 msgstr "Blöcke"
 
-#: ../../include/text.php:2144 ../../mod/menu.php:103
+#: ../../include/text.php:2228 ../../mod/menu.php:103
 msgid "Menus"
 msgstr "Menüs"
 
-#: ../../include/text.php:2145 ../../mod/layouts.php:174
+#: ../../include/text.php:2229 ../../mod/layouts.php:174
 msgid "Layouts"
 msgstr "Layouts"
 
-#: ../../include/text.php:2146
+#: ../../include/text.php:2230
 msgid "Pages"
 msgstr "Seiten"
 
-#: ../../include/acl_selectors.php:239
-msgid "Visible to your default audience"
-msgstr "Standard-Sichtbarkeit"
-
-#: ../../include/acl_selectors.php:240
-msgid "Show"
-msgstr "Anzeigen"
-
-#: ../../include/acl_selectors.php:241
-msgid "Don't show"
-msgstr "Nicht anzeigen"
-
-#: ../../include/acl_selectors.php:247 ../../mod/filestorage.php:147
-#: ../../mod/chat.php:207 ../../mod/photos.php:592 ../../mod/photos.php:962
-#: ../../mod/events.php:708 ../../mod/thing.php:310 ../../mod/thing.php:356
-msgid "Permissions"
-msgstr "Berechtigungen"
-
-#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:361
-#: ../../mod/photos.php:1179
-msgid "Close"
-msgstr "Schließen"
-
-#: ../../include/attach.php:243 ../../include/attach.php:329
-msgid "Item was not found."
-msgstr "Beitrag wurde nicht gefunden."
-
-#: ../../include/attach.php:471
-msgid "No source file."
-msgstr "Keine Quelldatei."
-
-#: ../../include/attach.php:489
-msgid "Cannot locate file to replace"
-msgstr "Kann Datei zum Ersetzen nicht finden"
-
-#: ../../include/attach.php:507
-msgid "Cannot locate file to revise/update"
-msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
+#: ../../include/dir_fns.php:139
+msgid "Directory Options"
+msgstr "Verzeichnisoptionen"
 
-#: ../../include/attach.php:632
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Datei überschreitet das Größen-Limit von %d"
+#: ../../include/dir_fns.php:141
+msgid "Safe Mode"
+msgstr "Sicherer Modus"
 
-#: ../../include/attach.php:645
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:106
+#: ../../mod/admin.php:410 ../../mod/settings.php:577 ../../mod/photos.php:626
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:447
+#: ../../mod/events.php:448 ../../mod/events.php:457 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1485
+msgid "No"
+msgstr "Nein"
 
-#: ../../include/attach.php:793
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/api.php:105 ../../mod/admin.php:412 ../../mod/settings.php:577
+#: ../../mod/photos.php:626 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1485
+msgid "Yes"
+msgstr "Ja"
 
-#: ../../include/attach.php:806
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
+#: ../../include/dir_fns.php:142
+msgid "Public Forums Only"
+msgstr "Nur öffentliche Foren"
 
-#: ../../include/attach.php:854 ../../include/attach.php:870
-msgid "Path not available."
-msgstr "Pfad nicht verfügbar."
+#: ../../include/dir_fns.php:143
+msgid "This Website Only"
+msgstr "Nur dieser Hub"
 
-#: ../../include/attach.php:916 ../../include/attach.php:1069
-msgid "Empty pathname"
-msgstr "Leere Pfadangabe"
+#: ../../include/group.php:26
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "Es hat früher schon einmal eine Sammlung mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Sammlung den Zugriff erlauben. Wenn das nicht Dein Plan war, erstelle bitte eine neue Sammlung mit einem anderen Namen."
 
-#: ../../include/attach.php:942
-msgid "duplicate filename or path"
-msgstr "doppelter Dateiname oder Pfad"
+#: ../../include/group.php:232
+msgid "Add new connections to this collection (privacy group)"
+msgstr "Neue Verbindungen zu dieser Sammlung (Privatsphäre-Gruppe) hinzufügen"
 
-#: ../../include/attach.php:965
-msgid "Path not found."
-msgstr "Pfad nicht gefunden."
+#: ../../include/group.php:251 ../../mod/admin.php:821
+msgid "All Channels"
+msgstr "Alle Kanäle"
 
-#: ../../include/attach.php:1023
-msgid "mkdir failed."
-msgstr "mkdir fehlgeschlagen."
+#: ../../include/group.php:273
+msgid "edit"
+msgstr "Bearbeiten"
 
-#: ../../include/attach.php:1027
-msgid "database storage failed."
-msgstr "Speichern in der Datenbank fehlgeschlagen."
+#: ../../include/group.php:295
+msgid "Collections"
+msgstr "Sammlungen"
 
-#: ../../include/attach.php:1075
-msgid "Empty path"
-msgstr "Leere Pfadangabe"
+#: ../../include/group.php:296
+msgid "Edit collection"
+msgstr "Sammlung bearbeiten"
 
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen."
+#: ../../include/group.php:297
+msgid "Add new collection"
+msgstr "Neue Sammlung hinzufügen"
 
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
-msgstr "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen."
+#: ../../include/group.php:298
+msgid "Channels not in any collection"
+msgstr "Kanäle, die nicht in einer Sammlung sind"
 
-#: ../../include/import.php:80 ../../mod/import.php:138
-msgid "Cloned channel not found. Import failed."
-msgstr "Geklonter Kanal nicht gefunden. Import fehlgeschlagen."
+#: ../../include/zot.php:675
+msgid "Invalid data packet"
+msgstr "Ungültiges Datenpaket"
 
-#: ../../include/notify.php:20
-msgid "created a new post"
-msgstr "Neuer Beitrag wurde erzeugt"
+#: ../../include/zot.php:691
+msgid "Unable to verify channel signature"
+msgstr "Konnte die Signatur des Kanals nicht verifizieren"
 
-#: ../../include/notify.php:21
+#: ../../include/zot.php:2275
 #, php-format
-msgid "commented on %s's post"
-msgstr "hat %s's Beitrag kommentiert"
+msgid "Unable to verify site signature for %s"
+msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
+
+#: ../../include/zot.php:3601
+msgid "invalid target signature"
+msgstr "Ungültige Signatur des Ziels"
 
 #: ../../include/page_widgets.php:6
 msgid "New Page"
 msgstr "Neue Seite"
 
-#: ../../include/page_widgets.php:39 ../../mod/layouts.php:188
-#: ../../mod/webpages.php:187 ../../mod/blocks.php:159
+#: ../../include/page_widgets.php:39 ../../mod/blocks.php:159
+#: ../../mod/webpages.php:187 ../../mod/layouts.php:188
 msgid "View"
 msgstr "Ansicht"
 
@@ -2425,316 +3792,189 @@ msgstr "Seiten-Link"
 msgid "Title"
 msgstr "Titel"
 
-#: ../../include/page_widgets.php:44 ../../mod/layouts.php:181
-#: ../../mod/menu.php:110 ../../mod/webpages.php:192 ../../mod/blocks.php:150
+#: ../../include/page_widgets.php:44 ../../mod/blocks.php:150
+#: ../../mod/webpages.php:192 ../../mod/layouts.php:181 ../../mod/menu.php:110
 msgid "Created"
 msgstr "Erstellt"
 
-#: ../../include/page_widgets.php:45 ../../mod/layouts.php:182
-#: ../../mod/menu.php:111 ../../mod/webpages.php:193 ../../mod/blocks.php:151
+#: ../../include/page_widgets.php:45 ../../mod/blocks.php:151
+#: ../../mod/webpages.php:193 ../../mod/layouts.php:182 ../../mod/menu.php:111
 msgid "Edited"
 msgstr "Geändert"
 
-#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
-#: ../../mod/photos.php:660 ../../mod/profile_photo.php:146
-#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
-msgid "Profile Photos"
-msgstr "Profilfotos"
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
-msgid "Male"
-msgstr "Männlich"
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
-msgid "Female"
-msgstr "Weiblich"
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "Momentan männlich"
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "Momentan weiblich"
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Größtenteils männlich"
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Größtenteils weiblich"
-
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transsexuell"
-
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Zwischengeschlechtlich"
-
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transsexuell"
-
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Zwitter"
-
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Geschlechtslos"
-
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "unklar"
-
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr "Unentschieden"
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
-msgstr "Männer"
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
-msgstr "Frauen"
-
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
-msgstr "Schwul"
-
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
-msgstr "Lesbisch"
-
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
-msgstr "Keine Bevorzugung"
-
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
-msgstr "Bisexuell"
-
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
-msgstr "Autosexuell"
-
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
-msgstr "Enthaltsam"
-
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
-msgstr "Jungfräulich"
-
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
-msgstr "Abweichend"
-
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
-msgstr "Fetisch"
-
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
-msgstr "Unmengen"
-
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
-msgstr "Sexlos"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
-msgstr "Single"
-
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
-msgstr "Einsam"
-
-#: ../../include/profile_selectors.php:80
-msgid "Available"
-msgstr "Verfügbar"
+#: ../../include/network.php:630
+msgid "view full size"
+msgstr "In Vollbildansicht anschauen"
 
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
-msgstr "Nicht verfügbar"
+#: ../../include/network.php:1655 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
+msgid "Administrator"
+msgstr "Administrator"
 
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
-msgstr "Verguckt"
+#: ../../include/network.php:1669
+msgid "No Subject"
+msgstr "Kein Betreff"
 
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
-msgstr "Verknallt"
+#: ../../include/dba/dba_driver.php:141
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
-msgstr "Lerne gerade jemanden kennen"
+#: ../../include/photos.php:112
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Bild überschreitet das Webseitenlimit von %lu Bytes"
 
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
-msgstr "Treulos"
+#: ../../include/photos.php:119
+msgid "Image file is empty."
+msgstr "Bilddatei ist leer."
 
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
-msgstr "Sexabhängig"
+#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
+msgid "Unable to process image"
+msgstr "Kann Bild nicht verarbeiten"
 
-#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
-#: ../../include/identity.php:391 ../../include/identity.php:398
-#: ../../include/widgets.php:429 ../../mod/connedit.php:569
-#: ../../mod/settings.php:337 ../../mod/settings.php:341
-#: ../../mod/settings.php:342 ../../mod/settings.php:345
-#: ../../mod/settings.php:356
-msgid "Friends"
-msgstr "Freunde"
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr "Fotospeicherung fehlgeschlagen."
 
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
-msgstr "Freunde/Begünstigte"
+#: ../../include/photos.php:487
+msgid "Upload New Photos"
+msgstr "Neue Fotos hochladen"
 
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
-msgstr "Lose"
+#: ../../include/ItemObject.php:130
+msgid "Save to Folder"
+msgstr "In Ordner speichern"
 
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
-msgstr "Verlobt"
+#: ../../include/ItemObject.php:151
+msgid "I will attend"
+msgstr "Ich werde teilnehmen"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
-msgstr "Verheiratet"
+#: ../../include/ItemObject.php:151
+msgid "I will not attend"
+msgstr "Ich werde nicht teilnehmen"
 
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
-msgstr "Gewissermaßen verheiratet"
+#: ../../include/ItemObject.php:151
+msgid "I might attend"
+msgstr "Ich werde vielleicht teilnehmen"
 
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
-msgstr "Partner"
+#: ../../include/ItemObject.php:161
+msgid "I agree"
+msgstr "Ich stimme zu"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
-msgstr "Lebensgemeinschaft"
+#: ../../include/ItemObject.php:161
+msgid "I disagree"
+msgstr "Ich lehne ab"
 
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
-msgstr "Informelle Ehe"
+#: ../../include/ItemObject.php:161
+msgid "I abstain"
+msgstr "Ich enthalte mich"
 
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
-msgstr "Glücklich"
+#: ../../include/ItemObject.php:212
+msgid "Add Star"
+msgstr "Stern hinzufügen"
 
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
-msgstr "Nicht Ausschau haltend"
+#: ../../include/ItemObject.php:213
+msgid "Remove Star"
+msgstr "Stern entfernen"
 
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
-msgstr "Swinger"
+#: ../../include/ItemObject.php:214
+msgid "Toggle Star Status"
+msgstr "Markierungsstatus (Stern) umschalten"
 
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
-msgstr "Betrogen"
+#: ../../include/ItemObject.php:218
+msgid "starred"
+msgstr "markiert"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
-msgstr "Getrennt"
+#: ../../include/ItemObject.php:236
+msgid "Add Tag"
+msgstr "Tag hinzufügen"
 
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
-msgstr "Labil"
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
+msgid "I like this (toggle)"
+msgstr "Mir gefällt das (Umschalter)"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
-msgstr "Geschieden"
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
+msgid "I don't like this (toggle)"
+msgstr "Mir gefällt das nicht (Umschalter)"
 
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
-msgstr "Gewissermaßen geschieden"
+#: ../../include/ItemObject.php:259
+msgid "Share This"
+msgstr "Teilen"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
-msgstr "Verwitwet"
+#: ../../include/ItemObject.php:259
+msgid "share"
+msgstr "Teilen"
 
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
-msgstr "Ungewiss"
+#: ../../include/ItemObject.php:268
+msgid "Delivery Report"
+msgstr "Zustellungsbericht"
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
-msgstr "Es ist kompliziert"
+#: ../../include/ItemObject.php:286
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d Kommentar"
+msgstr[1] "%d Kommentare"
 
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
-msgstr "Interessiert mich nicht"
+#: ../../include/ItemObject.php:315 ../../include/ItemObject.php:316
+#, php-format
+msgid "View %s's profile - %s"
+msgstr "Schaue Dir %ss Profil an – %s"
 
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
-msgstr "Frag mich mal"
+#: ../../include/ItemObject.php:319
+msgid "to"
+msgstr "an"
 
-#: ../../include/oembed.php:213
-msgid "Embedded content"
-msgstr "Eingebetteter Inhalt"
+#: ../../include/ItemObject.php:320
+msgid "via"
+msgstr "via"
 
-#: ../../include/oembed.php:222
-msgid "Embedding disabled"
-msgstr "Einbetten ausgeschaltet"
+#: ../../include/ItemObject.php:321
+msgid "Wall-to-Wall"
+msgstr "Wall-to-Wall"
 
-#: ../../include/event.php:22 ../../include/bb2diaspora.php:459
-msgid "l F d, Y \\@ g:i A"
-msgstr "l, d. F Y, H:i"
+#: ../../include/ItemObject.php:322
+msgid "via Wall-To-Wall:"
+msgstr "via Wall-To-Wall:"
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:465
-msgid "Starts:"
-msgstr "Beginnt:"
+#: ../../include/ItemObject.php:362
+msgid "Save Bookmarks"
+msgstr "Favoriten speichern"
 
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:473
-msgid "Finishes:"
-msgstr "Endet:"
+#: ../../include/ItemObject.php:363
+msgid "Add to Calendar"
+msgstr "Zum Kalender hinzufügen"
 
-#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:992 ../../mod/directory.php:302
-#: ../../mod/events.php:701
-msgid "Location:"
-msgstr "Ort:"
+#: ../../include/ItemObject.php:372
+msgid "Mark all seen"
+msgstr "Alle als gelesen markieren"
 
-#: ../../include/event.php:766
-msgid "This event has been added to your calendar."
-msgstr "Dieser Termin wurde zu Deinem Kalender hinzugefügt"
+#: ../../include/ItemObject.php:378 ../../mod/photos.php:1209
+msgctxt "noun"
+msgid "Likes"
+msgstr "Gefällt mir"
 
-#: ../../include/event.php:953
-msgid "Not specified"
-msgstr "Keine Angabe"
+#: ../../include/ItemObject.php:379 ../../mod/photos.php:1210
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "Gefällt nicht"
 
-#: ../../include/event.php:954
-msgid "Needs Action"
-msgstr "Aktion erforderlich"
+#: ../../include/ItemObject.php:694 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
+msgid "This is you"
+msgstr "Das bist Du"
 
-#: ../../include/event.php:955
-msgid "Completed"
-msgstr "Abgeschlossen"
+#: ../../include/ItemObject.php:703
+msgid "Image"
+msgstr "Bild"
 
-#: ../../include/event.php:956
-msgid "In Process"
-msgstr "In Bearbeitung"
+#: ../../include/ItemObject.php:704
+msgid "Insert Link"
+msgstr "Link einfügen"
 
-#: ../../include/event.php:957
-msgid "Cancelled"
-msgstr "gestrichen"
+#: ../../include/ItemObject.php:705
+msgid "Video"
+msgstr "Video"
 
 #: ../../include/apps.php:128
 msgid "Site Admin"
@@ -2744,59 +3984,10 @@ msgstr "Hub-Administration"
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1497
-msgid "Login"
-msgstr "Anmelden"
-
-#: ../../include/apps.php:132 ../../include/nav.php:200
-#: ../../mod/manage.php:160
-msgid "Channel Manager"
-msgstr "Kanal-Manager"
-
-#: ../../include/apps.php:133
-msgid "Matrix"
-msgstr "Matrix"
-
-#: ../../include/apps.php:134 ../../include/widgets.php:553
-#: ../../include/nav.php:202 ../../mod/admin.php:1033 ../../mod/admin.php:1233
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ../../include/apps.php:137 ../../include/nav.php:177
-msgid "Channel Home"
-msgstr "Mein Kanal"
-
-#: ../../include/apps.php:138 ../../include/identity.php:1226
-#: ../../include/identity.php:1343 ../../mod/profperm.php:112
-msgid "Profile"
-msgstr "Profil"
-
-#: ../../include/apps.php:140 ../../include/nav.php:196
-#: ../../mod/events.php:526
-msgid "Events"
-msgstr "Termine"
-
-#: ../../include/apps.php:141 ../../include/nav.php:162
-msgid "Directory"
-msgstr "Verzeichnis"
-
-#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:202
-#: ../../mod/help.php:207 ../../mod/layouts.php:176
-msgid "Help"
-msgstr "Hilfe"
-
-#: ../../include/apps.php:143 ../../include/nav.php:188
-msgid "Mail"
-msgstr "Mail"
-
 #: ../../include/apps.php:144 ../../mod/mood.php:131
 msgid "Mood"
 msgstr "Laune"
 
-#: ../../include/apps.php:146 ../../include/nav.php:97
-msgid "Chat"
-msgstr "Chat"
-
 #: ../../include/apps.php:148
 msgid "Probe"
 msgstr "Testen"
@@ -2830,101 +4021,147 @@ msgstr "Beitrag"
 msgid "Profile Photo"
 msgstr "Profilfoto"
 
-#: ../../include/apps.php:247 ../../mod/settings.php:84
-#: ../../mod/settings.php:609
+#: ../../include/apps.php:252 ../../mod/settings.php:84
+#: ../../mod/settings.php:612
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../../include/apps.php:247
+#: ../../include/apps.php:252
 msgid "Install"
 msgstr "Installieren"
 
-#: ../../include/apps.php:252
+#: ../../include/apps.php:257
 msgid "Purchase"
 msgstr "Kaufen"
 
-#: ../../include/auth.php:131
-msgid "Logged out."
-msgstr "Ausgeloggt."
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
+msgstr "Kann meine normalen Beiträge sehen"
 
-#: ../../include/auth.php:272
-msgid "Failed authentication"
-msgstr "Authentifizierung fehlgeschlagen"
+#: ../../include/permissions.php:27
+msgid "Can view my default channel profile"
+msgstr "Kann mein Standardprofil sehen"
 
-#: ../../include/auth.php:286 ../../mod/openid.php:189
-msgid "Login failed."
-msgstr "Login fehlgeschlagen."
+#: ../../include/permissions.php:28
+msgid "Can view my connections"
+msgstr "Kann meine Verbindungen sehen"
 
-#: ../../include/bb2diaspora.php:373
-msgid "Attachments:"
-msgstr "Anhänge:"
+#: ../../include/permissions.php:29
+msgid "Can view my file storage and photos"
+msgstr "Kann meine Datei- und Bilderordner sehen"
 
-#: ../../include/bb2diaspora.php:461
-msgid "$Projectname event notification:"
-msgstr "$Projectname-Terminbenachrichtigung:"
+#: ../../include/permissions.php:30
+msgid "Can view my webpages"
+msgstr "Kann meine Webseiten sehen"
 
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:793
-#: ../../include/bbcode.php:796 ../../include/bbcode.php:801
-#: ../../include/bbcode.php:804 ../../include/bbcode.php:807
-#: ../../include/bbcode.php:810 ../../include/bbcode.php:815
-#: ../../include/bbcode.php:818 ../../include/bbcode.php:823
-#: ../../include/bbcode.php:826 ../../include/bbcode.php:829
-#: ../../include/bbcode.php:832
-msgid "Image/photo"
-msgstr "Bild/Foto"
+#: ../../include/permissions.php:33
+msgid "Can send me their channel stream and posts"
+msgstr "Kann mir die Beiträge aus seinem/ihrem Kanal schicken"
 
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:843
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
+#: ../../include/permissions.php:34
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
 
-#: ../../include/bbcode.php:179
-#, php-format
-msgid "Install %s element: "
-msgstr "Element %s installieren: "
+#: ../../include/permissions.php:35
+msgid "Can comment on or like my posts"
+msgstr "Darf meine Beiträge kommentieren und mögen/nicht mögen"
 
-#: ../../include/bbcode.php:183
-#, php-format
+#: ../../include/permissions.php:36
+msgid "Can send me private mail messages"
+msgstr "Kann mir private Nachrichten schicken"
+
+#: ../../include/permissions.php:37
+msgid "Can like/dislike stuff"
+msgstr "Kann andere Elemente mögen/nicht mögen"
+
+#: ../../include/permissions.php:37
+msgid "Profiles and things other than posts/comments"
+msgstr "Profile und alles außer Beiträge und Kommentare"
+
+#: ../../include/permissions.php:39
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
+
+#: ../../include/permissions.php:39
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
+
+#: ../../include/permissions.php:40
+msgid "Can chat with me (when available)"
+msgstr "Kann mit mir chatten (wenn verfügbar)"
+
+#: ../../include/permissions.php:41
+msgid "Can write to my file storage and photos"
+msgstr "Kann in meine Datei- und Bilderordner schreiben"
+
+#: ../../include/permissions.php:42
+msgid "Can edit my webpages"
+msgstr "Kann meine Webseiten bearbeiten"
+
+#: ../../include/permissions.php:44
+msgid "Can source my public posts in derived channels"
+msgstr "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden"
+
+#: ../../include/permissions.php:44
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften"
+
+#: ../../include/permissions.php:46
+msgid "Can administer my channel resources"
+msgstr "Kann meine Kanäle administrieren"
+
+#: ../../include/permissions.php:46
 msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren."
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust"
 
-#: ../../include/bbcode.php:193 ../../mod/impel.php:37
-msgid "webpage"
-msgstr "Webseite"
+#: ../../include/permissions.php:867
+msgid "Social Networking"
+msgstr "Soziales Netzwerk"
 
-#: ../../include/bbcode.php:196 ../../mod/impel.php:47
-msgid "layout"
-msgstr "Layout"
+#: ../../include/permissions.php:867 ../../include/permissions.php:868
+#: ../../include/permissions.php:869
+msgid "Mostly Public"
+msgstr "Weitgehend öffentlich"
 
-#: ../../include/bbcode.php:199 ../../mod/impel.php:42
-msgid "block"
-msgstr "Block"
+#: ../../include/permissions.php:867 ../../include/permissions.php:868
+#: ../../include/permissions.php:869
+msgid "Restricted"
+msgstr "Beschränkt"
 
-#: ../../include/bbcode.php:202 ../../mod/impel.php:54
-msgid "menu"
-msgstr "Menü"
+#: ../../include/permissions.php:867 ../../include/permissions.php:868
+msgid "Private"
+msgstr "Privat"
 
-#: ../../include/bbcode.php:257
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schrieb den folgenden %2$s %3$s"
+#: ../../include/permissions.php:868
+msgid "Community Forum"
+msgstr "Forum"
 
-#: ../../include/bbcode.php:259 ../../mod/tagger.php:51
-msgid "post"
-msgstr "Beitrag"
+#: ../../include/permissions.php:869
+msgid "Feed Republish"
+msgstr "Teilen von Feeds"
 
-#: ../../include/bbcode.php:547
-msgid "Different viewers will see this text differently"
-msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen"
+#: ../../include/permissions.php:870
+msgid "Special Purpose"
+msgstr "Für besondere Zwecke"
 
-#: ../../include/bbcode.php:754
-msgid "$1 spoiler"
-msgstr "$1 Spoiler"
+#: ../../include/permissions.php:870
+msgid "Celebrity/Soapbox"
+msgstr "Mitteilungs-Kanal (keine Kommentare)"
 
-#: ../../include/bbcode.php:781
-msgid "$1 wrote:"
-msgstr "$1 schrieb:"
+#: ../../include/permissions.php:870
+msgid "Group Repository"
+msgstr "Gruppenarchiv"
+
+#: ../../include/permissions.php:871
+msgid "Custom/Expert Mode"
+msgstr "Benutzerdefiniert/Expertenmodus"
+
+#: ../../include/photo/photo_driver.php:719 ../../mod/profile_photo.php:147
+#: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:379
+#: ../../mod/photos.php:94 ../../mod/photos.php:699
+msgid "Profile Photos"
+msgstr "Profilfotos"
 
 #: ../../include/account.php:27
 msgid "Not a valid email address"
@@ -2954,1315 +4191,1034 @@ msgstr "Bitte gib die benötigten Informationen ein."
 msgid "Failed to store account information."
 msgstr "Speichern der Account-Informationen fehlgeschlagen"
 
-#: ../../include/account.php:246
+#: ../../include/account.php:248
 #, php-format
 msgid "Registration confirmation for %s"
 msgstr "Registrierungsbestätigung für %s"
 
-#: ../../include/account.php:312
+#: ../../include/account.php:314
 #, php-format
 msgid "Registration request at %s"
 msgstr "Registrierungsanfrage auf %s"
 
-#: ../../include/account.php:336
+#: ../../include/account.php:338
 msgid "your registration password"
 msgstr "Dein Registrierungspasswort"
 
-#: ../../include/account.php:339 ../../include/account.php:399
+#: ../../include/account.php:341 ../../include/account.php:401
 #, php-format
 msgid "Registration details for %s"
 msgstr "Registrierungsdetails für %s"
 
-#: ../../include/account.php:408
+#: ../../include/account.php:410
 msgid "Account approved."
 msgstr "Account bestätigt."
 
-#: ../../include/account.php:447
+#: ../../include/account.php:449
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registrierung für %s widerrufen"
 
-#: ../../include/account.php:492
+#: ../../include/account.php:494
 msgid "Account verified. Please login."
 msgstr "Konto geprüft. Bitte melde Dich an!"
 
-#: ../../include/account.php:705 ../../include/account.php:707
+#: ../../include/account.php:707 ../../include/account.php:709
 msgid "Click here to upgrade."
 msgstr "Klicke hier, um das Upgrade durchzuführen."
 
-#: ../../include/account.php:713
+#: ../../include/account.php:715
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
 
-#: ../../include/account.php:718
+#: ../../include/account.php:720
 msgid "This action is not available under your subscription plan."
 msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
 
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
-msgstr "Der Kanal ist auf dieser Seite blockiert "
-
-#: ../../include/follow.php:33
-msgid "Channel location missing."
-msgstr "Adresse des Kanals fehlt."
-
-#: ../../include/follow.php:82
-msgid "Response from remote channel was incomplete."
-msgstr "Antwort des entfernten Kanals war unvollständig."
-
-#: ../../include/follow.php:99
-msgid "Channel was deleted and no longer exists."
-msgstr "Kanal wurde gelöscht und existiert nicht mehr."
-
-#: ../../include/follow.php:154
-msgid "Protocol disabled."
-msgstr "Protokoll deaktiviert."
-
-#: ../../include/follow.php:170
-msgid "Channel discovery failed."
-msgstr "Kanalsuche fehlgeschlagen"
-
-#: ../../include/follow.php:186
-msgid "local account not found."
-msgstr "Lokales Konto nicht gefunden."
-
-#: ../../include/follow.php:210
-msgid "Cannot connect to yourself."
-msgstr "Du kannst Dich nicht mit Dir selbst verbinden."
-
-#: ../../include/security.php:345
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
-
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d Einladung verfügbar"
-msgstr[1] "%d Einladungen verfügbar"
-
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:415
-msgid "Advanced"
-msgstr "Fortgeschritten"
-
-#: ../../include/contact_widgets.php:22
-msgid "Find Channels"
-msgstr "Finde Kanäle"
-
-#: ../../include/contact_widgets.php:23
-msgid "Enter name or interest"
-msgstr "Name oder Interessen eingeben"
-
-#: ../../include/contact_widgets.php:24
-msgid "Connect/Follow"
-msgstr "Verbinden/Folgen"
-
-#: ../../include/contact_widgets.php:25
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Beispiele: Robert Morgenstein, Angeln"
-
-#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379
-#: ../../mod/directory.php:384 ../../mod/connections.php:266
-msgid "Find"
-msgstr "Finde"
-
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383
-#: ../../mod/suggest.php:60
-msgid "Channel Suggestions"
-msgstr "Kanal-Vorschläge"
-
-#: ../../include/contact_widgets.php:29
-msgid "Random Profile"
-msgstr "Zufallsprofil"
-
-#: ../../include/contact_widgets.php:30
-msgid "Invite Friends"
-msgstr "Lade Freunde ein"
+#: ../../mod/filestorage.php:82
+msgid "Permission Denied."
+msgstr "Zugriff verweigert."
 
-#: ../../include/contact_widgets.php:32
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Fortgeschrittenes Beispiel: name=fred and country=iceland"
+#: ../../mod/filestorage.php:98
+msgid "File not found."
+msgstr "Datei nicht gefunden."
 
-#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:98
-#: ../../include/widgets.php:306
-msgid "Everything"
-msgstr "Alles"
+#: ../../mod/filestorage.php:141
+msgid "Edit file permissions"
+msgstr "Dateiberechtigungen bearbeiten"
 
-#: ../../include/contact_widgets.php:95 ../../include/taxonomy.php:271
-#: ../../include/widgets.php:35
-msgid "Categories"
-msgstr "Kategorien"
+#: ../../mod/filestorage.php:150
+msgid "Set/edit permissions"
+msgstr "Berechtigungen setzen/ändern"
 
-#: ../../include/contact_widgets.php:128
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d gemeinsame Verbindung"
-msgstr[1] "%d gemeinsame Verbindungen"
+#: ../../mod/filestorage.php:151
+msgid "Include all files and sub folders"
+msgstr "Alle Dateien und Unterverzeichnisse einbinden"
 
-#: ../../include/contact_widgets.php:133
-msgid "show more"
-msgstr "mehr zeigen"
+#: ../../mod/filestorage.php:152
+msgid "Return to file list"
+msgstr "Zurück zur Dateiliste"
 
-#: ../../include/group.php:26
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr "Es hat früher schon einmal eine Sammlung mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Sammlung den Zugriff erlauben. Wenn das nicht Dein Plan war, erstelle bitte eine neue Sammlung mit einem anderen Namen."
+#: ../../mod/filestorage.php:154
+msgid "Copy/paste this code to attach file to a post"
+msgstr "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen"
 
-#: ../../include/group.php:232
-msgid "Add new connections to this collection (privacy group)"
-msgstr "Neue Verbindungen zu dieser Sammlung (Privatsphäre-Gruppe) hinzufügen"
+#: ../../mod/filestorage.php:155
+msgid "Copy/paste this URL to link file from a web page"
+msgstr "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken"
 
-#: ../../include/group.php:251 ../../mod/admin.php:788
-msgid "All Channels"
-msgstr "Alle Kanäle"
+#: ../../mod/filestorage.php:157
+msgid "Share this file"
+msgstr "Diese Datei freigeben"
 
-#: ../../include/group.php:273
-msgid "edit"
-msgstr "Bearbeiten"
+#: ../../mod/filestorage.php:158
+msgid "Show URL to this file"
+msgstr "URL zu dieser Datei anzeigen"
 
-#: ../../include/group.php:295
-msgid "Collections"
-msgstr "Sammlungen"
+#: ../../mod/filestorage.php:159
+msgid "Notify your contacts about this file"
+msgstr "Meine Kontakte über diese Datei benachrichtigen"
 
-#: ../../include/group.php:296
-msgid "Edit collection"
-msgstr "Sammlung bearbeiten"
+#: ../../mod/group.php:20
+msgid "Collection created."
+msgstr "Sammlung erstellt."
 
-#: ../../include/group.php:297
-msgid "Add new collection"
-msgstr "Neue Sammlung hinzufügen"
+#: ../../mod/group.php:26
+msgid "Could not create collection."
+msgstr "Sammlung kann nicht erstellt werden."
 
-#: ../../include/group.php:298
-msgid "Channels not in any collection"
-msgstr "Kanäle, die nicht in einer Sammlung sind"
+#: ../../mod/group.php:54
+msgid "Collection updated."
+msgstr "Sammlung aktualisiert."
 
-#: ../../include/group.php:300 ../../include/widgets.php:274
-msgid "add"
-msgstr "hinzufügen"
+#: ../../mod/group.php:86
+msgid "Create a collection of channels."
+msgstr "Erstelle eine Sammlung von Kanälen."
 
-#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
-msgid "Tags"
-msgstr "Schlagwörter"
+#: ../../mod/group.php:87 ../../mod/group.php:180
+msgid "Collection Name: "
+msgstr "Name der Sammlung:"
 
-#: ../../include/taxonomy.php:294
-msgid "Keywords"
-msgstr "Schlüsselwörter"
+#: ../../mod/group.php:89 ../../mod/group.php:183
+msgid "Members are visible to other channels"
+msgstr "Mitglieder sind sichtbar für andere Kanäle"
 
-#: ../../include/taxonomy.php:315
-msgid "have"
-msgstr "habe"
+#: ../../mod/group.php:107
+msgid "Collection removed."
+msgstr "Sammlung gelöscht."
 
-#: ../../include/taxonomy.php:315
-msgid "has"
-msgstr "hat"
+#: ../../mod/group.php:109
+msgid "Unable to remove collection."
+msgstr "Löschen der Sammlung nicht möglich."
 
-#: ../../include/taxonomy.php:316
-msgid "want"
-msgstr "will"
+#: ../../mod/group.php:179
+msgid "Collection Editor"
+msgstr "Sammlung-Editor"
 
-#: ../../include/taxonomy.php:316
-msgid "wants"
-msgstr "will"
+#: ../../mod/group.php:193
+msgid "Members"
+msgstr "Mitglieder"
 
-#: ../../include/taxonomy.php:317 ../../include/ItemObject.php:254
-msgid "like"
-msgstr "mag"
+#: ../../mod/group.php:195
+msgid "All Connected Channels"
+msgstr "Alle verbundenen Kanäle"
 
-#: ../../include/taxonomy.php:317
-msgid "likes"
-msgstr "gefällt"
+#: ../../mod/group.php:227
+msgid "Click on a channel to add or remove."
+msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
 
-#: ../../include/taxonomy.php:318 ../../include/ItemObject.php:255
-msgid "dislike"
-msgstr "verurteile"
+#: ../../mod/item.php:173
+msgid "Unable to locate original post."
+msgstr "Originalbeitrag nicht gefunden."
 
-#: ../../include/taxonomy.php:318
-msgid "dislikes"
-msgstr "missfällt"
+#: ../../mod/item.php:417
+msgid "Empty post discarded."
+msgstr "Leeren Beitrag verworfen."
 
-#: ../../include/dir_fns.php:126
-msgid "Directory Options"
-msgstr "Verzeichnisoptionen"
+#: ../../mod/item.php:457
+msgid "Executable content type not permitted to this channel."
+msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
 
-#: ../../include/dir_fns.php:128
-msgid "Safe Mode"
-msgstr "Sicherer Modus"
+#: ../../mod/item.php:822
+msgid "Duplicate post suppressed."
+msgstr "Doppelter Beitrag unterdrückt."
 
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/connedit.php:631
-#: ../../mod/connedit.php:659 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:386 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
-#: ../../mod/api.php:106 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "No"
-msgstr "Nein"
+#: ../../mod/item.php:953
+msgid "System error. Post not saved."
+msgstr "Systemfehler. Beitrag nicht gespeichert."
 
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:388 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
-#: ../../mod/api.php:105 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "Yes"
-msgstr "Ja"
+#: ../../mod/item.php:1220
+msgid "Unable to obtain post information from database."
+msgstr "Beitragsinformationen können nicht aus der Datenbank abgerufen werden."
 
-#: ../../include/dir_fns.php:129
-msgid "Public Forums Only"
-msgstr "Nur öffentliche Foren"
+#: ../../mod/item.php:1227
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
 
-#: ../../include/dir_fns.php:130
-msgid "This Website Only"
-msgstr "Nur dieser Hub"
+#: ../../mod/item.php:1234
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
 
-#: ../../include/identity.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
+#: ../../mod/common.php:10
+msgid "No channel."
+msgstr "Kein Kanal."
 
-#: ../../include/identity.php:66
-msgid "Empty name"
-msgstr "Namensfeld leer"
+#: ../../mod/common.php:39
+msgid "Common connections"
+msgstr "Gemeinsame Verbindungen"
 
-#: ../../include/identity.php:69
-msgid "Name too long"
-msgstr "Name ist zu lang"
+#: ../../mod/common.php:44
+msgid "No connections in common."
+msgstr "Keine gemeinsamen Verbindungen."
 
-#: ../../include/identity.php:181
-msgid "No account identifier"
-msgstr "Keine Account-Kennung"
+#: ../../mod/connect.php:56 ../../mod/connect.php:104
+msgid "Continue"
+msgstr "Fortfahren"
 
-#: ../../include/identity.php:193
-msgid "Nickname is required."
-msgstr "Spitzname ist erforderlich."
+#: ../../mod/connect.php:85
+msgid "Premium Channel Setup"
+msgstr "Premium-Kanal-Einrichtung"
 
-#: ../../include/identity.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr "Reservierter Kurzname. Bitte wähle einen anderen."
+#: ../../mod/connect.php:87
+msgid "Enable premium channel connection restrictions"
+msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
 
-#: ../../include/identity.php:212
+#: ../../mod/connect.php:88
 msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
-
-#: ../../include/identity.php:288
-msgid "Unable to retrieve created identity"
-msgstr "Kann die erstellte Identität nicht empfangen"
-
-#: ../../include/identity.php:346
-msgid "Default Profile"
-msgstr "Standard-Profil"
-
-#: ../../include/identity.php:745
-msgid "Requested channel is not available."
-msgstr "Angeforderte Kanal nicht verfügbar."
-
-#: ../../include/identity.php:791 ../../mod/achievements.php:11
-#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
-#: ../../mod/editblock.php:29 ../../mod/profile.php:16
-#: ../../mod/webpages.php:29 ../../mod/blocks.php:29
-#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/connect.php:13
-msgid "Requested profile is not available."
-msgstr "Erwünschte Profil ist nicht verfügbar."
-
-#: ../../include/identity.php:954 ../../mod/profiles.php:774
-msgid "Change profile photo"
-msgstr "Profilfoto ändern"
-
-#: ../../include/identity.php:960
-msgid "Profiles"
-msgstr "Profile"
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."
 
-#: ../../include/identity.php:960
-msgid "Manage/edit profiles"
-msgstr "Profile verwalten/bearbeiten"
+#: ../../mod/connect.php:90 ../../mod/connect.php:110
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
 
-#: ../../include/identity.php:961 ../../mod/profiles.php:775
-msgid "Create New Profile"
-msgstr "Neues Profil erstellen"
+#: ../../mod/connect.php:91
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
 
-#: ../../include/identity.php:964 ../../include/nav.php:90
-msgid "Edit Profile"
-msgstr "Profile bearbeiten"
+#: ../../mod/connect.php:92 ../../mod/connect.php:113
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite."
 
-#: ../../include/identity.php:976 ../../mod/profiles.php:786
-msgid "Profile Image"
-msgstr "Profilfoto:"
+#: ../../mod/connect.php:101
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
 
-#: ../../include/identity.php:979
-msgid "visible to everybody"
-msgstr "sichtbar für jeden"
+#: ../../mod/connect.php:109
+msgid "Restricted or Premium Channel"
+msgstr "Eingeschränkter oder Premium-Kanal"
 
-#: ../../include/identity.php:980 ../../mod/profiles.php:669
-#: ../../mod/profiles.php:790
-msgid "Edit visibility"
-msgstr "Sichtbarkeit bearbeiten"
+#: ../../mod/match.php:22
+msgid "Profile Match"
+msgstr "Profil-Ãœbereinstimmungen"
 
-#: ../../include/identity.php:996 ../../include/identity.php:1236
-msgid "Gender:"
-msgstr "Geschlecht:"
+#: ../../mod/match.php:31
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu."
 
-#: ../../include/identity.php:997 ../../include/identity.php:1280
-msgid "Status:"
-msgstr "Status:"
+#: ../../mod/match.php:63
+msgid "is interested in:"
+msgstr "interessiert sich für:"
 
-#: ../../include/identity.php:998 ../../include/identity.php:1291
-msgid "Homepage:"
-msgstr "Homepage:"
+#: ../../mod/match.php:70
+msgid "No matches"
+msgstr "Keine Ãœbereinstimmungen"
 
-#: ../../include/identity.php:999
-msgid "Online Now"
-msgstr "gerade online"
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID Protokollfehler. Keine ID zurückgegeben."
 
-#: ../../include/identity.php:1083 ../../include/identity.php:1161
-#: ../../mod/ping.php:318
-msgid "g A l F d"
-msgstr "l, d. F, G:i \\U\\h\\r"
+#: ../../mod/openid.php:72 ../../mod/openid.php:179
+#: ../../Zotlabs/Zot/Auth.php:248
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
 
-#: ../../include/identity.php:1084 ../../include/identity.php:1162
-msgid "F d"
-msgstr "d. F"
+#: ../../mod/achievements.php:34
+msgid "Some blurb about what to do when you're new here"
+msgstr "Ein Hinweis, was man tun kann, wenn man neu hier ist"
 
-#: ../../include/identity.php:1129 ../../include/identity.php:1201
-#: ../../mod/ping.php:341
-msgid "[today]"
-msgstr "[Heute]"
+#: ../../mod/chatsvc.php:111
+msgid "Away"
+msgstr "Abwesend"
 
-#: ../../include/identity.php:1140
-msgid "Birthday Reminders"
-msgstr "Geburtstags Erinnerungen"
+#: ../../mod/chatsvc.php:115
+msgid "Online"
+msgstr "Online"
 
-#: ../../include/identity.php:1141
-msgid "Birthdays this week:"
-msgstr "Geburtstage in dieser Woche:"
+#: ../../mod/pubsites.php:18
+msgid "Public Sites"
+msgstr "Öffentliche Server"
 
-#: ../../include/identity.php:1194
-msgid "[No description]"
-msgstr "[Keine Beschreibung]"
+#: ../../mod/pubsites.php:21
+msgid ""
+"The listed sites allow public registration for the $Projectname network. All"
+" sites in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some sites may require subscription or"
+" provide tiered service plans. The provider links <strong>may</strong> "
+"provide additional details."
+msgstr "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung bei $Projectname. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen anderen Servern ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den verlinkten Seiten <strong>könnten</strong> nähere Details dazu stehen."
 
-#: ../../include/identity.php:1212
-msgid "Event Reminders"
-msgstr "Termin-Erinnerungen"
+#: ../../mod/pubsites.php:27
+msgid "Rate this hub"
+msgstr "Bewerte diesen Hub"
 
-#: ../../include/identity.php:1213
-msgid "Events this week:"
-msgstr "Termine in dieser Woche:"
+#: ../../mod/pubsites.php:28
+msgid "Site URL"
+msgstr "Server-URL"
 
-#: ../../include/identity.php:1234 ../../mod/settings.php:1026
-msgid "Full Name:"
-msgstr "Voller Name:"
+#: ../../mod/pubsites.php:28
+msgid "Access Type"
+msgstr "Zugangstyp"
 
-#: ../../include/identity.php:1241
-msgid "Like this channel"
-msgstr "Dieser Kanal gefällt mir"
+#: ../../mod/pubsites.php:28
+msgid "Registration Policy"
+msgstr "Registrierungsrichtlinien"
 
-#: ../../include/identity.php:1265
-msgid "j F, Y"
-msgstr "j. F Y"
+#: ../../mod/pubsites.php:28
+msgid "Project"
+msgstr "Projekt"
 
-#: ../../include/identity.php:1266
-msgid "j F"
-msgstr "j. F"
+#: ../../mod/pubsites.php:28
+msgid "View hub ratings"
+msgstr "Bewertungen dieses Hubs ansehen"
 
-#: ../../include/identity.php:1273
-msgid "Birthday:"
-msgstr "Geburtstag:"
+#: ../../mod/pubsites.php:32
+msgid "Rate"
+msgstr "Bewerten"
 
-#: ../../include/identity.php:1277 ../../mod/directory.php:297
-msgid "Age:"
-msgstr "Alter:"
+#: ../../mod/pubsites.php:33
+msgid "View ratings"
+msgstr "Bewertungen ansehen"
 
-#: ../../include/identity.php:1286
+#: ../../mod/tagger.php:96
 #, php-format
-msgid "for %1$d %2$s"
-msgstr "seit %1$d %2$s"
-
-#: ../../include/identity.php:1289 ../../mod/profiles.php:691
-msgid "Sexual Preference:"
-msgstr "Sexuelle Orientierung:"
-
-#: ../../include/identity.php:1293 ../../mod/directory.php:313
-#: ../../mod/profiles.php:693
-msgid "Hometown:"
-msgstr "Heimatstadt:"
-
-#: ../../include/identity.php:1295
-msgid "Tags:"
-msgstr "Schlagworte:"
-
-#: ../../include/identity.php:1297 ../../mod/profiles.php:694
-msgid "Political Views:"
-msgstr "Politische Ansichten:"
-
-#: ../../include/identity.php:1299
-msgid "Religion:"
-msgstr "Religion:"
-
-#: ../../include/identity.php:1301 ../../mod/directory.php:315
-msgid "About:"
-msgstr "Ãœber:"
-
-#: ../../include/identity.php:1303
-msgid "Hobbies/Interests:"
-msgstr "Hobbys/Interessen:"
-
-#: ../../include/identity.php:1305 ../../mod/profiles.php:697
-msgid "Likes:"
-msgstr "Gefällt:"
-
-#: ../../include/identity.php:1307 ../../mod/profiles.php:698
-msgid "Dislikes:"
-msgstr "Gefällt nicht:"
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet"
 
-#: ../../include/identity.php:1309
-msgid "Contact information and Social Networks:"
-msgstr "Kontaktinformation und soziale Netzwerke:"
+#: ../../mod/rate.php:158
+msgid "Website:"
+msgstr "Webseite:"
 
-#: ../../include/identity.php:1311
-msgid "My other channels:"
-msgstr "Meine anderen Kanäle:"
+#: ../../mod/rate.php:161
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Kanal [%s] (auf diesem Server noch unbekannt)"
 
-#: ../../include/identity.php:1313
-msgid "Musical interests:"
-msgstr "Musikalische Interessen:"
+#: ../../mod/rate.php:162
+msgid "Rating (this information is public)"
+msgstr "Bewertung (öffentlich sichtbar)"
 
-#: ../../include/identity.php:1315
-msgid "Books, literature:"
-msgstr "Bücher, Literatur:"
+#: ../../mod/rate.php:163
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)"
 
-#: ../../include/identity.php:1317
-msgid "Television:"
-msgstr "Fernsehen:"
+#: ../../mod/blocks.php:95 ../../mod/blocks.php:148
+msgid "Block Name"
+msgstr "Block-Name"
 
-#: ../../include/identity.php:1319
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/Tanz/Kultur/Unterhaltung:"
+#: ../../mod/blocks.php:149
+msgid "Block Title"
+msgstr "Titel des Blocks"
 
-#: ../../include/identity.php:1321
-msgid "Love/Romance:"
-msgstr "Liebe/Romantik:"
+#: ../../mod/id.php:11
+msgid "First Name"
+msgstr "Vorname"
 
-#: ../../include/identity.php:1323
-msgid "Work/employment:"
-msgstr "Arbeit/Anstellung:"
+#: ../../mod/id.php:12
+msgid "Last Name"
+msgstr "Nachname"
 
-#: ../../include/identity.php:1325
-msgid "School/education:"
-msgstr "Schule/Ausbildung:"
+#: ../../mod/id.php:13
+msgid "Nickname"
+msgstr "Spitzname"
 
-#: ../../include/identity.php:1345
-msgid "Like this thing"
-msgstr "Gefällt mir"
+#: ../../mod/id.php:14
+msgid "Full Name"
+msgstr "Voller Name"
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "Kein Empfänger angegeben"
+#: ../../mod/id.php:20
+msgid "Profile Photo 16px"
+msgstr "Profilfoto 16 px"
 
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[no subject]"
+#: ../../mod/id.php:21
+msgid "Profile Photo 32px"
+msgstr "Profilfoto 32 px"
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "Kann Absender nicht bestimmen."
+#: ../../mod/id.php:22
+msgid "Profile Photo 48px"
+msgstr "Profilfoto 48 px"
 
-#: ../../include/message.php:203
-msgid "Stored post could not be verified."
-msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
+#: ../../mod/id.php:23
+msgid "Profile Photo 64px"
+msgstr "Profilfoto 64 px"
 
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
-msgstr "In Ordner speichern"
+#: ../../mod/id.php:24
+msgid "Profile Photo 80px"
+msgstr "Profilfoto 80 px"
 
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
-msgstr "Ich werde teilnehmen"
+#: ../../mod/id.php:25
+msgid "Profile Photo 128px"
+msgstr "Profilfoto 128 px"
 
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
-msgstr "Ich werde nicht teilnehmen"
+#: ../../mod/id.php:26
+msgid "Timezone"
+msgstr "Zeitzone"
 
-#: ../../include/ItemObject.php:151
-msgid "I might attend"
-msgstr "Ich werde vielleicht teilnehmen"
+#: ../../mod/id.php:27
+msgid "Homepage URL"
+msgstr "Homepage-URL"
 
-#: ../../include/ItemObject.php:161
-msgid "I agree"
-msgstr "Ich stimme zu"
+#: ../../mod/id.php:29
+msgid "Birth Year"
+msgstr "Geburtsjahr"
 
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
-msgstr "Ich lehne ab"
+#: ../../mod/id.php:30
+msgid "Birth Month"
+msgstr "Geburtsmonat"
 
-#: ../../include/ItemObject.php:161
-msgid "I abstain"
-msgstr "Ich enthalte mich"
+#: ../../mod/id.php:31
+msgid "Birth Day"
+msgstr "Geburtstag"
 
-#: ../../include/ItemObject.php:212
-msgid "Add Star"
-msgstr "Stern hinzufügen"
+#: ../../mod/id.php:32
+msgid "Birthdate"
+msgstr "Geburtsdatum"
 
-#: ../../include/ItemObject.php:213
-msgid "Remove Star"
-msgstr "Stern entfernen"
+#: ../../mod/id.php:33 ../../mod/profiles.php:441
+msgid "Gender"
+msgstr "Geschlecht"
 
-#: ../../include/ItemObject.php:214
-msgid "Toggle Star Status"
-msgstr "Markierungsstatus (Stern) umschalten"
+#: ../../mod/like.php:15
+msgid "Like/Dislike"
+msgstr "Mögen/Nicht mögen"
 
-#: ../../include/ItemObject.php:218
-msgid "starred"
-msgstr "markiert"
+#: ../../mod/like.php:20
+msgid "This action is restricted to members."
+msgstr "Diese Aktion kann nur von Mitgliedern ausgeführt werden."
 
-#: ../../include/ItemObject.php:236
-msgid "Add Tag"
-msgstr "Tag hinzufügen"
+#: ../../mod/like.php:21
+msgid ""
+"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a "
+"href=\"register\">register as a new $Projectname member</a> to continue."
+msgstr "Um fortzufahren <a href=\"rmagic\">melde Dich bitte mit Deiner $Projectname-ID an</a> oder <a href=\"register\">registriere Dich als neues $Projectname-Mitglied</a>."
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:987
-msgid "I like this (toggle)"
-msgstr "Mir gefällt das (Umschalter)"
+#: ../../mod/like.php:101 ../../mod/like.php:127 ../../mod/like.php:165
+msgid "Invalid request."
+msgstr "Ungültige Anfrage."
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:988
-msgid "I don't like this (toggle)"
-msgstr "Mir gefällt das nicht (Umschalter)"
+#: ../../mod/like.php:142
+msgid "thing"
+msgstr "Sache"
 
-#: ../../include/ItemObject.php:259
-msgid "Share This"
-msgstr "Teilen"
+#: ../../mod/like.php:188
+msgid "Channel unavailable."
+msgstr "Kanal nicht vorhanden."
 
-#: ../../include/ItemObject.php:259
-msgid "share"
-msgstr "Teilen"
+#: ../../mod/like.php:236
+msgid "Previous action reversed."
+msgstr "Die vorherige Aktion wurde rückgängig gemacht."
 
-#: ../../include/ItemObject.php:276
+#: ../../mod/like.php:414
 #, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d Kommentar"
-msgstr[1] "%d Kommentare"
+msgid "%1$s agrees with %2$s's %3$s"
+msgstr "%1$s stimmt %2$ss %3$s zu"
 
-#: ../../include/ItemObject.php:295 ../../include/ItemObject.php:296
+#: ../../mod/like.php:416
 #, php-format
-msgid "View %s's profile - %s"
-msgstr "Schaue Dir %ss Profil an – %s"
-
-#: ../../include/ItemObject.php:299
-msgid "to"
-msgstr "an"
-
-#: ../../include/ItemObject.php:300
-msgid "via"
-msgstr "via"
-
-#: ../../include/ItemObject.php:301
-msgid "Wall-to-Wall"
-msgstr "Wall-to-Wall"
-
-#: ../../include/ItemObject.php:302
-msgid "via Wall-To-Wall:"
-msgstr "via Wall-To-Wall:"
-
-#: ../../include/ItemObject.php:305
-msgid "Delivery Report"
-msgstr "Zustellungsbericht"
-
-#: ../../include/ItemObject.php:339
-msgid "Save Bookmarks"
-msgstr "Favoriten speichern"
-
-#: ../../include/ItemObject.php:340
-msgid "Add to Calendar"
-msgstr "Zum Kalender hinzufügen"
-
-#: ../../include/ItemObject.php:349
-msgid "Mark all seen"
-msgstr "Alle als gelesen markieren"
-
-#: ../../include/ItemObject.php:355 ../../mod/photos.php:1173
-msgctxt "noun"
-msgid "Likes"
-msgstr "Gefällt mir"
-
-#: ../../include/ItemObject.php:356 ../../mod/photos.php:1174
-msgctxt "noun"
-msgid "Dislikes"
-msgstr "Gefällt nicht"
-
-#: ../../include/ItemObject.php:671 ../../mod/photos.php:1006
-#: ../../mod/photos.php:1124
-msgid "This is you"
-msgstr "Das bist Du"
-
-#: ../../include/ItemObject.php:680
-msgid "Image"
-msgstr "Bild"
-
-#: ../../include/ItemObject.php:681
-msgid "Insert Link"
-msgstr "Link einfügen"
-
-#: ../../include/ItemObject.php:682
-msgid "Video"
-msgstr "Video"
-
-#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/import_items.php:114 ../../index.php:360
-msgid "Permission denied"
-msgstr "Keine Berechtigung"
-
-#: ../../include/items.php:1128 ../../include/items.php:1174
-msgid "(Unknown)"
-msgstr "(Unbekannt)"
-
-#: ../../include/items.php:1371
-msgid "Visible to anybody on the internet."
-msgstr "Für jeden im Internet sichtbar."
-
-#: ../../include/items.php:1373
-msgid "Visible to you only."
-msgstr "Nur für Dich sichtbar."
-
-#: ../../include/items.php:1375
-msgid "Visible to anybody in this network."
-msgstr "Für jedes Mitglied der RedMatrix sichtbar."
-
-#: ../../include/items.php:1377
-msgid "Visible to anybody authenticated."
-msgstr "Für jeden sichtbar, der angemeldet ist."
+msgid "%1$s doesn't agree with %2$s's %3$s"
+msgstr "%1$s lehnt %2$ss %3$s ab"
 
-#: ../../include/items.php:1379
+#: ../../mod/like.php:418
 #, php-format
-msgid "Visible to anybody on %s."
-msgstr "Für jeden auf %s sichtbar."
-
-#: ../../include/items.php:1381
-msgid "Visible to all connections."
-msgstr "Für alle Verbindungen sichtbar."
-
-#: ../../include/items.php:1383
-msgid "Visible to approved connections."
-msgstr "Nur für akzeptierte Verbindungen sichtbar."
-
-#: ../../include/items.php:1385
-msgid "Visible to specific connections."
-msgstr "Sichtbar für bestimmte Verbindungen."
-
-#: ../../include/items.php:4263 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/admin.php:127
-#: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
-msgstr "Element nicht gefunden."
-
-#: ../../include/items.php:4772 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Collection not found."
-msgstr "Sammlung nicht gefunden"
-
-#: ../../include/items.php:4788
-msgid "Collection is empty."
-msgstr "Sammlung ist leer."
+msgid "%1$s abstains from a decision on %2$s's %3$s"
+msgstr "%1$s enthält sich zu %2$ss %3$s"
 
-#: ../../include/items.php:4795
+#: ../../mod/like.php:420
 #, php-format
-msgid "Collection: %s"
-msgstr "Sammlung: %s"
+msgid "%1$s is attending %2$s's %3$s"
+msgstr "%1$s nimmt an %2$ss %3$s teil"
 
-#: ../../include/items.php:4805 ../../mod/connedit.php:658
+#: ../../mod/like.php:422
 #, php-format
-msgid "Connection: %s"
-msgstr "Verbindung: %s"
-
-#: ../../include/items.php:4807
-msgid "Connection not found."
-msgstr "Die Verbindung wurde nicht gefunden."
-
-#: ../../include/widgets.php:91 ../../include/nav.php:157
-#: ../../mod/apps.php:36
-msgid "Apps"
-msgstr "Apps"
-
-#: ../../include/widgets.php:92
-msgid "System"
-msgstr "System"
-
-#: ../../include/widgets.php:95
-msgid "Create Personal App"
-msgstr "Persönliche App erstellen"
-
-#: ../../include/widgets.php:96
-msgid "Edit Personal App"
-msgstr "Persönliche App bearbeiten"
-
-#: ../../include/widgets.php:138 ../../mod/suggest.php:54
-msgid "Ignore/Hide"
-msgstr "Ignorieren/Verstecken"
-
-#: ../../include/widgets.php:143 ../../mod/connections.php:125
-msgid "Suggestions"
-msgstr "Vorschläge"
-
-#: ../../include/widgets.php:144
-msgid "See more..."
-msgstr "Mehr anzeigen …"
+msgid "%1$s is not attending %2$s's %3$s"
+msgstr "%1$s nimmt an %2$ss %3$s nicht teil"
 
-#: ../../include/widgets.php:165
+#: ../../mod/like.php:424
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."
-
-#: ../../include/widgets.php:171
-msgid "Add New Connection"
-msgstr "Neue Verbindung hinzufügen"
-
-#: ../../include/widgets.php:172
-msgid "Enter the channel address"
-msgstr "Adresse des Kanals eingeben"
-
-#: ../../include/widgets.php:173
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
-
-#: ../../include/widgets.php:189
-msgid "Notes"
-msgstr "Notizen"
-
-#: ../../include/widgets.php:265
-msgid "Remove term"
-msgstr "Eintrag löschen"
-
-#: ../../include/widgets.php:348
-msgid "Archives"
-msgstr "Archive"
-
-#: ../../include/widgets.php:427 ../../mod/connedit.php:567
-msgid "Me"
-msgstr "Ich"
-
-#: ../../include/widgets.php:428 ../../mod/connedit.php:568
-msgid "Family"
-msgstr "Familie"
+msgid "%1$s may attend %2$s's %3$s"
+msgstr "%1$s nimmt vielleicht an %2$ss %3$s teil"
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:570
-msgid "Acquaintances"
-msgstr "Bekannte"
+#: ../../mod/like.php:520
+msgid "Action completed."
+msgstr "Aktion durchgeführt."
 
-#: ../../include/widgets.php:431 ../../mod/connedit.php:571
-#: ../../mod/connections.php:88 ../../mod/connections.php:103
-msgid "All"
-msgstr "Alle"
+#: ../../mod/like.php:521
+msgid "Thank you."
+msgstr "Vielen Dank."
 
-#: ../../include/widgets.php:450
-msgid "Refresh"
-msgstr "Aktualisieren"
+#: ../../mod/page.php:36 ../../mod/block.php:27
+msgid "Invalid item."
+msgstr "Ungültiges Element."
 
-#: ../../include/widgets.php:484
-msgid "Account settings"
-msgstr "Konto-Einstellungen"
+#: ../../mod/page.php:52 ../../mod/wall_upload.php:29 ../../mod/block.php:39
+msgid "Channel not found."
+msgstr "Kanal nicht gefunden."
 
-#: ../../include/widgets.php:490
-msgid "Channel settings"
-msgstr "Kanal-Einstellungen"
+#: ../../mod/page.php:89 ../../mod/display.php:110 ../../mod/help.php:214
+#: ../../mod/block.php:75 ../../index.php:241
+msgid "Page not found."
+msgstr "Seite nicht gefunden."
 
-#: ../../include/widgets.php:496
-msgid "Additional features"
-msgstr "Zusätzliche Funktionen"
+#: ../../mod/page.php:126
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
+" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-#: ../../include/widgets.php:502
-msgid "Feature/Addon settings"
-msgstr "Plugin-Einstellungen"
+#: ../../mod/removeme.php:29
+msgid ""
+"Channel removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden."
 
-#: ../../include/widgets.php:508
-msgid "Display settings"
-msgstr "Anzeige-Einstellungen"
+#: ../../mod/removeme.php:57
+msgid "Remove This Channel"
+msgstr "Diesen Kanal löschen"
 
-#: ../../include/widgets.php:514
-msgid "Connected apps"
-msgstr "Verbundene Apps"
+#: ../../mod/removeme.php:58 ../../mod/removeaccount.php:58
+msgid "WARNING: "
+msgstr "WARNUNG: "
 
-#: ../../include/widgets.php:520
-msgid "Export channel"
-msgstr "Kanal exportieren"
+#: ../../mod/removeme.php:58
+msgid "This channel will be completely removed from the network. "
+msgstr "Dieser Kanal wird vollständig aus dem Netzwerk gelöscht."
 
-#: ../../include/widgets.php:529 ../../mod/connedit.php:658
-msgid "Connection Default Permissions"
-msgstr "Standardzugriffsrechte für neue Verbindungen:"
+#: ../../mod/removeme.php:58 ../../mod/removeaccount.php:58
+msgid "This action is permanent and can not be undone!"
+msgstr "Dieser Schritt ist endgültig und kann nicht rückgängig gemacht werden!"
 
-#: ../../include/widgets.php:537
-msgid "Premium Channel Settings"
-msgstr "Premium-Kanal-Einstellungen"
+#: ../../mod/removeme.php:59 ../../mod/removeaccount.php:59
+msgid "Please enter your password for verification:"
+msgstr "Bitte gib zur Bestätigung Dein Passwort ein:"
 
-#: ../../include/widgets.php:567
-msgid "Private Mail Menu"
-msgstr "Private Nachrichten"
+#: ../../mod/removeme.php:60
+msgid "Remove this channel and all its clones from the network"
+msgstr "Lösche diesen Kanal und all seine Klone aus dem Netzwerk"
 
-#: ../../include/widgets.php:569
-msgid "Check Mail"
-msgstr "Nachrichten abrufen"
+#: ../../mod/removeme.php:60
+msgid ""
+"By default only the instance of the channel located on this hub will be "
+"removed from the network"
+msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"
 
-#: ../../include/widgets.php:575
-msgid "Combined View"
-msgstr "Kombinierte Anzeige"
+#: ../../mod/removeme.php:61 ../../mod/settings.php:1112
+msgid "Remove Channel"
+msgstr "Kanal löschen"
 
-#: ../../include/widgets.php:580 ../../include/nav.php:191
-msgid "Inbox"
-msgstr "Eingang"
+#: ../../mod/mood.php:132
+msgid "Set your current mood and tell your friends"
+msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"
 
-#: ../../include/widgets.php:585 ../../include/nav.php:192
-msgid "Outbox"
-msgstr "Ausgang"
+#: ../../mod/new_channel.php:109
+msgid "Add a Channel"
+msgstr "Kanal hinzufügen"
 
-#: ../../include/widgets.php:590 ../../include/nav.php:193
-msgid "New Message"
-msgstr "Neue Nachricht"
+#: ../../mod/new_channel.php:110
+msgid ""
+"A channel is your own collection of related web pages. A channel can be used"
+" to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
+msgstr "Ein Kanal ist Deine eigene Sammlung von zusammengehörigen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deines Hubs zulässt."
 
-#: ../../include/widgets.php:609 ../../include/widgets.php:621
-msgid "Conversations"
-msgstr "Konversationen"
+#: ../../mod/new_channel.php:112 ../../mod/sources.php:103
+#: ../../mod/sources.php:137
+msgid "Channel Name"
+msgstr "Name des Kanals"
 
-#: ../../include/widgets.php:613
-msgid "Received Messages"
-msgstr "Erhaltene Nachrichten"
+#: ../../mod/new_channel.php:113
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
+msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "
 
-#: ../../include/widgets.php:617
-msgid "Sent Messages"
-msgstr "Gesendete Nachrichten"
+#: ../../mod/new_channel.php:114
+msgid "Choose a short nickname"
+msgstr "Wähle einen kurzen Spitznamen"
 
-#: ../../include/widgets.php:631
-msgid "No messages."
-msgstr "Keine Nachrichten."
+#: ../../mod/new_channel.php:115
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
+msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst."
 
-#: ../../include/widgets.php:648
-msgid "Delete conversation"
-msgstr "Unterhaltung löschen"
+#: ../../mod/new_channel.php:116
+msgid "Or <a href=\"import\">import an existing channel</a> from another location"
+msgstr "Oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server"
 
-#: ../../include/widgets.php:650
-msgid "D, d M Y - g:i A"
-msgstr "D, d. M Y - G:i"
+#: ../../mod/new_channel.php:118
+msgid ""
+"Please choose a channel type (such as social networking or community forum) "
+"and privacy requirements so we can select the best permissions for you"
+msgstr "Wähle einen Kanaltyp (wie Soziales Netzwerk oder Forum) und Privatsphäre-Vorgaben, so dass wir die passenden Kanal-Zugriffsrechte für Dich setzen können"
 
-#: ../../include/widgets.php:738
-msgid "Chat Rooms"
-msgstr "Chaträume"
+#: ../../mod/new_channel.php:119
+msgid "Channel Type"
+msgstr "Kanaltyp"
 
-#: ../../include/widgets.php:758
-msgid "Bookmarked Chatrooms"
-msgstr "Gespeicherte Chatrooms"
+#: ../../mod/new_channel.php:119
+msgid "Read more about roles"
+msgstr "Mehr Informationen über Rollen"
 
-#: ../../include/widgets.php:778
-msgid "Suggested Chatrooms"
-msgstr "Chatraum-Vorschläge"
+#: ../../mod/ratings.php:69
+msgid "No ratings"
+msgstr "Keine Bewertungen"
 
-#: ../../include/widgets.php:905 ../../include/widgets.php:963
-msgid "photo/image"
-msgstr "Foto/Bild"
+#: ../../mod/ratings.php:82 ../../mod/search.php:13 ../../mod/directory.php:59
+#: ../../mod/photos.php:490 ../../mod/display.php:13
+#: ../../mod/viewconnections.php:17
+msgid "Public access denied."
+msgstr "Öffentlicher Zugang verweigert."
 
-#: ../../include/widgets.php:1058 ../../include/widgets.php:1060
-msgid "Rate Me"
-msgstr "Bewerte mich"
+#: ../../mod/ratings.php:99
+msgid "Ratings"
+msgstr "Bewertungen"
 
-#: ../../include/widgets.php:1064
-msgid "View Ratings"
-msgstr "Bewertungen ansehen"
+#: ../../mod/ratings.php:100
+msgid "Rating: "
+msgstr "Bewertung: "
 
-#: ../../include/widgets.php:1075
-msgid "Public Hubs"
-msgstr "Öffentliche Hubs"
+#: ../../mod/ratings.php:101
+msgid "Website: "
+msgstr "Webseite: "
 
-#: ../../include/widgets.php:1123
-msgid "Forums"
-msgstr "Foren"
+#: ../../mod/ratings.php:103
+msgid "Description: "
+msgstr "Beschreibung: "
 
-#: ../../include/widgets.php:1150
-msgid "Tasks"
-msgstr "Aufgaben"
+#: ../../mod/setup.php:191
+msgid "$Projectname Server - Setup"
+msgstr "$Projectname Server-Einrichtung"
 
-#: ../../include/widgets.php:1159
-msgid "Documentation"
-msgstr "Dokumentation"
+#: ../../mod/setup.php:195
+msgid "Could not connect to database."
+msgstr "Kann nicht mit der Datenbank verbinden."
 
-#: ../../include/widgets.php:1161
-msgid "Project/Site Information"
-msgstr "Informationen über das Projekt und diesen Hub"
+#: ../../mod/setup.php:199
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS."
 
-#: ../../include/widgets.php:1162
-msgid "For Members"
-msgstr "Für Mitglieder"
+#: ../../mod/setup.php:206
+msgid "Could not create table."
+msgstr "Kann Tabelle nicht erstellen."
 
-#: ../../include/widgets.php:1163
-msgid "For Administrators"
-msgstr "Für Administratoren"
+#: ../../mod/setup.php:211
+msgid "Your site database has been installed."
+msgstr "Die Datenbank Deines Hubs wurde installiert."
 
-#: ../../include/widgets.php:1164
-msgid "For Developers"
-msgstr "Für Entwickler"
+#: ../../mod/setup.php:215
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
+msgstr "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren."
 
-#: ../../include/widgets.php:1189 ../../mod/admin.php:410
-msgid "Site"
-msgstr "Seite"
+#: ../../mod/setup.php:216 ../../mod/setup.php:284 ../../mod/setup.php:734
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Lies die Datei \"install/INSTALL.txt\"."
 
-#: ../../include/widgets.php:1190
-msgid "Accounts"
-msgstr "Konten"
+#: ../../mod/setup.php:281
+msgid "System check"
+msgstr "Systemprüfung"
 
-#: ../../include/widgets.php:1191 ../../mod/admin.php:939
-msgid "Channels"
-msgstr "Kanäle"
+#: ../../mod/setup.php:285 ../../mod/photos.php:911 ../../mod/events.php:653
+#: ../../mod/events.php:660
+msgid "Next"
+msgstr "Nächste"
 
-#: ../../include/widgets.php:1192 ../../mod/admin.php:1031
-#: ../../mod/admin.php:1071
-msgid "Plugins"
-msgstr "Plug-Ins"
+#: ../../mod/setup.php:286
+msgid "Check again"
+msgstr "Bitte nochmal prüfen"
 
-#: ../../include/widgets.php:1193 ../../mod/admin.php:1231
-#: ../../mod/admin.php:1265
-msgid "Themes"
-msgstr "Themes"
+#: ../../mod/setup.php:308
+msgid "Database connection"
+msgstr "Datenbank Verbindung"
 
-#: ../../include/widgets.php:1194
-msgid "Inspect queue"
-msgstr "Warteschlange kontrollieren"
+#: ../../mod/setup.php:309
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
+msgstr "Um $Projectname zu installieren, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."
 
-#: ../../include/widgets.php:1195
-msgid "Profile Config"
-msgstr "Profilkonfiguration"
+#: ../../mod/setup.php:310
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast."
 
-#: ../../include/widgets.php:1196
-msgid "DB updates"
-msgstr "DB-Aktualisierungen"
+#: ../../mod/setup.php:311
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst."
 
-#: ../../include/widgets.php:1214 ../../include/widgets.php:1220
-#: ../../mod/admin.php:1350
-msgid "Logs"
-msgstr "Protokolle"
+#: ../../mod/setup.php:315
+msgid "Database Server Name"
+msgstr "Datenbank-Servername"
 
-#: ../../include/widgets.php:1218 ../../include/nav.php:210
-msgid "Admin"
-msgstr "Administration"
+#: ../../mod/setup.php:315
+msgid "Default is 127.0.0.1"
+msgstr "Standard ist 127.0.0.1"
 
-#: ../../include/widgets.php:1219
-msgid "Plugin Features"
-msgstr "Plug-In Funktionen"
+#: ../../mod/setup.php:316
+msgid "Database Port"
+msgstr "Datenbank-Port"
 
-#: ../../include/widgets.php:1221
-msgid "User registrations waiting for confirmation"
-msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
+#: ../../mod/setup.php:316
+msgid "Communication port number - use 0 for default"
+msgstr "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung"
 
-#: ../../include/zot.php:677
-msgid "Invalid data packet"
-msgstr "Ungültiges Datenpaket"
+#: ../../mod/setup.php:317
+msgid "Database Login Name"
+msgstr "Datenbank-Benutzername"
 
-#: ../../include/zot.php:693
-msgid "Unable to verify channel signature"
-msgstr "Konnte die Signatur des Kanals nicht verifizieren"
+#: ../../mod/setup.php:318
+msgid "Database Login Password"
+msgstr "Datenbank-Kennwort"
 
-#: ../../include/zot.php:2213
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
+#: ../../mod/setup.php:319
+msgid "Database Name"
+msgstr "Datenbank-Name"
 
-#: ../../include/zot.php:3511
-msgid "invalid target signature"
-msgstr "Ungültige Signatur des Ziels"
+#: ../../mod/setup.php:320
+msgid "Database Type"
+msgstr "Datenbanktyp"
 
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1496
-msgid "Logout"
-msgstr "Abmelden"
+#: ../../mod/setup.php:322 ../../mod/setup.php:363
+msgid "Site administrator email address"
+msgstr "E-Mail Adresse des Seiten-Administrators"
 
-#: ../../include/nav.php:82 ../../include/nav.php:114
-msgid "End this session"
-msgstr "Beende diese Sitzung"
+#: ../../mod/setup.php:322 ../../mod/setup.php:363
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst."
 
-#: ../../include/nav.php:85 ../../include/nav.php:145
-msgid "Home"
-msgstr "Home"
+#: ../../mod/setup.php:323 ../../mod/setup.php:365
+msgid "Website URL"
+msgstr "Server-URL"
 
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr "Deine Beiträge und Unterhaltungen"
+#: ../../mod/setup.php:323 ../../mod/setup.php:365
+msgid "Please use SSL (https) URL if available."
+msgstr "Nutze wenn möglich eine SSL-URL (https)."
 
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr "Deine Profilseite"
+#: ../../mod/setup.php:325 ../../mod/setup.php:367
+msgid "Please select a default timezone for your website"
+msgstr "Standard-Zeitzone für Deinen Server"
 
-#: ../../include/nav.php:88
-msgid "Edit Profiles"
-msgstr "Profile bearbeiten"
+#: ../../mod/setup.php:352
+msgid "Site settings"
+msgstr "Seiteneinstellungen"
 
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr "Profile verwalten"
+#: ../../mod/setup.php:417
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden."
 
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr "Profil bearbeiten"
+#: ../../mod/setup.php:418
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen."
 
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr "Deine Bilder"
+#: ../../mod/setup.php:422
+msgid "PHP executable path"
+msgstr "PHP Pfad zu ausführbarer Datei"
 
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr "Deine Dateien"
+#: ../../mod/setup.php:422
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren."
 
-#: ../../include/nav.php:97
-msgid "Your chatrooms"
-msgstr "Deine Chaträume"
+#: ../../mod/setup.php:427
+msgid "Command line PHP"
+msgstr "PHP Befehlszeile"
 
-#: ../../include/nav.php:103
-msgid "Your bookmarks"
-msgstr "Deine Lesezeichen"
+#: ../../mod/setup.php:436
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert."
 
-#: ../../include/nav.php:107
-msgid "Your webpages"
-msgstr "Deine Webseiten"
+#: ../../mod/setup.php:437
+msgid "This is required for message delivery to work."
+msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
 
-#: ../../include/nav.php:111
-msgid "Sign in"
-msgstr "Anmelden"
+#: ../../mod/setup.php:440
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
-#: ../../include/nav.php:128
+#: ../../mod/setup.php:458
 #, php-format
-msgid "%s - click to logout"
-msgstr "%s - Klick zum Abmelden"
-
-#: ../../include/nav.php:131
-msgid "Remote authentication"
-msgstr "Ãœber Konto auf anderem Server einloggen"
-
-#: ../../include/nav.php:131
-msgid "Click to authenticate to your home hub"
-msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
-
-#: ../../include/nav.php:145
-msgid "Home Page"
-msgstr "Homepage"
-
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1473
-msgid "Register"
-msgstr "Registrieren"
-
-#: ../../include/nav.php:149
-msgid "Create an account"
-msgstr "Erzeuge ein Konto"
+msgid ""
+"Your max allowed total upload size is set to %s. Maximum size of one file to"
+" upload is set to %s. You are allowed to upload up to %d files at once."
+msgstr "Die Maximalgröße für Uploads insgesamt liegt bei %s. Die Maximalgröße für eine Datei liegt bei %s. Es können maximal %d Dateien gleichzeitig hochgeladen werden."
 
-#: ../../include/nav.php:154
-msgid "Help and documentation"
-msgstr "Hilfe und Dokumentation"
+#: ../../mod/setup.php:463
+msgid "You can adjust these settings in the servers php.ini."
+msgstr "Du kannst diese Einstellungen in der php.ini des Servers ändern."
 
-#: ../../include/nav.php:157
-msgid "Applications, utilities, links, games"
-msgstr "Anwendungen (Apps), Zubehör, Links, Spiele"
+#: ../../mod/setup.php:465
+msgid "PHP upload limits"
+msgstr "PHP-Hochladebeschränkungen"
 
-#: ../../include/nav.php:159
-msgid "Search site @name, #tag, ?docs, content"
-msgstr "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt"
+#: ../../mod/setup.php:488
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen."
 
-#: ../../include/nav.php:162
-msgid "Channel Directory"
-msgstr "Kanal-Verzeichnis"
+#: ../../mod/setup.php:489
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung."
 
-#: ../../include/nav.php:174
-msgid "Grid"
-msgstr "Grid"
+#: ../../mod/setup.php:492
+msgid "Generate encryption keys"
+msgstr "Verschlüsselungsschlüssel  generieren"
 
-#: ../../include/nav.php:174
-msgid "Your grid"
-msgstr "Dein Grid"
+#: ../../mod/setup.php:504
+msgid "libCurl PHP module"
+msgstr "libCurl-PHP-Modul"
 
-#: ../../include/nav.php:175
-msgid "Mark all grid notifications seen"
-msgstr "Alle Grid-Benachrichtigungen als angesehen markieren"
+#: ../../mod/setup.php:505
+msgid "GD graphics PHP module"
+msgstr "GD-Grafik-PHP-Modul"
 
-#: ../../include/nav.php:177
-msgid "Channel home"
-msgstr "Mein Kanal"
+#: ../../mod/setup.php:506
+msgid "OpenSSL PHP module"
+msgstr "OpenSSL-PHP-Modul"
 
-#: ../../include/nav.php:178
-msgid "Mark all channel notifications seen"
-msgstr "Markiere alle Kanal-Benachrichtigungen als angesehen"
+#: ../../mod/setup.php:507
+msgid "mysqli or postgres PHP module"
+msgstr "mysqli oder postgres PHP-Modul"
 
-#: ../../include/nav.php:181 ../../mod/connections.php:260
-msgid "Connections"
-msgstr "Verbindungen"
+#: ../../mod/setup.php:508
+msgid "mb_string PHP module"
+msgstr "mb_string-PHP-Modul"
 
-#: ../../include/nav.php:184
-msgid "Notices"
-msgstr "Benachrichtigungen"
+#: ../../mod/setup.php:509
+msgid "mcrypt PHP module"
+msgstr "mcrypt-PHP-Modul"
 
-#: ../../include/nav.php:184
-msgid "Notifications"
-msgstr "Benachrichtigungen"
+#: ../../mod/setup.php:510
+msgid "xml PHP module"
+msgstr "xml-PHP-Modul"
 
-#: ../../include/nav.php:185
-msgid "See all notifications"
-msgstr "Alle Benachrichtigungen ansehen"
+#: ../../mod/setup.php:514 ../../mod/setup.php:516
+msgid "Apache mod_rewrite module"
+msgstr "Apache-mod_rewrite-Modul"
 
-#: ../../include/nav.php:186 ../../mod/notifications.php:99
-msgid "Mark all system notifications seen"
-msgstr "Markiere alle System-Benachrichtigungen als gesehen"
+#: ../../mod/setup.php:514
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert."
 
-#: ../../include/nav.php:188
-msgid "Private mail"
-msgstr "Persönliche Mail"
+#: ../../mod/setup.php:520 ../../mod/setup.php:523
+msgid "proc_open"
+msgstr "proc_open"
 
-#: ../../include/nav.php:189
-msgid "See all private messages"
-msgstr "Alle persönlichen Nachrichten ansehen"
+#: ../../mod/setup.php:520
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
 
-#: ../../include/nav.php:190
-msgid "Mark all private messages seen"
-msgstr "Markiere alle persönlichen Nachrichten als gesehen"
+#: ../../mod/setup.php:528
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert."
 
-#: ../../include/nav.php:196
-msgid "Event Calendar"
-msgstr "Terminkalender"
+#: ../../mod/setup.php:532
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert."
 
-#: ../../include/nav.php:197
-msgid "See all events"
-msgstr "Alle Termine ansehen"
+#: ../../mod/setup.php:536
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert."
 
-#: ../../include/nav.php:198
-msgid "Mark all events seen"
-msgstr "Markiere alle Termine als gesehen"
+#: ../../mod/setup.php:540
+msgid ""
+"Error: mysqli or postgres PHP module required but neither are installed."
+msgstr "Fehler: Das mysqli oder postgres PHP-Modul ist erforderlich, aber keines von beiden ist installiert."
 
-#: ../../include/nav.php:200
-msgid "Manage Your Channels"
-msgstr "Verwalte Deine Kanäle"
+#: ../../mod/setup.php:544
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."
 
-#: ../../include/nav.php:202
-msgid "Account/Channel Settings"
-msgstr "Konto-/Kanal-Einstellungen"
+#: ../../mod/setup.php:548
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert."
 
-#: ../../include/nav.php:210
-msgid "Site Setup and Configuration"
-msgstr "Seiten-Einrichtung und -Konfiguration"
+#: ../../mod/setup.php:552
+msgid "Error: xml PHP module required for DAV but not installed."
+msgstr "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert."
 
-#: ../../include/nav.php:246
-msgid "@name, #tag, ?doc, content"
-msgstr "@Name, #Schlagwort, ?Dokumentation, Inhalt"
+#: ../../mod/setup.php:570
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht."
 
-#: ../../include/nav.php:247
-msgid "Please wait..."
-msgstr "Bitte warten..."
+#: ../../mod/setup.php:571
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst."
 
-#: ../../mod/achievements.php:34
-msgid "Some blurb about what to do when you're new here"
-msgstr "Ein Hinweis, was man tun kann, wenn man neu hier ist"
+#: ../../mod/setup.php:572
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Hubzilla-Installation speichern musst."
 
-#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
-msgid "Contact not found."
-msgstr "Kontakt nicht gefunden"
+#: ../../mod/setup.php:573
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
 
-#: ../../mod/fsuggest.php:63
-msgid "Friend suggestion sent."
-msgstr "Freundschaftsempfehlung senden."
+#: ../../mod/setup.php:576
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php ist beschreibbar"
 
-#: ../../mod/fsuggest.php:97
-msgid "Suggest Friends"
-msgstr "Kontakte vorschlagen"
+#: ../../mod/setup.php:590
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "$Projectname verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen."
 
-#: ../../mod/fsuggest.php:99
+#: ../../mod/setup.php:591
 #, php-format
-msgid "Suggest a friend for %s"
-msgstr "Schlage %s einen Kontakt vor"
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the Red top level folder."
+msgstr "Um diese kompilierten Vorlagen speichern zu können, braucht der Webserver Schreibzugriff auf das Verzeichnis %s unterhalb des $Projectname-Installationsverzeichnisses."
 
-#: ../../mod/directory.php:59 ../../mod/display.php:13 ../../mod/search.php:13
-#: ../../mod/photos.php:453 ../../mod/ratings.php:82
-#: ../../mod/viewconnections.php:17
-msgid "Public access denied."
-msgstr "Öffentlicher Zugang verweigert."
+#: ../../mod/setup.php:592 ../../mod/setup.php:613
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat."
 
-#: ../../mod/directory.php:234
+#: ../../mod/setup.php:593
 #, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] "%d Bewertung"
-msgstr[1] "%d Bewertungen"
-
-#: ../../mod/directory.php:245
-msgid "Gender: "
-msgstr "Geschlecht:"
-
-#: ../../mod/directory.php:247
-msgid "Status: "
-msgstr "Status:"
-
-#: ../../mod/directory.php:249
-msgid "Homepage: "
-msgstr "Webseite:"
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
+msgstr "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält."
 
-#: ../../mod/directory.php:308 ../../mod/events.php:699
-msgid "Description:"
-msgstr "Beschreibung:"
+#: ../../mod/setup.php:596
+#, php-format
+msgid "%s is writable"
+msgstr "%s ist beschreibbar"
 
-#: ../../mod/directory.php:317
-msgid "Public Forum:"
-msgstr "Öffentliches Forum:"
+#: ../../mod/setup.php:612
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to"
+" have write access to the store directory under the Red top level folder"
+msgstr "$Projectname benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Webserver benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses"
 
-#: ../../mod/directory.php:320
-msgid "Keywords: "
-msgstr "Schlüsselwörter:"
+#: ../../mod/setup.php:616
+msgid "store is writable"
+msgstr "store ist schreibbar"
 
-#: ../../mod/directory.php:323
-msgid "Don't suggest"
-msgstr "Nicht vorschlagen"
+#: ../../mod/setup.php:649
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server."
 
-#: ../../mod/directory.php:325
-msgid "Common connections:"
-msgstr "Gemeinsame Verbindungen:"
+#: ../../mod/setup.php:650
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
+msgstr "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich."
 
-#: ../../mod/directory.php:374
-msgid "Global Directory"
-msgstr "Globales Verzeichnis"
+#: ../../mod/setup.php:651
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können."
 
-#: ../../mod/directory.php:374
-msgid "Local Directory"
-msgstr "Lokales Verzeichnis"
+#: ../../mod/setup.php:652
+msgid ""
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
+msgstr "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer $Projectname-Hubs (die mit korrekten Zertifikaten ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird)."
 
-#: ../../mod/directory.php:380
-msgid "Finding:"
-msgstr "Ergebnisse:"
+#: ../../mod/setup.php:653
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen."
 
-#: ../../mod/directory.php:385
-msgid "next page"
-msgstr "nächste Seite"
+#: ../../mod/setup.php:654
+msgid ""
+"Providers are available that issue free certificates which are browser-"
+"valid."
+msgstr "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind."
 
-#: ../../mod/directory.php:385
-msgid "previous page"
-msgstr "vorherige Seite"
+#: ../../mod/setup.php:656
+msgid "SSL certificate validation"
+msgstr "SSL Zertifikatverifizierung"
 
-#: ../../mod/directory.php:386
-msgid "Sort options"
-msgstr "Sortieroptionen"
+#: ../../mod/setup.php:662
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server "
+"configuration.Test: "
+msgstr "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:"
 
-#: ../../mod/directory.php:387
-msgid "Alphabetic"
-msgstr "alphabetisch"
+#: ../../mod/setup.php:665
+msgid "Url rewrite is working"
+msgstr "Url rewrite funktioniert"
 
-#: ../../mod/directory.php:388
-msgid "Reverse Alphabetic"
-msgstr "Entgegengesetzt alphabetisch"
+#: ../../mod/setup.php:674
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
 
-#: ../../mod/directory.php:389
-msgid "Newest to Oldest"
-msgstr "Neueste zuerst"
+#: ../../mod/setup.php:698
+msgid "Errors encountered creating database tables."
+msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
 
-#: ../../mod/directory.php:390
-msgid "Oldest to Newest"
-msgstr "Älteste zuerst"
+#: ../../mod/setup.php:732
+msgid "<h1>What next</h1>"
+msgstr "<h1>Was als Nächstes</h1>"
 
-#: ../../mod/directory.php:407
-msgid "No entries (some entries may be hidden)."
-msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
+#: ../../mod/setup.php:733
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten."
 
 #: ../../mod/bookmarks.php:40
 msgid "Bookmark added"
@@ -4276,442 +5232,303 @@ msgstr "Meine Lesezeichen"
 msgid "My Connections Bookmarks"
 msgstr "Lesezeichen meiner Kontakte"
 
-#: ../../mod/openid.php:26
-msgid "OpenID protocol error. No ID returned."
-msgstr "OpenID Protokollfehler. Keine ID zurückgegeben."
-
-#: ../../mod/openid.php:72 ../../mod/openid.php:179 ../../mod/post.php:285
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
-
-#: ../../mod/block.php:27 ../../mod/page.php:36
-msgid "Invalid item."
-msgstr "Ungültiges Element."
-
-#: ../../mod/block.php:39 ../../mod/page.php:52 ../../mod/wall_upload.php:29
-msgid "Channel not found."
-msgstr "Kanal nicht gefunden."
-
-#: ../../mod/block.php:75 ../../mod/display.php:110 ../../mod/help.php:214
-#: ../../mod/page.php:89 ../../index.php:237
-msgid "Page not found."
-msgstr "Seite nicht gefunden."
-
-#: ../../mod/id.php:11
-msgid "First Name"
-msgstr "Vorname"
-
-#: ../../mod/id.php:12
-msgid "Last Name"
-msgstr "Nachname"
-
-#: ../../mod/id.php:13
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: ../../mod/id.php:14
-msgid "Full Name"
-msgstr "Voller Name"
-
-#: ../../mod/id.php:20
-msgid "Profile Photo 16px"
-msgstr "Profilfoto 16 px"
-
-#: ../../mod/id.php:21
-msgid "Profile Photo 32px"
-msgstr "Profilfoto 32 px"
-
-#: ../../mod/id.php:22
-msgid "Profile Photo 48px"
-msgstr "Profilfoto 48 px"
-
-#: ../../mod/id.php:23
-msgid "Profile Photo 64px"
-msgstr "Profilfoto 64 px"
-
-#: ../../mod/id.php:24
-msgid "Profile Photo 80px"
-msgstr "Profilfoto 80 px"
-
-#: ../../mod/id.php:25
-msgid "Profile Photo 128px"
-msgstr "Profilfoto 128 px"
-
-#: ../../mod/id.php:26
-msgid "Timezone"
-msgstr "Zeitzone"
-
-#: ../../mod/id.php:27
-msgid "Homepage URL"
-msgstr "Homepage-URL"
-
-#: ../../mod/id.php:29
-msgid "Birth Year"
-msgstr "Geburtsjahr"
-
-#: ../../mod/id.php:30
-msgid "Birth Month"
-msgstr "Geburtsmonat"
-
-#: ../../mod/id.php:31
-msgid "Birth Day"
-msgstr "Geburtstag"
-
-#: ../../mod/id.php:32
-msgid "Birthdate"
-msgstr "Geburtsdatum"
-
-#: ../../mod/id.php:33 ../../mod/profiles.php:431
-msgid "Gender"
-msgstr "Geschlecht"
-
-#: ../../mod/like.php:15
-msgid "Like/Dislike"
-msgstr "Mögen/Nicht mögen"
+#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert."
 
-#: ../../mod/like.php:20
-msgid "This action is restricted to members."
-msgstr "Diese Aktion kann nur von Mitgliedern ausgeführt werden."
+#: ../../mod/pconfig.php:49
+msgid "Configuration Editor"
+msgstr "Konfigurationseditor"
 
-#: ../../mod/like.php:21
+#: ../../mod/pconfig.php:50
 msgid ""
-"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a "
-"href=\"register\">register as a new $Projectname member</a> to continue."
-msgstr "Um fortzufahren <a href=\"rmagic\">melde Dich bitte mit Deiner $Projectname-ID an</a> oder <a href=\"register\">registriere Dich als neues $Projectname-Mitglied</a>."
-
-#: ../../mod/like.php:101 ../../mod/like.php:127 ../../mod/like.php:165
-msgid "Invalid request."
-msgstr "Ungültige Anfrage."
-
-#: ../../mod/like.php:142
-msgid "thing"
-msgstr "Sache"
-
-#: ../../mod/like.php:188
-msgid "Channel unavailable."
-msgstr "Kanal nicht vorhanden."
-
-#: ../../mod/like.php:236
-msgid "Previous action reversed."
-msgstr "Die vorherige Aktion wurde rückgängig gemacht."
-
-#: ../../mod/like.php:414
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
-msgstr "%1$s stimmt %2$ss %3$s zu"
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird."
 
-#: ../../mod/like.php:416
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
-msgstr "%1$s lehnt %2$ss %3$s ab"
+#: ../../mod/poke.php:164
+msgid "Poke/Prod"
+msgstr "Anstupsen/Knuffen"
 
-#: ../../mod/like.php:418
-#, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
-msgstr "%1$s enthält sich zu %2$ss %3$s"
+#: ../../mod/poke.php:165
+msgid "poke, prod or do other things to somebody"
+msgstr "Stupse Leute an oder mache anderes mit ihnen"
 
-#: ../../mod/like.php:420
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s nimmt an %2$ss %3$s teil"
+#: ../../mod/poke.php:166
+msgid "Recipient"
+msgstr "Empfänger"
 
-#: ../../mod/like.php:422
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s nimmt an %2$ss %3$s nicht teil"
+#: ../../mod/poke.php:167
+msgid "Choose what you wish to do to recipient"
+msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst"
 
-#: ../../mod/like.php:424
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s nimmt vielleicht an %2$ss %3$s teil"
+#: ../../mod/poke.php:170
+msgid "Make this post private"
+msgstr "Diesen Beitrag privat machen"
 
-#: ../../mod/like.php:520
-msgid "Action completed."
-msgstr "Aktion durchgeführt."
+#: ../../mod/profiles.php:19 ../../mod/profiles.php:184
+#: ../../mod/profiles.php:241 ../../mod/profiles.php:608
+msgid "Profile not found."
+msgstr "Profil nicht gefunden."
 
-#: ../../mod/like.php:521
-msgid "Thank you."
-msgstr "Vielen Dank."
+#: ../../mod/profiles.php:39
+msgid "Profile deleted."
+msgstr "Profil gelöscht."
 
-#: ../../mod/uexport.php:51 ../../mod/uexport.php:52
-msgid "Export Channel"
-msgstr "Kanal exportieren"
+#: ../../mod/profiles.php:63 ../../mod/profiles.php:99
+msgid "Profile-"
+msgstr "Profil-"
 
-#: ../../mod/uexport.php:53
-msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
-msgstr "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält."
+#: ../../mod/profiles.php:84 ../../mod/profiles.php:127
+msgid "New profile created."
+msgstr "Neues Profil erstellt."
 
-#: ../../mod/uexport.php:54
-msgid "Export Content"
-msgstr "Kanal und Inhalte exportieren"
+#: ../../mod/profiles.php:105
+msgid "Profile unavailable to clone."
+msgstr "Profil kann nicht geklont werden."
 
-#: ../../mod/uexport.php:55
-msgid ""
-"Export your channel information and recent content to a JSON backup that can"
-" be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for"
-" this download to begin."
-msgstr "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet."
+#: ../../mod/profiles.php:146
+msgid "Profile unavailable to export."
+msgstr "Dieses Profil kann nicht exportiert werden."
 
-#: ../../mod/uexport.php:56
-msgid "Export your posts from a given year."
-msgstr "Exportiert die Beiträge des angegebenen Jahres."
+#: ../../mod/profiles.php:251
+msgid "Profile Name is required."
+msgstr "Profil-Name erforderlich."
 
-#: ../../mod/uexport.php:58
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
-msgstr "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne."
+#: ../../mod/profiles.php:414
+msgid "Marital Status"
+msgstr "Familienstand"
 
-#: ../../mod/uexport.php:59
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a "
-"href=\"%1$s\">%2$s</a>"
-msgstr "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1$s\">%2$s</a>."
+#: ../../mod/profiles.php:418
+msgid "Romantic Partner"
+msgstr "Romantische Partner"
 
-#: ../../mod/uexport.php:60
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
-msgstr "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1$s\">%2$s</a>."
+#: ../../mod/profiles.php:422
+msgid "Likes"
+msgstr "Gefällt"
 
-#: ../../mod/uexport.php:61
-#, php-format
-msgid ""
-"These content files may be imported or restored by visiting <a "
-"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
-" please import or restore these in date order (oldest first)."
-msgstr "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1$s\">%2$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst."
+#: ../../mod/profiles.php:426
+msgid "Dislikes"
+msgstr "Gefällt nicht"
 
-#: ../../mod/chatsvc.php:111
-msgid "Away"
-msgstr "Abwesend"
+#: ../../mod/profiles.php:430
+msgid "Work/Employment"
+msgstr "Arbeit/Anstellung"
 
-#: ../../mod/chatsvc.php:115
-msgid "Online"
-msgstr "Online"
+#: ../../mod/profiles.php:433
+msgid "Religion"
+msgstr "Religion"
 
-#: ../../mod/tagger.php:96
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet"
+#: ../../mod/profiles.php:437
+msgid "Political Views"
+msgstr "Politische Ansichten"
 
-#: ../../mod/common.php:10
-msgid "No channel."
-msgstr "Kein Kanal."
+#: ../../mod/profiles.php:445
+msgid "Sexual Preference"
+msgstr "Sexuelle Orientierung"
 
-#: ../../mod/common.php:39
-msgid "Common connections"
-msgstr "Gemeinsame Verbindungen"
+#: ../../mod/profiles.php:449
+msgid "Homepage"
+msgstr "Webseite"
 
-#: ../../mod/common.php:44
-msgid "No connections in common."
-msgstr "Keine gemeinsamen Verbindungen."
+#: ../../mod/profiles.php:453
+msgid "Interests"
+msgstr "Hobbys/Interessen"
 
-#: ../../mod/ping.php:260
-msgid "sent you a private message"
-msgstr "hat Dir eine private Nachricht geschickt"
+#: ../../mod/profiles.php:457 ../../mod/admin.php:981
+msgid "Address"
+msgstr "Adresse"
 
-#: ../../mod/ping.php:308
-msgid "added your channel"
-msgstr "hat deinen Kanal hinzugefügt"
+#: ../../mod/profiles.php:547
+msgid "Profile updated."
+msgstr "Profil aktualisiert."
 
-#: ../../mod/ping.php:350
-msgid "posted an event"
-msgstr "hat einen Termin veröffentlicht"
+#: ../../mod/profiles.php:634
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?"
 
-#: ../../mod/help.php:147
-msgid "Documentation Search"
-msgstr "Suche in der Dokumentation"
+#: ../../mod/profiles.php:674
+msgid "Edit Profile Details"
+msgstr "Bearbeite Profil-Details"
 
-#: ../../mod/help.php:184 ../../mod/help.php:190 ../../mod/help.php:196
-msgid "Help:"
-msgstr "Hilfe:"
+#: ../../mod/profiles.php:676
+msgid "View this profile"
+msgstr "Dieses Profil ansehen"
 
-#: ../../mod/help.php:211 ../../index.php:234
-msgid "Not Found"
-msgstr "Nicht gefunden"
+#: ../../mod/profiles.php:678
+msgid "Change Profile Photo"
+msgstr "Profilfoto ändern"
 
-#: ../../mod/help.php:235
-msgid "$Projectname Documentation"
-msgstr "$Projectname-Dokumentation"
+#: ../../mod/profiles.php:679
+msgid "Create a new profile using these settings"
+msgstr "Neues Profil anlegen und diese Einstellungen übernehmen"
 
-#: ../../mod/removeme.php:29
-msgid ""
-"Channel removals are not allowed within 48 hours of changing the account "
-"password."
-msgstr "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden."
+#: ../../mod/profiles.php:680
+msgid "Clone this profile"
+msgstr "Dieses Profil klonen"
 
-#: ../../mod/removeme.php:57
-msgid "Remove This Channel"
-msgstr "Diesen Kanal löschen"
+#: ../../mod/profiles.php:681
+msgid "Delete this profile"
+msgstr "Dieses Profil löschen"
 
-#: ../../mod/removeme.php:58 ../../mod/removeaccount.php:58
-msgid "WARNING: "
-msgstr "WARNUNG: "
+#: ../../mod/profiles.php:683
+msgid "Import profile from file"
+msgstr "Profil aus einer Datei importieren"
 
-#: ../../mod/removeme.php:58
-msgid "This channel will be completely removed from the network. "
-msgstr "Dieser Kanal wird vollständig aus dem Netzwerk gelöscht."
+#: ../../mod/profiles.php:684
+msgid "Export profile to file"
+msgstr "Profil in eine Datei exportieren"
 
-#: ../../mod/removeme.php:58 ../../mod/removeaccount.php:58
-msgid "This action is permanent and can not be undone!"
-msgstr "Dieser Schritt ist endgültig und kann nicht rückgängig gemacht werden!"
+#: ../../mod/profiles.php:685
+msgid "Profile Name:"
+msgstr "Profilname:"
 
-#: ../../mod/removeme.php:59 ../../mod/removeaccount.php:59
-msgid "Please enter your password for verification:"
-msgstr "Bitte gib zur Bestätigung Dein Passwort ein:"
+#: ../../mod/profiles.php:686
+msgid "Your Full Name:"
+msgstr "Dein voller Name:"
 
-#: ../../mod/removeme.php:60
-msgid "Remove this channel and all its clones from the network"
-msgstr "Lösche diesen Kanal und all seine Klone aus dem Netzwerk"
+#: ../../mod/profiles.php:687
+msgid "Title/Description:"
+msgstr "Titel/Beschreibung:"
 
-#: ../../mod/removeme.php:60
-msgid ""
-"By default only the instance of the channel located on this hub will be "
-"removed from the network"
-msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"
+#: ../../mod/profiles.php:688
+msgid "Your Gender:"
+msgstr "Dein Geschlecht:"
 
-#: ../../mod/removeme.php:61 ../../mod/settings.php:1109
-msgid "Remove Channel"
-msgstr "Kanal löschen"
+#: ../../mod/profiles.php:689
+msgid "Birthday :"
+msgstr "Geburtstag:"
 
-#: ../../mod/filer.php:48
-msgid "- select -"
-msgstr "– auswählen –"
+#: ../../mod/profiles.php:690
+msgid "Street Address:"
+msgstr "Straße und Hausnummer:"
 
-#: ../../mod/mitem.php:24 ../../mod/menu.php:140
-msgid "Menu not found."
-msgstr "Menü nicht gefunden"
+#: ../../mod/profiles.php:691
+msgid "Locality/City:"
+msgstr "Wohnort:"
 
-#: ../../mod/mitem.php:48
-msgid "Unable to create element."
-msgstr "Element konnte nicht erstellt werden."
+#: ../../mod/profiles.php:692
+msgid "Postal/Zip Code:"
+msgstr "Postleitzahl:"
 
-#: ../../mod/mitem.php:72
-msgid "Unable to update menu element."
-msgstr "Kann Menü-Element nicht aktualisieren."
+#: ../../mod/profiles.php:693
+msgid "Country:"
+msgstr "Land:"
 
-#: ../../mod/mitem.php:88
-msgid "Unable to add menu element."
-msgstr "Kann Menü-Bestandteil nicht hinzufügen."
+#: ../../mod/profiles.php:694
+msgid "Region/State:"
+msgstr "Region/Bundesstaat:"
 
-#: ../../mod/mitem.php:116 ../../mod/menu.php:162 ../../mod/xchan.php:37
-msgid "Not found."
-msgstr "Nicht gefunden."
+#: ../../mod/profiles.php:695
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Beziehungsstatus:"
 
-#: ../../mod/mitem.php:149 ../../mod/mitem.php:222
-msgid "Menu Item Permissions"
-msgstr "Zugriffsrechte des Menü-Elements"
+#: ../../mod/profiles.php:696
+msgid "Who: (if applicable)"
+msgstr "Wer: (falls anwendbar)"
 
-#: ../../mod/mitem.php:150 ../../mod/mitem.php:223 ../../mod/settings.php:1053
-msgid "(click to open/close)"
-msgstr "(zum öffnen/schließen anklicken)"
+#: ../../mod/profiles.php:697
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/mitem.php:152 ../../mod/mitem.php:168
-msgid "Link Name"
-msgstr "Name des Links"
+#: ../../mod/profiles.php:698
+msgid "Since [date]:"
+msgstr "Seit [Datum]:"
 
-#: ../../mod/mitem.php:153 ../../mod/mitem.php:227
-msgid "Link or Submenu Target"
-msgstr "Ziel des Links oder Untermenüs"
+#: ../../mod/profiles.php:700
+msgid "Homepage URL:"
+msgstr "Homepage URL:"
 
-#: ../../mod/mitem.php:153
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen."
+#: ../../mod/profiles.php:703
+msgid "Religious Views:"
+msgstr "Religiöse Ansichten:"
 
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:228
-msgid "Use magic-auth if available"
-msgstr "Magic-Auth verwenden, falls verfügbar"
+#: ../../mod/profiles.php:704
+msgid "Keywords:"
+msgstr "Schlüsselwörter:"
 
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:229
-msgid "Open link in new window"
-msgstr "Öffne Link in neuem Fenster"
+#: ../../mod/profiles.php:707
+msgid "Example: fishing photography software"
+msgstr "Beispiel: Angeln Fotografie Software"
 
-#: ../../mod/mitem.php:156 ../../mod/mitem.php:230
-msgid "Order in list"
-msgstr "Reihenfolge in der Liste"
+#: ../../mod/profiles.php:708
+msgid "Used in directory listings"
+msgstr "Wird in Verzeichnis-Auflistungen verwendet"
 
-#: ../../mod/mitem.php:156 ../../mod/mitem.php:230
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
+#: ../../mod/profiles.php:709
+msgid "Tell us about yourself..."
+msgstr "Erzähle uns ein wenig von Dir …"
 
-#: ../../mod/mitem.php:157
-msgid "Submit and finish"
-msgstr "Absenden und fertigstellen"
+#: ../../mod/profiles.php:710
+msgid "Hobbies/Interests"
+msgstr "Hobbys/Interessen"
 
-#: ../../mod/mitem.php:158
-msgid "Submit and continue"
-msgstr "Absenden und fortfahren"
+#: ../../mod/profiles.php:711
+msgid "Contact information and Social Networks"
+msgstr "Kontaktinformation und soziale Netzwerke"
 
-#: ../../mod/mitem.php:166
-msgid "Menu:"
-msgstr "Menü:"
+#: ../../mod/profiles.php:712
+msgid "My other channels"
+msgstr "Meine anderen Kanäle"
 
-#: ../../mod/mitem.php:169
-msgid "Link Target"
-msgstr "Ziel des Links"
+#: ../../mod/profiles.php:713
+msgid "Musical interests"
+msgstr "Musikalische Interessen"
 
-#: ../../mod/mitem.php:172
-msgid "Edit menu"
-msgstr "Menü bearbeiten"
+#: ../../mod/profiles.php:714
+msgid "Books, literature"
+msgstr "Bücher, Literatur"
 
-#: ../../mod/mitem.php:175
-msgid "Edit element"
-msgstr "Bestandteil bearbeiten"
+#: ../../mod/profiles.php:715
+msgid "Television"
+msgstr "Fernsehen"
 
-#: ../../mod/mitem.php:176
-msgid "Drop element"
-msgstr "Bestandteil löschen"
+#: ../../mod/profiles.php:716
+msgid "Film/dance/culture/entertainment"
+msgstr "Film/Tanz/Kultur/Unterhaltung"
 
-#: ../../mod/mitem.php:177
-msgid "New element"
-msgstr "Neues Bestandteil"
+#: ../../mod/profiles.php:717
+msgid "Love/romance"
+msgstr "Liebe/Romantik"
 
-#: ../../mod/mitem.php:178
-msgid "Edit this menu container"
-msgstr "Diesen Menü-Container bearbeiten"
+#: ../../mod/profiles.php:718
+msgid "Work/employment"
+msgstr "Arbeit/Anstellung"
 
-#: ../../mod/mitem.php:179
-msgid "Add menu element"
-msgstr "Menüelement hinzufügen"
+#: ../../mod/profiles.php:719
+msgid "School/education"
+msgstr "Schule/Ausbildung"
 
-#: ../../mod/mitem.php:180
-msgid "Delete this menu item"
-msgstr "Lösche dieses Menü-Bestandteil"
+#: ../../mod/profiles.php:725
+msgid "This is your default profile."
+msgstr "Das ist Dein Standardprofil."
 
-#: ../../mod/mitem.php:181
-msgid "Edit this menu item"
-msgstr "Bearbeite dieses Menü-Bestandteil"
+#: ../../mod/profiles.php:736
+msgid "Age: "
+msgstr "Alter:"
 
-#: ../../mod/mitem.php:198
-msgid "Menu item not found."
-msgstr "Menü-Bestandteil nicht gefunden."
+#: ../../mod/profiles.php:779
+msgid "Edit/Manage Profiles"
+msgstr "Profile bearbeiten/verwalten"
 
-#: ../../mod/mitem.php:211
-msgid "Menu item deleted."
-msgstr "Menü-Bestandteil gelöscht."
+#: ../../mod/profiles.php:780
+msgid "Add profile things"
+msgstr "Sachen zum Profil hinzufügen"
 
-#: ../../mod/mitem.php:213
-msgid "Menu item could not be deleted."
-msgstr "Menü-Bestandteil kann nicht gelöscht werden."
+#: ../../mod/profiles.php:781
+msgid "Include desirable objects in your profile"
+msgstr "Binde begehrenswerte Dinge in Dein Profil ein"
 
-#: ../../mod/mitem.php:220
-msgid "Edit Menu Element"
-msgstr "Bearbeite Menü-Bestandteil"
+#: ../../mod/search.php:212
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Beiträge mit Schlagwort: %s"
 
-#: ../../mod/mitem.php:226
-msgid "Link text"
-msgstr "Link Text"
+#: ../../mod/search.php:214
+#, php-format
+msgid "Search results for: %s"
+msgstr "Suchergebnisse für: %s"
 
 #: ../../mod/connedit.php:75
 msgid "Could not access contact record."
@@ -4721,240 +5538,249 @@ msgstr "Konnte nicht auf den Kontakteintrag zugreifen."
 msgid "Could not locate selected profile."
 msgstr "Gewähltes Profil nicht gefunden."
 
-#: ../../mod/connedit.php:219
+#: ../../mod/connedit.php:223
 msgid "Connection updated."
 msgstr "Verbindung aktualisiert."
 
-#: ../../mod/connedit.php:221
+#: ../../mod/connedit.php:225
 msgid "Failed to update connection record."
 msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
 
-#: ../../mod/connedit.php:268
+#: ../../mod/connedit.php:272
 msgid "is now connected to"
 msgstr "ist jetzt verbunden mit"
 
-#: ../../mod/connedit.php:391
+#: ../../mod/connedit.php:395
 msgid "Could not access address book record."
 msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen."
 
-#: ../../mod/connedit.php:405
+#: ../../mod/connedit.php:409
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
 
-#: ../../mod/connedit.php:414 ../../mod/connedit.php:423
-#: ../../mod/connedit.php:432 ../../mod/connedit.php:441
-#: ../../mod/connedit.php:454
+#: ../../mod/connedit.php:418 ../../mod/connedit.php:427
+#: ../../mod/connedit.php:436 ../../mod/connedit.php:445
+#: ../../mod/connedit.php:458
 msgid "Unable to set address book parameters."
 msgstr "Konnte die Adressbuch-Parameter nicht setzen."
 
-#: ../../mod/connedit.php:478
+#: ../../mod/connedit.php:482
 msgid "Connection has been removed."
 msgstr "Verbindung wurde gelöscht."
 
-#: ../../mod/connedit.php:497
+#: ../../mod/connedit.php:501
 #, php-format
 msgid "View %s's profile"
 msgstr "%ss Profil ansehen"
 
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:505
 msgid "Refresh Permissions"
 msgstr "Zugriffsrechte neu laden"
 
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:508
 msgid "Fetch updated permissions"
 msgstr "Aktualisierte Zugriffsrechte abfragen"
 
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:512
 msgid "Recent Activity"
 msgstr "Kürzliche Aktivitäten"
 
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:515
 msgid "View recent posts and comments"
 msgstr "Betrachte die neuesten Beiträge und Kommentare"
 
-#: ../../mod/connedit.php:515 ../../mod/admin.php:785
+#: ../../mod/connedit.php:519 ../../mod/admin.php:818
 msgid "Unblock"
 msgstr "Freigeben"
 
-#: ../../mod/connedit.php:515 ../../mod/admin.php:784
+#: ../../mod/connedit.php:519 ../../mod/admin.php:817
 msgid "Block"
 msgstr "Blockieren"
 
-#: ../../mod/connedit.php:518
+#: ../../mod/connedit.php:522
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Jegliche Kommunikation mit dieser Verbindung blockieren/zulassen"
 
-#: ../../mod/connedit.php:519
+#: ../../mod/connedit.php:523
 msgid "This connection is blocked!"
 msgstr "Die Verbindung ist geblockt!"
 
-#: ../../mod/connedit.php:523
+#: ../../mod/connedit.php:527
 msgid "Unignore"
 msgstr "Nicht ignorieren"
 
-#: ../../mod/connedit.php:523 ../../mod/notifications.php:51
+#: ../../mod/connedit.php:527 ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../../mod/connedit.php:526
+#: ../../mod/connedit.php:530
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Jegliche eingehende Kommunikation von dieser Verbindung ignorieren/zulassen"
 
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:531
 msgid "This connection is ignored!"
 msgstr "Die Verbindung wird ignoriert!"
 
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:535
 msgid "Unarchive"
 msgstr "Aus Archiv zurückholen"
 
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:535
 msgid "Archive"
 msgstr "Archivieren"
 
-#: ../../mod/connedit.php:534
+#: ../../mod/connedit.php:538
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Verbindung archivieren/aus dem Archiv zurückholen (Archiv = Kanal als erloschen markieren, aber die Beiträge behalten)"
 
-#: ../../mod/connedit.php:535
+#: ../../mod/connedit.php:539
 msgid "This connection is archived!"
 msgstr "Die Verbindung ist archiviert!"
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:543
 msgid "Unhide"
 msgstr "Wieder sichtbar machen"
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:543
 msgid "Hide"
 msgstr "Verstecken"
 
-#: ../../mod/connedit.php:542
+#: ../../mod/connedit.php:546
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Diese Verbindung vor anderen Verbindungen verstecken/zeigen"
 
-#: ../../mod/connedit.php:543
+#: ../../mod/connedit.php:547
 msgid "This connection is hidden!"
 msgstr "Die Verbindung ist versteckt!"
 
-#: ../../mod/connedit.php:550
+#: ../../mod/connedit.php:554
 msgid "Delete this connection"
 msgstr "Verbindung löschen"
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:635
 msgid "Approve this connection"
 msgstr "Verbindung genehmigen"
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:635
 msgid "Accept connection to allow communication"
 msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen"
 
-#: ../../mod/connedit.php:636
+#: ../../mod/connedit.php:640
 msgid "Set Affinity"
 msgstr "Beziehung festlegen"
 
-#: ../../mod/connedit.php:639
+#: ../../mod/connedit.php:643
 msgid "Set Profile"
 msgstr "Profil festlegen"
 
-#: ../../mod/connedit.php:642
+#: ../../mod/connedit.php:646
 msgid "Set Affinity & Profile"
 msgstr "Beziehung und Profile festlegen"
 
-#: ../../mod/connedit.php:659
+#: ../../mod/connedit.php:679
+msgid "none"
+msgstr "Keine"
+
+#: ../../mod/connedit.php:684
 msgid "Apply these permissions automatically"
 msgstr "Diese Berechtigungen automatisch anwenden"
 
-#: ../../mod/connedit.php:661
-msgid "This connection's address is"
-msgstr "Die Adresse dieses Kontakts ist"
+#: ../../mod/connedit.php:686
+msgid "This connection's primary address is"
+msgstr "Die Hauptadresse der Verbindung ist"
+
+#: ../../mod/connedit.php:687
+msgid "Available locations:"
+msgstr "Verfügbare Standorte:"
 
-#: ../../mod/connedit.php:664
+#: ../../mod/connedit.php:691
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Die auf dieser Seite angegebenen Berechtigungen werden auf alle neuen Verbindungen angewendet."
 
-#: ../../mod/connedit.php:666
+#: ../../mod/connedit.php:693
 msgid "Slide to adjust your degree of friendship"
 msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
 
-#: ../../mod/connedit.php:668
+#: ../../mod/connedit.php:695
 msgid "Slide to adjust your rating"
 msgstr "Verschieben, um Deine Bewertung einzustellen"
 
-#: ../../mod/connedit.php:669 ../../mod/connedit.php:674
+#: ../../mod/connedit.php:696 ../../mod/connedit.php:701
 msgid "Optionally explain your rating"
 msgstr "Optional kannst Du Deine Bewertung begründen"
 
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:698
 msgid "Custom Filter"
 msgstr "Benutzerdefinierter Filter"
 
-#: ../../mod/connedit.php:672
+#: ../../mod/connedit.php:699
 msgid "Only import posts with this text"
 msgstr "Nur Beiträge mit diesem Text importieren"
 
-#: ../../mod/connedit.php:672 ../../mod/connedit.php:673
+#: ../../mod/connedit.php:699 ../../mod/connedit.php:700
 msgid ""
-"words one per line or #tags or /patterns/, leave blank to import all posts"
-msgstr "Einzelne Wörter pro Zeile, #Tags oder /Reguläre Ausdrücke/. lang=xx (z.B. lang=de) ermöglicht Filterung nach Sprache. Leer lassen, um alle Posts zu importieren."
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr "Einzelne Wörter pro Zeile, #Tags oder /Reguläre Ausdrücke/. lang=xx (z.B. lang=de) ermöglicht Filterung nach Sprache. Leer lassen, um alle Beiträge zu importieren."
 
-#: ../../mod/connedit.php:673
+#: ../../mod/connedit.php:700
 msgid "Do not import posts with this text"
 msgstr "Beiträge mit diesem Text nicht importieren"
 
-#: ../../mod/connedit.php:675
+#: ../../mod/connedit.php:702
 msgid "This information is public!"
 msgstr "Diese Information ist öffentlich!"
 
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:707
 msgid "Connection Pending Approval"
 msgstr "Verbindung wartet auf Bestätigung"
 
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:708
 msgid "Connection Request"
 msgstr "Verbindungsanfrage"
 
-#: ../../mod/connedit.php:682
+#: ../../mod/connedit.php:709
 #, php-format
 msgid ""
 "(%s) would like to connect with you. Please approve this connection to allow"
 " communication."
 msgstr "(%s) möchte sich mit Dir verbinden. Bitte genehmige die Verbindung, um Kommunikation zu ermöglichen."
 
-#: ../../mod/connedit.php:683 ../../mod/admin.php:781
+#: ../../mod/connedit.php:710 ../../mod/admin.php:814
 msgid "Approve"
 msgstr "Genehmigen"
 
-#: ../../mod/connedit.php:684
+#: ../../mod/connedit.php:711
 msgid "Approve Later"
 msgstr "Später genehmigen"
 
-#: ../../mod/connedit.php:687
+#: ../../mod/connedit.php:714
 msgid "inherited"
 msgstr "geerbt"
 
-#: ../../mod/connedit.php:689
+#: ../../mod/connedit.php:716
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
 
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:718
 msgid "Their Settings"
 msgstr "Deren Einstellungen"
 
-#: ../../mod/connedit.php:692
+#: ../../mod/connedit.php:719
 msgid "My Settings"
 msgstr "Meine Einstellungen"
 
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:721
 msgid "Individual Permissions"
 msgstr "Individuelle Zugriffsrechte"
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:722
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4962,7 +5788,7 @@ msgid ""
 " settings here."
 msgstr "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals vererbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung und können hier nicht verändert werden."
 
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:723
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4970,323 +5796,766 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung. Werden geerbte Einstellungen hier geändert, hat dies keine Auswirkungen."
 
-#: ../../mod/connedit.php:697
+#: ../../mod/connedit.php:724
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
-#: ../../mod/mood.php:132
-msgid "Set your current mood and tell your friends"
-msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"
+#: ../../mod/acl.php:222
+msgid "network"
+msgstr "Netzwerk"
 
-#: ../../mod/magic.php:69
-msgid "Hub not found."
-msgstr "Server nicht gefunden."
+#: ../../mod/acl.php:232
+msgid "RSS"
+msgstr "RSS"
 
-#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
-msgid "This setting requires special processing and editing has been blocked."
-msgstr "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert."
+#: ../../mod/dav.php:121
+msgid "$Projectname channel"
+msgstr "$Projectname-Kanal"
 
-#: ../../mod/pconfig.php:49
-msgid "Configuration Editor"
-msgstr "Konfigurationseditor"
+#: ../../mod/dreport.php:23
+msgid "Invalid message"
+msgstr "Ungültige Beitrags-ID (mid)"
 
-#: ../../mod/pconfig.php:50
+#: ../../mod/dreport.php:55
+msgid "no results"
+msgstr "keine Ergebnisse"
+
+#: ../../mod/dreport.php:60
+#, php-format
+msgid "Delivery report for %1$s"
+msgstr "Zustellungsbericht für %1$s"
+
+#: ../../mod/dreport.php:74
+msgid "channel sync processed"
+msgstr "Kanal-Sync verarbeitet"
+
+#: ../../mod/dreport.php:78
+msgid "queued"
+msgstr "zur Warteschlange hinzugefügt"
+
+#: ../../mod/dreport.php:82
+msgid "posted"
+msgstr "zugestellt"
+
+#: ../../mod/dreport.php:86
+msgid "accepted for delivery"
+msgstr "für Zustellung akzeptiert"
+
+#: ../../mod/dreport.php:90
+msgid "updated"
+msgstr "aktualisiert"
+
+#: ../../mod/dreport.php:93
+msgid "update ignored"
+msgstr "Aktualisierung ignoriert"
+
+#: ../../mod/dreport.php:96
+msgid "permission denied"
+msgstr "Zugriff verweigert"
+
+#: ../../mod/dreport.php:100
+msgid "recipient not found"
+msgstr "Empfänger nicht gefunden."
+
+#: ../../mod/dreport.php:103
+msgid "mail recalled"
+msgstr "Mail widerrufen"
+
+#: ../../mod/dreport.php:106
+msgid "duplicate mail received"
+msgstr "Doppelte Mail erhalten"
+
+#: ../../mod/dreport.php:109
+msgid "mail delivered"
+msgstr "Mail zugestellt"
+
+#: ../../mod/editwebpage.php:77 ../../mod/editblock.php:78
+#: ../../mod/editblock.php:94 ../../mod/editlayout.php:76
+#: ../../mod/editpost.php:20
+msgid "Item not found"
+msgstr "Element nicht gefunden"
+
+#: ../../mod/editwebpage.php:153
+msgid "Delete webpage?"
+msgstr "Webseite löschen?"
+
+#: ../../mod/editwebpage.php:172
+msgid "Page link title"
+msgstr "Seitentitel-Link"
+
+#: ../../mod/editwebpage.php:185 ../../mod/editblock.php:145
+#: ../../mod/editlayout.php:143 ../../mod/editpost.php:121
+msgid "Insert YouTube video"
+msgstr "YouTube-Video einfügen"
+
+#: ../../mod/editwebpage.php:186 ../../mod/editblock.php:146
+#: ../../mod/editlayout.php:144 ../../mod/editpost.php:122
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Vorbis [.ogg]-Video einfügen"
+
+#: ../../mod/editwebpage.php:187 ../../mod/editblock.php:147
+#: ../../mod/editlayout.php:145 ../../mod/editpost.php:123
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Vorbis [.ogg]-Audio einfügen"
+
+#: ../../mod/editwebpage.php:222
+msgid "Edit Webpage"
+msgstr "Webseite bearbeiten"
+
+#: ../../mod/oexchange.php:23
+msgid "Unable to find your hub."
+msgstr "Konnte Deinen Server nicht finden."
+
+#: ../../mod/oexchange.php:37
+msgid "Post successful."
+msgstr "Veröffentlichung erfolgreich."
+
+#: ../../mod/ping.php:260
+msgid "sent you a private message"
+msgstr "hat Dir eine private Nachricht geschickt"
+
+#: ../../mod/ping.php:308
+msgid "added your channel"
+msgstr "hat deinen Kanal hinzugefügt"
+
+#: ../../mod/ping.php:350
+msgid "posted an event"
+msgstr "hat einen Termin veröffentlicht"
+
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Zugriff für die Anwendung autorisieren"
+
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Trage folgenden Sicherheitscode in der Anwendung ein:"
+
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr "Zum Weitermachen, bitte einloggen."
+
+#: ../../mod/api.php:104
 msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please"
-" leave this page unless you are comfortable with and knowledgeable about how"
-" to correctly use this feature."
-msgstr "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird."
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
 
-#: ../../mod/pubsites.php:16
-msgid "Public Sites"
-msgstr "Öffentliche Server"
+#: ../../mod/notify.php:53 ../../mod/notifications.php:94
+msgid "No more system notifications."
+msgstr "Keine System-Benachrichtigungen mehr."
+
+#: ../../mod/notify.php:57 ../../mod/notifications.php:98
+msgid "System Notifications"
+msgstr "System-Benachrichtigungen"
+
+#: ../../mod/rbmark.php:90
+msgid "Select a bookmark folder"
+msgstr "Lesezeichenordner wählen"
 
-#: ../../mod/pubsites.php:19
+#: ../../mod/rbmark.php:95
+msgid "Save Bookmark"
+msgstr "Lesezeichen speichern"
+
+#: ../../mod/rbmark.php:96
+msgid "URL of bookmark"
+msgstr "URL des Lesezeichens"
+
+#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:450
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../../mod/rbmark.php:101
+msgid "Or enter new bookmark folder name"
+msgstr "Oder gib einen neuen Namen für den Lesezeichenordner ein"
+
+#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+msgid "Contact not found."
+msgstr "Kontakt nicht gefunden"
+
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
+msgstr "Freundschaftsempfehlung senden."
+
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
+msgstr "Kontakte vorschlagen"
+
+#: ../../mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Schlage %s einen Kontakt vor"
+
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
+msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."
+
+#: ../../mod/sources.php:45
+msgid "Source created."
+msgstr "Quelle erstellt."
+
+#: ../../mod/sources.php:57
+msgid "Source updated."
+msgstr "Quelle aktualisiert."
+
+#: ../../mod/sources.php:82
+msgid "*"
+msgstr "*"
+
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
+msgstr "Externe Inhaltsquellen für Deinen Kanal verwalten."
+
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
+msgstr "Neue Quelle"
+
+#: ../../mod/sources.php:101 ../../mod/sources.php:133
 msgid ""
-"The listed sites allow public registration for the $Projectname network. All"
-" sites in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some sites may require subscription or"
-" provide tiered service plans. The provider links <strong>may</strong> "
-"provide additional details."
-msgstr "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung bei $Projectname. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen anderen Servern ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den verlinkten Seiten <strong>könnten</strong> nähere Details dazu stehen."
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
 
-#: ../../mod/pubsites.php:25
-msgid "Rate this hub"
-msgstr "Bewerte diesen Hub"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
+msgstr "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
 
-#: ../../mod/pubsites.php:26
-msgid "Site URL"
-msgstr "Server-URL"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
+msgstr "Leer lassen, um alle öffentlichen Beiträge zu importieren"
 
-#: ../../mod/pubsites.php:26
-msgid "Access Type"
-msgstr "Zugangstyp"
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
+msgstr "Quelle nicht gefunden."
 
-#: ../../mod/pubsites.php:26
-msgid "Registration Policy"
-msgstr "Registrierungsrichtlinien"
+#: ../../mod/sources.php:130
+msgid "Edit Source"
+msgstr "Quelle bearbeiten"
 
-#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
-msgid "Location"
-msgstr "Ort"
+#: ../../mod/sources.php:131
+msgid "Delete Source"
+msgstr "Quelle löschen"
 
-#: ../../mod/pubsites.php:26
-msgid "View hub ratings"
-msgstr "Bewertungen dieses Hubs ansehen"
+#: ../../mod/sources.php:158
+msgid "Source removed"
+msgstr "Quelle gelöscht"
 
-#: ../../mod/pubsites.php:30
-msgid "Rate"
-msgstr "Bewerten"
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
+msgstr "Konnte die Quelle nicht löschen."
 
-#: ../../mod/pubsites.php:31
-msgid "View ratings"
-msgstr "Bewertungen ansehen"
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr "Ungültiger Anfrage-Identifikator."
 
-#: ../../mod/filestorage.php:82
-msgid "Permission Denied."
-msgstr "Zugriff verweigert."
+#: ../../mod/notifications.php:35
+msgid "Discard"
+msgstr "Verwerfen"
 
-#: ../../mod/filestorage.php:98
-msgid "File not found."
-msgstr "Datei nicht gefunden."
+#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
+msgid "Tag removed"
+msgstr "Schlagwort entfernt"
 
-#: ../../mod/filestorage.php:141
-msgid "Edit file permissions"
-msgstr "Dateiberechtigungen bearbeiten"
+#: ../../mod/tagrm.php:119
+msgid "Remove Item Tag"
+msgstr "Schlagwort entfernen"
 
-#: ../../mod/filestorage.php:150
-msgid "Set/edit permissions"
-msgstr "Berechtigungen setzen/ändern"
+#: ../../mod/tagrm.php:121
+msgid "Select a tag to remove: "
+msgstr "Schlagwort zum Entfernen auswählen:"
 
-#: ../../mod/filestorage.php:151
-msgid "Include all files and sub folders"
-msgstr "Alle Dateien und Unterverzeichnisse einbinden"
+#: ../../mod/tagrm.php:133 ../../mod/photos.php:951
+msgid "Remove"
+msgstr "Entferne"
 
-#: ../../mod/filestorage.php:152
-msgid "Return to file list"
-msgstr "Zurück zur Dateiliste"
+#: ../../mod/directory.php:236
+#, php-format
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] "%d Bewertung"
+msgstr[1] "%d Bewertungen"
 
-#: ../../mod/filestorage.php:154
-msgid "Copy/paste this code to attach file to a post"
-msgstr "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen"
+#: ../../mod/directory.php:247
+msgid "Gender: "
+msgstr "Geschlecht:"
 
-#: ../../mod/filestorage.php:155
-msgid "Copy/paste this URL to link file from a web page"
-msgstr "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken"
+#: ../../mod/directory.php:249
+msgid "Status: "
+msgstr "Status:"
 
-#: ../../mod/filestorage.php:157
-msgid "Share this file"
-msgstr "Diese Datei freigeben"
+#: ../../mod/directory.php:251
+msgid "Homepage: "
+msgstr "Webseite:"
 
-#: ../../mod/filestorage.php:158
-msgid "Show URL to this file"
-msgstr "URL zu dieser Datei anzeigen"
+#: ../../mod/directory.php:310
+msgid "Description:"
+msgstr "Beschreibung:"
 
-#: ../../mod/filestorage.php:159
-msgid "Notify your contacts about this file"
-msgstr "Meine Kontakte über diese Datei benachrichtigen"
+#: ../../mod/directory.php:319
+msgid "Public Forum:"
+msgstr "Öffentliches Forum:"
 
-#: ../../mod/layouts.php:121 ../../mod/layouts.php:179
-#: ../../mod/editlayout.php:161
-msgid "Layout Name"
-msgstr "Layout-Name"
+#: ../../mod/directory.php:322
+msgid "Keywords: "
+msgstr "Schlüsselwörter:"
 
-#: ../../mod/layouts.php:124 ../../mod/editlayout.php:159
-msgid "Layout Description (Optional)"
-msgstr "Layout-Beschreibung (optional)"
+#: ../../mod/directory.php:325
+msgid "Don't suggest"
+msgstr "Nicht vorschlagen"
 
-#: ../../mod/layouts.php:176
-msgid "Comanche page description language help"
-msgstr "Hilfe zur Comanche-Seitenbeschreibungssprache"
+#: ../../mod/directory.php:327
+msgid "Common connections:"
+msgstr "Gemeinsame Verbindungen:"
 
-#: ../../mod/layouts.php:180
-msgid "Layout Description"
-msgstr "Layout-Beschreibung"
+#: ../../mod/directory.php:376
+msgid "Global Directory"
+msgstr "Globales Verzeichnis"
 
-#: ../../mod/layouts.php:185
-msgid "Download PDL file"
-msgstr "PDL-Datei herunterladen"
+#: ../../mod/directory.php:376
+msgid "Local Directory"
+msgstr "Lokales Verzeichnis"
 
-#: ../../mod/poke.php:164
-msgid "Poke/Prod"
-msgstr "Anstupsen/Knuffen"
+#: ../../mod/directory.php:382
+msgid "Finding:"
+msgstr "Ergebnisse:"
 
-#: ../../mod/poke.php:165
-msgid "poke, prod or do other things to somebody"
-msgstr "Stupse Leute an oder mache anderes mit ihnen"
+#: ../../mod/directory.php:387
+msgid "next page"
+msgstr "nächste Seite"
 
-#: ../../mod/poke.php:166
-msgid "Recipient"
-msgstr "Empfänger"
+#: ../../mod/directory.php:387
+msgid "previous page"
+msgstr "vorherige Seite"
 
-#: ../../mod/poke.php:167
-msgid "Choose what you wish to do to recipient"
-msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst"
+#: ../../mod/directory.php:388
+msgid "Sort options"
+msgstr "Sortieroptionen"
 
-#: ../../mod/poke.php:170
-msgid "Make this post private"
-msgstr "Diesen Beitrag privat machen"
+#: ../../mod/directory.php:389
+msgid "Alphabetic"
+msgstr "alphabetisch"
 
-#: ../../mod/network.php:91
-msgid "No such group"
-msgstr "Sammlung nicht gefunden"
+#: ../../mod/directory.php:390
+msgid "Reverse Alphabetic"
+msgstr "Entgegengesetzt alphabetisch"
 
-#: ../../mod/network.php:131
-msgid "No such channel"
-msgstr "Kanal nicht gefunden"
+#: ../../mod/directory.php:391
+msgid "Newest to Oldest"
+msgstr "Neueste zuerst"
 
-#: ../../mod/network.php:136
-msgid "forum"
-msgstr "Forum"
+#: ../../mod/directory.php:392
+msgid "Oldest to Newest"
+msgstr "Älteste zuerst"
 
-#: ../../mod/network.php:148
-msgid "Search Results For:"
-msgstr "Suchergebnisse für:"
+#: ../../mod/directory.php:409
+msgid "No entries (some entries may be hidden)."
+msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
 
-#: ../../mod/network.php:207
-msgid "Collection is empty"
-msgstr "Sammlung ist leer"
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
+msgstr "Kein gültiges Konto gefunden."
 
-#: ../../mod/network.php:216
-msgid "Collection: "
-msgstr "Sammlung:"
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
+msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."
 
-#: ../../mod/network.php:242
-msgid "Invalid connection."
-msgstr "Ungültige Verbindung."
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Nutzer (%s)"
 
-#: ../../mod/chat.php:19 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Passwort-Rücksetzung auf %s angefordert"
 
-#: ../../mod/chat.php:171
-msgid "Room not found"
-msgstr "Chatraum nicht gefunden"
+#: ../../mod/lostpass.php:63
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
 
-#: ../../mod/chat.php:182
-msgid "Leave Room"
-msgstr "Raum verlassen"
+#: ../../mod/lostpass.php:86 ../../boot.php:1489
+msgid "Password Reset"
+msgstr "Zurücksetzen des Kennworts"
 
-#: ../../mod/chat.php:183
-msgid "Delete This Room"
-msgstr "Diesen Raum löschen"
+#: ../../mod/lostpass.php:87
+msgid "Your password has been reset as requested."
+msgstr "Dein Passwort wurde wie angefordert neu erstellt."
 
-#: ../../mod/chat.php:184
-msgid "I am away right now"
-msgstr "Ich bin gerade nicht da"
+#: ../../mod/lostpass.php:88
+msgid "Your new password is"
+msgstr "Dein neues Passwort lautet"
 
-#: ../../mod/chat.php:185
-msgid "I am online"
-msgstr "Ich bin online"
+#: ../../mod/lostpass.php:89
+msgid "Save or copy your new password - and then"
+msgstr "Speichere oder kopiere Dein neues Passwort – und dann"
 
-#: ../../mod/chat.php:187
-msgid "Bookmark this room"
-msgstr "Lesezeichen für diesen Raum setzen"
+#: ../../mod/lostpass.php:90
+msgid "click here to login"
+msgstr "Klicke hier, um dich anzumelden"
 
-#: ../../mod/chat.php:205 ../../mod/chat.php:227
-msgid "New Chatroom"
-msgstr "Neuer Chatraum"
+#: ../../mod/lostpass.php:91
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden."
 
-#: ../../mod/chat.php:206
-msgid "Chatroom Name"
-msgstr "Name des Chatraums"
+#: ../../mod/lostpass.php:108
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Auf %s wurde Dein Passwort geändert"
+
+#: ../../mod/lostpass.php:123
+msgid "Forgot your Password?"
+msgstr "Kennwort vergessen?"
+
+#: ../../mod/lostpass.php:124
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."
+
+#: ../../mod/lostpass.php:125
+msgid "Email Address"
+msgstr "E-Mail Adresse"
 
-#: ../../mod/chat.php:223
+#: ../../mod/lostpass.php:126
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Diese Webseite ist kein Verzeichnisserver"
+
+#: ../../mod/impel.php:192
 #, php-format
-msgid "%1$s's Chatrooms"
-msgstr "%1$ss Chaträume"
+msgid "%s element installed"
+msgstr "Element für %s installiert"
 
-#: ../../mod/search.php:209
+#: ../../mod/impel.php:195
 #, php-format
-msgid "Items tagged with: %s"
-msgstr "Beiträge mit Schlagwort: %s"
+msgid "%s element installation failed"
+msgstr "Installation des Elements %s fehlgeschlagen"
 
-#: ../../mod/search.php:211
+#: ../../mod/subthread.php:114
 #, php-format
-msgid "Search results for: %s"
-msgstr "Suchergebnisse für: %s"
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s folgt nun %2$ss %3$s"
 
-#: ../../mod/message.php:34
-msgid "Conversation removed."
-msgstr "Unterhaltung gelöscht."
+#: ../../mod/subthread.php:116
+#, php-format
+msgid "%1$s stopped following %2$s's %3$s"
+msgstr "%1$s folgt %2$ss %3$s nicht mehr"
 
-#: ../../mod/channel.php:97
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
+#: ../../mod/import.php:28
+#, php-format
+msgid "Your service plan only allows %d channels."
+msgstr "Dein Vertrag erlaubt nur %d Kanäle."
 
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
-#: ../../mod/editblock.php:94 ../../mod/editlayout.php:76
-#: ../../mod/editwebpage.php:77
-msgid "Item not found"
-msgstr "Element nicht gefunden"
+#: ../../mod/import.php:66 ../../mod/import_items.php:38
+msgid "Nothing to import."
+msgstr "Nichts zu importieren."
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "Element kann nicht bearbeitet werden."
+#: ../../mod/import.php:90 ../../mod/import_items.php:62
+msgid "Unable to download data from old server"
+msgstr "Daten können vom alten Server nicht heruntergeladen werden"
 
-#: ../../mod/editpost.php:55
-msgid "Delete item?"
-msgstr "Eintrag löschen?"
+#: ../../mod/import.php:96 ../../mod/import_items.php:68
+msgid "Imported file is empty."
+msgstr "Die importierte Datei ist leer."
 
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:145
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
-msgid "Insert YouTube video"
-msgstr "YouTube-Video einfügen"
+#: ../../mod/import.php:116 ../../mod/import_items.php:82
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Achtung: Datenbankversionen unterscheiden sich um %1$d Aktualisierungen."
 
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:146
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Vorbis [.ogg]-Video einfügen"
+#: ../../mod/import.php:149
+msgid "No channel. Import failed."
+msgstr "Kein Kanal. Import fehlgeschlagen."
 
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:147
-#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Vorbis [.ogg]-Audio einfügen"
+#: ../../mod/import.php:509
+msgid "You must be logged in to use this feature."
+msgstr "Du musst angemeldet sein um diese Funktion zu nutzen."
 
-#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
-msgid "Edit post"
-msgstr "Bearbeite Beitrag"
+#: ../../mod/import.php:514
+msgid "Import Channel"
+msgstr "Kanal importieren"
 
-#: ../../mod/dreport.php:15
-msgid "Invalid message"
-msgstr "Ungültige Beitrags-ID (mid)"
+#: ../../mod/import.php:515
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You"
+" may retrieve the channel identity from the old server/hub via the network "
+"or provide an export file."
+msgstr "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren."
 
-#: ../../mod/dreport.php:25
-msgid "no results"
-msgstr "keine Ergebnisse"
+#: ../../mod/import.php:516 ../../mod/import_items.php:121
+msgid "File to Upload"
+msgstr "Hochzuladende Datei:"
+
+#: ../../mod/import.php:517
+msgid "Or provide the old server/hub details"
+msgstr "Oder gib die Details Deines bisherigen $Projectname-Hubs ein"
 
-#: ../../mod/dreport.php:30
+#: ../../mod/import.php:518
+msgid "Your old identity address (xyz@example.com)"
+msgstr "Bisherige Kanal-Adresse (xyz@example.com)"
+
+#: ../../mod/import.php:519
+msgid "Your old login email address"
+msgstr "Deine alte Login-E-Mail-Adresse"
+
+#: ../../mod/import.php:520
+msgid "Your old login password"
+msgstr "Dein altes Passwort"
+
+#: ../../mod/import.php:521
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be"
+" able to post from either location, but only one can be marked as the "
+"primary location for files, photos, and media."
+msgstr "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige $Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein."
+
+#: ../../mod/import.php:522
+msgid "Make this hub my primary location"
+msgstr "Dieser $Pojectname-Hub ist mein primärer Hub."
+
+#: ../../mod/import.php:523
+msgid ""
+"Import existing posts if possible (experimental - limited by available "
+"memory"
+msgstr "Importiere bestehende Beiträge falls möglich (experimentell - begrenzt durch zur Verfügung stehenden Speicher"
+
+#: ../../mod/import.php:524
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen."
+
+#: ../../mod/invite.php:25
+msgid "Total invitation limit exceeded."
+msgstr "Einladungslimit überschritten."
+
+#: ../../mod/invite.php:49
 #, php-format
-msgid "Delivery report for %1$s"
-msgstr "Zustellungsbericht für %1$s"
+msgid "%s : Not a valid email address."
+msgstr "%s : Keine gültige Email Adresse."
 
-#: ../../mod/dreport.php:39
-msgid "channel sync processed"
-msgstr "Kanal-Sync verarbeitet"
+#: ../../mod/invite.php:59
+msgid "Please join us on $Projectname"
+msgstr "Schließe Dich uns auf $Projectname an!"
 
-#: ../../mod/dreport.php:43
-msgid "queued"
-msgstr "zur Warteschlange hinzugefügt"
+#: ../../mod/invite.php:70
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines $Projectname-Servers."
 
-#: ../../mod/dreport.php:47
-msgid "posted"
-msgstr "zugestellt"
+#: ../../mod/invite.php:75
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Nachricht konnte nicht zugestellt werden."
 
-#: ../../mod/dreport.php:51
-msgid "accepted for delivery"
-msgstr "für Zustellung akzeptiert"
+#: ../../mod/invite.php:79
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d Nachricht gesendet."
+msgstr[1] "%d Nachrichten gesendet."
 
-#: ../../mod/dreport.php:55
-msgid "updated"
-msgstr "aktualisiert"
+#: ../../mod/invite.php:98
+msgid "You have no more invitations available"
+msgstr "Du hast keine weiteren verfügbare Einladungen"
 
-#: ../../mod/dreport.php:58
-msgid "update ignored"
-msgstr "Aktualisierung ignoriert"
+#: ../../mod/invite.php:129
+msgid "Send invitations"
+msgstr "Einladungen senden"
 
-#: ../../mod/dreport.php:61
-msgid "permission denied"
-msgstr "Zugriff verweigert"
+#: ../../mod/invite.php:130
+msgid "Enter email addresses, one per line:"
+msgstr "Email-Adressen eintragen, eine pro Zeile:"
+
+#: ../../mod/invite.php:131 ../../mod/mail.php:246
+msgid "Your message:"
+msgstr "Deine Nachricht:"
+
+#: ../../mod/invite.php:132
+msgid "Please join my community on $Projectname."
+msgstr "Schließe Dich uns auf $Projectname an!"
+
+#: ../../mod/invite.php:134
+msgid "You will need to supply this invitation code: "
+msgstr "Gib folgenden Einladungs-Code ein:"
+
+#: ../../mod/invite.php:135
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Registriere Dich auf einem beliebigen $Projectname-Hub (sie sind alle miteinander verbunden)"
+
+#: ../../mod/invite.php:137
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Gib meine $Projectname-Adresse im Suchfeld ein."
+
+#: ../../mod/invite.php:138
+msgid "or visit "
+msgstr "oder besuche"
+
+#: ../../mod/invite.php:140
+msgid "3. Click [Connect]"
+msgstr "3. Klicke auf [Verbinden]"
+
+#: ../../mod/probe.php:24 ../../mod/probe.php:30
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr "Abrufen der URL gab einen Fehler zurück: %1$s"
+
+#: ../../mod/profile_photo.php:112
+msgid "Image uploaded but image cropping failed."
+msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."
+
+#: ../../mod/profile_photo.php:166
+msgid "Image resize failed."
+msgstr "Bild-Anpassung fehlgeschlagen."
+
+#: ../../mod/profile_photo.php:212
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
+
+#: ../../mod/profile_photo.php:250
+msgid "Image upload failed."
+msgstr "Hochladen des Bilds fehlgeschlagen."
+
+#: ../../mod/profile_photo.php:269
+msgid "Unable to process image."
+msgstr "Kann Bild nicht verarbeiten."
+
+#: ../../mod/profile_photo.php:297
+msgid "female"
+msgstr "weiblich"
+
+#: ../../mod/profile_photo.php:298
+#, php-format
+msgid "%1$s updated her %2$s"
+msgstr "%1$s hat ihr %2$s aktualisiert"
+
+#: ../../mod/profile_photo.php:299
+msgid "male"
+msgstr "männlich"
+
+#: ../../mod/profile_photo.php:300
+#, php-format
+msgid "%1$s updated his %2$s"
+msgstr "%1$s hat sein %2$s aktualisiert"
+
+#: ../../mod/profile_photo.php:302
+#, php-format
+msgid "%1$s updated their %2$s"
+msgstr "%1$s hat sein/ihr %2$s aktualisiert"
+
+#: ../../mod/profile_photo.php:304
+msgid "profile photo"
+msgstr "Profilfoto"
+
+#: ../../mod/profile_photo.php:368 ../../mod/profile_photo.php:409
+msgid "Photo not available."
+msgstr "Foto nicht verfügbar."
+
+#: ../../mod/profile_photo.php:450
+msgid "Upload File:"
+msgstr "Datei hochladen:"
+
+#: ../../mod/profile_photo.php:451
+msgid "Select a profile:"
+msgstr "Wähle ein Profil:"
+
+#: ../../mod/profile_photo.php:452
+msgid "Upload Profile Photo"
+msgstr "Lade neues Profilfoto hoch"
+
+#: ../../mod/profile_photo.php:457 ../../mod/settings.php:975
+msgid "or"
+msgstr "oder"
+
+#: ../../mod/profile_photo.php:457
+msgid "skip this step"
+msgstr "diesen Schritt überspringen"
+
+#: ../../mod/profile_photo.php:457
+msgid "select a photo from your photo albums"
+msgstr "ein Foto aus meinen Fotoalben"
+
+#: ../../mod/profile_photo.php:473
+msgid "Crop Image"
+msgstr "Bild zuschneiden"
+
+#: ../../mod/profile_photo.php:474
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu."
+
+#: ../../mod/profile_photo.php:476
+msgid "Done Editing"
+msgstr "Bearbeitung fertigstellen"
+
+#: ../../mod/thing.php:111
+msgid "Thing updated"
+msgstr "Sache aktualisiert"
+
+#: ../../mod/thing.php:163
+msgid "Object store: failed"
+msgstr "Speichern des Objekts fehlgeschlagen"
+
+#: ../../mod/thing.php:167
+msgid "Thing added"
+msgstr "Sache hinzugefügt"
+
+#: ../../mod/thing.php:193
+#, php-format
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr "OBJ: %1$s %2$s %3$s"
+
+#: ../../mod/thing.php:256
+msgid "Show Thing"
+msgstr "Sache anzeigen"
+
+#: ../../mod/thing.php:263
+msgid "item not found."
+msgstr "Eintrag nicht gefunden"
+
+#: ../../mod/thing.php:296
+msgid "Edit Thing"
+msgstr "Sache bearbeiten"
+
+#: ../../mod/thing.php:298 ../../mod/thing.php:348
+msgid "Select a profile"
+msgstr "Wähle ein Profil"
+
+#: ../../mod/thing.php:302 ../../mod/thing.php:351
+msgid "Post an activity"
+msgstr "Aktivitätsnachricht senden"
+
+#: ../../mod/thing.php:302 ../../mod/thing.php:351
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Nur an Betrachter des ausgewählten Profils senden"
+
+#: ../../mod/thing.php:304 ../../mod/thing.php:353
+msgid "Name of thing e.g. something"
+msgstr "Name der Sache, z. B. irgendwas"
+
+#: ../../mod/thing.php:306 ../../mod/thing.php:354
+msgid "URL of thing (optional)"
+msgstr "URL der Sache (optional)"
+
+#: ../../mod/thing.php:308 ../../mod/thing.php:355
+msgid "URL for photo of thing (optional)"
+msgstr "URL eines Fotos der Sache (optional)"
+
+#: ../../mod/thing.php:346
+msgid "Add Thing to your Profile"
+msgstr "Die Sache Deinem Profil hinzufügen"
+
+#: ../../mod/dirsearch.php:29
+msgid "This directory server requires an access token"
+msgstr "Dieser Verzeichnisserver benötigt einen Zugangstoken"
 
 #: ../../mod/editblock.php:118
 msgid "Delete block?"
@@ -5296,52 +6565,177 @@ msgstr "Block löschen?"
 msgid "Edit Block"
 msgstr "Block bearbeiten"
 
-#: ../../mod/home.php:57 ../../mod/home.php:63 ../../mod/siteinfo.php:157
-msgid "$Projectname"
-msgstr "$Projectname"
+#: ../../mod/removeaccount.php:30
+msgid ""
+"Account removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt."
 
-#: ../../mod/home.php:73
-#, php-format
-msgid "Welcome to %s"
-msgstr "Willkommen auf %s"
+#: ../../mod/removeaccount.php:57
+msgid "Remove This Account"
+msgstr "Dieses Konto löschen"
 
-#: ../../mod/item.php:174
-msgid "Unable to locate original post."
-msgstr "Originalbeitrag nicht gefunden."
+#: ../../mod/removeaccount.php:58
+msgid ""
+"This account and all its channels will be completely removed from the "
+"network. "
+msgstr "Dieses Konto mit all seinen Kanälen wird vollständig aus dem Netzwerk gelöscht."
 
-#: ../../mod/item.php:407
-msgid "Empty post discarded."
-msgstr "Leeren Beitrag verworfen."
+#: ../../mod/removeaccount.php:60
+msgid ""
+"Remove this account, all its channels and all its channel clones from the "
+"network"
+msgstr "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen"
 
-#: ../../mod/item.php:447
-msgid "Executable content type not permitted to this channel."
-msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
+#: ../../mod/removeaccount.php:60
+msgid ""
+"By default only the instances of the channels located on this hub will be "
+"removed from the network"
+msgstr "Standardmäßig werden nur die Kanalklone auf diesem $Projectname-Hub aus dem Netzwerk entfernt"
 
-#: ../../mod/item.php:896
-msgid "System error. Post not saved."
-msgstr "Systemfehler. Beitrag nicht gespeichert."
+#: ../../mod/removeaccount.php:61 ../../mod/settings.php:700
+msgid "Remove Account"
+msgstr "Konto entfernen"
 
-#: ../../mod/item.php:1163
-msgid "Unable to obtain post information from database."
-msgstr "Beitragsinformationen können nicht aus der Datenbank abgerufen werden."
+#: ../../mod/import_items.php:101
+msgid "Import completed"
+msgstr "Import abgeschlossen"
+
+#: ../../mod/import_items.php:119
+msgid "Import Items"
+msgstr "Beiträge importieren"
+
+#: ../../mod/import_items.php:120
+msgid ""
+"Use this form to import existing posts and content from an export file."
+msgstr "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren."
+
+#: ../../mod/network.php:91
+msgid "No such group"
+msgstr "Sammlung nicht gefunden"
+
+#: ../../mod/network.php:131
+msgid "No such channel"
+msgstr "Kanal nicht gefunden"
+
+#: ../../mod/network.php:136
+msgid "forum"
+msgstr "Forum"
+
+#: ../../mod/network.php:148
+msgid "Search Results For:"
+msgstr "Suchergebnisse für:"
+
+#: ../../mod/network.php:207
+msgid "Collection is empty"
+msgstr "Sammlung ist leer"
+
+#: ../../mod/network.php:216
+msgid "Collection: "
+msgstr "Sammlung:"
+
+#: ../../mod/network.php:242
+msgid "Invalid connection."
+msgstr "Ungültige Verbindung."
+
+#: ../../mod/pdledit.php:13
+msgid "Layout updated."
+msgstr "Layout aktualisiert."
+
+#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
+msgid "Edit System Page Description"
+msgstr "Systemseitenbeschreibung bearbeiten"
 
-#: ../../mod/item.php:1170
+#: ../../mod/pdledit.php:48
+msgid "Layout not found."
+msgstr "Layout nicht gefunden."
+
+#: ../../mod/pdledit.php:54
+msgid "Module Name:"
+msgstr "Modulname:"
+
+#: ../../mod/pdledit.php:55
+msgid "Layout Help"
+msgstr "Layout-Hilfe"
+
+#: ../../mod/register.php:44
+msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
+msgstr "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."
+
+#: ../../mod/register.php:50
+msgid ""
+"Please indicate acceptance of the Terms of Service. Registration failed."
+msgstr "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen."
+
+#: ../../mod/register.php:84
+msgid "Passwords do not match."
+msgstr "Passwörter stimmen nicht überein."
+
+#: ../../mod/register.php:117
+msgid ""
+"Registration successful. Please check your email for validation "
+"instructions."
+msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
+
+#: ../../mod/register.php:123
+msgid "Your registration is pending approval by the site owner."
+msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
+
+#: ../../mod/register.php:126
+msgid "Your registration can not be processed."
+msgstr "Deine Registrierung konnte nicht verarbeitet werden."
+
+#: ../../mod/register.php:163
+msgid "Registration on this site/hub is by approval only."
+msgstr "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator"
+
+#: ../../mod/register.php:164
+msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
+msgstr "<a href=\"pubsites\">Registrierung auf einem anderen, angeschlossenen Server</a>"
+
+#: ../../mod/register.php:174
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal."
+
+#: ../../mod/register.php:185
+msgid "Terms of Service"
+msgstr "Nutzungsbedingungen"
+
+#: ../../mod/register.php:191
 #, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
+msgid "I accept the %s for this website"
+msgstr "Ich akzeptiere die %s für diese Webseite"
 
-#: ../../mod/item.php:1177
+#: ../../mod/register.php:193
 #, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
+msgid "I am over 13 years of age and accept the %s for this website"
+msgstr "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite"
 
-#: ../../mod/oexchange.php:23
-msgid "Unable to find your hub."
-msgstr "Konnte Deinen Server nicht finden."
+#: ../../mod/register.php:207 ../../mod/admin.php:443
+msgid "Registration"
+msgstr "Registrierung"
 
-#: ../../mod/oexchange.php:37
-msgid "Post successful."
-msgstr "Veröffentlichung erfolgreich."
+#: ../../mod/register.php:212
+msgid "Membership on this site is by invitation only."
+msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
+
+#: ../../mod/register.php:213
+msgid "Please enter your invitation code"
+msgstr "Bitte trage Deinen Einladungs-Code ein"
+
+#: ../../mod/register.php:216
+msgid "Your email address"
+msgstr "Ihre E-Mail Adresse"
+
+#: ../../mod/register.php:217
+msgid "Choose a password"
+msgstr "Passwort"
+
+#: ../../mod/register.php:218
+msgid "Please re-enter your password"
+msgstr "Bitte gib Dein Passwort noch einmal ein"
 
 #: ../../mod/admin.php:52
 msgid "Theme settings updated."
@@ -5379,10 +6773,10 @@ msgstr "Anzahl der Klone"
 msgid "Message queues"
 msgstr "Nachrichten-Warteschlangen"
 
-#: ../../mod/admin.php:198 ../../mod/admin.php:409 ../../mod/admin.php:506
-#: ../../mod/admin.php:774 ../../mod/admin.php:938 ../../mod/admin.php:1030
-#: ../../mod/admin.php:1070 ../../mod/admin.php:1230 ../../mod/admin.php:1264
-#: ../../mod/admin.php:1349
+#: ../../mod/admin.php:198 ../../mod/admin.php:440 ../../mod/admin.php:539
+#: ../../mod/admin.php:807 ../../mod/admin.php:971 ../../mod/admin.php:1068
+#: ../../mod/admin.php:1108 ../../mod/admin.php:1268 ../../mod/admin.php:1302
+#: ../../mod/admin.php:1387
 msgid "Administration"
 msgstr "Administration"
 
@@ -5394,7 +6788,7 @@ msgstr "Zusammenfassung"
 msgid "Registered accounts"
 msgstr "Registrierte Konten"
 
-#: ../../mod/admin.php:203 ../../mod/admin.php:510
+#: ../../mod/admin.php:203 ../../mod/admin.php:543
 msgid "Pending registrations"
 msgstr "Ausstehende Registrierungen"
 
@@ -5402,7 +6796,7 @@ msgstr "Ausstehende Registrierungen"
 msgid "Registered channels"
 msgstr "Registrierte Kanäle"
 
-#: ../../mod/admin.php:205 ../../mod/admin.php:511
+#: ../../mod/admin.php:205 ../../mod/admin.php:544
 msgid "Active plugins"
 msgstr "Aktive Plug-Ins"
 
@@ -5410,2017 +6804,693 @@ msgstr "Aktive Plug-Ins"
 msgid "Version"
 msgstr "Version"
 
-#: ../../mod/admin.php:321
+#: ../../mod/admin.php:324
 msgid "Site settings updated."
 msgstr "Site-Einstellungen aktualisiert."
 
-#: ../../mod/admin.php:358 ../../mod/settings.php:790
+#: ../../mod/admin.php:361 ../../mod/settings.php:793
 msgid "mobile"
 msgstr "mobil"
 
-#: ../../mod/admin.php:360
+#: ../../mod/admin.php:363
 msgid "experimental"
 msgstr "experimentell"
 
-#: ../../mod/admin.php:362
+#: ../../mod/admin.php:365
 msgid "unsupported"
 msgstr "nicht unterstützt"
 
-#: ../../mod/admin.php:387
+#: ../../mod/admin.php:411
 msgid "Yes - with approval"
 msgstr "Ja - mit Zustimmung"
 
-#: ../../mod/admin.php:393
+#: ../../mod/admin.php:417
 msgid "My site is not a public server"
 msgstr "Mein Server ist kein öffentlicher Server"
 
-#: ../../mod/admin.php:394
+#: ../../mod/admin.php:418
 msgid "My site has paid access only"
 msgstr "Mein Server erlaubt nur bezahlten Zugang"
 
-#: ../../mod/admin.php:395
+#: ../../mod/admin.php:419
 msgid "My site has free access only"
 msgstr "Mein Server erlaubt ausschließlich freien Zugang"
 
-#: ../../mod/admin.php:396
+#: ../../mod/admin.php:420
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades"
 
-#: ../../mod/admin.php:412 ../../mod/register.php:207
-msgid "Registration"
-msgstr "Registrierung"
-
-#: ../../mod/admin.php:413
+#: ../../mod/admin.php:444
 msgid "File upload"
 msgstr "Dateiupload"
 
-#: ../../mod/admin.php:414
+#: ../../mod/admin.php:445
 msgid "Policies"
 msgstr "Richtlinien"
 
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:450
 msgid "Site name"
 msgstr "Seitenname"
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:451
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:452
 msgid "Administrator Information"
 msgstr "Administrator-Informationen"
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:452
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."
 
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:453
 msgid "System language"
 msgstr "System-Sprache"
 
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:454
 msgid "System theme"
 msgstr "System-Theme"
 
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:454
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
 
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:455
 msgid "Mobile system theme"
 msgstr "Mobile System-Theme:"
 
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:455
 msgid "Theme for mobile devices"
 msgstr "Theme für mobile Geräte"
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:457
 msgid "Allow Feeds as Connections"
 msgstr "Feeds als Verbindungen erlauben"
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:457
 msgid "(Heavy system resource usage)"
 msgstr "(führt zu hoher Systemlast)"
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:458
 msgid "Maximum image size"
 msgstr "Maximale Bildgröße"
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:458
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:459
 msgid "Does this site allow new member registration?"
 msgstr "Erlaubt dieser Server die Registrierung neuer Nutzer?"
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:460
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Was ist die passendste Beschreibung der Konten auf diesem Hub?"
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:461
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:461
 msgid "Will be displayed prominently on the registration page."
 msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:462
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Homepage des Hubs, die Besuchern angezeigt wird (Voreinstellung: Anmeldemaske)"
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:462
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "Beispiele: 'public', um den Stream aller öffentlichen Beiträge anzuzeigen, 'page/sys/home', um eine System-Webseite namens 'home' anzuzeigen, 'include:home.html', um eine Datei einzufügen."
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:463
 msgid "Preserve site homepage URL"
 msgstr "Homepage-URL schützen"
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:463
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Zeigt die Homepage an der Original-URL in einem Frame an, statt auf die eigentliche Adresse der Seite umzuleiten."
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:464
 msgid "Accounts abandoned after x days"
 msgstr "Konten gelten nach X Tagen als unbenutzt"
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:464
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:465
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:465
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:466
 msgid "Allowed email domains"
 msgstr "Erlaubte Domains für E-Mails"
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:466
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:467
 msgid "Not allowed email domains"
 msgstr "Nicht erlaubte Domains für E-Mails"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:467
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Domains in E-Mail-Adressen, die keine Erlaubnis erhalten, sich auf Deinem Hub zu registrieren. Mehrere Domains können durch Kommas getrennt werden. Platzhalter (*/?) sind möglich. Keine Eingabe bedeutet keine Einschränkung, unabhängig davon, ob unter erlaubte Domains etwas eingegeben wurde."
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:468
 msgid "Block public"
 msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:468
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Zugriff auf sonst öffentliche persönliche Seiten blockieren, wenn man nicht eingeloggt ist."
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:469
 msgid "Verify Email Addresses"
 msgstr "E-Mail-Adressen überprüfen"
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:469
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)."
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:470
 msgid "Force publish"
 msgstr "Veröffentlichung erzwingen"
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:470
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."
 
-#: ../../mod/admin.php:440
-msgid "Disable discovery tab"
-msgstr "Den „Entdecken“-Reiter ausblenden"
+#: ../../mod/admin.php:471
+msgid "Import Public Streams"
+msgstr "Öffentliche Beiträge importieren"
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:471
 msgid ""
-"Remove the tab in the network view with public content pulled from sources "
-"chosen for this site."
-msgstr "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte angezeigt werden, die von anderen RedMatrix-Hubs geholt wurden."
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
+msgstr "Öffentliche Beiträge von anderen Servern importieren und zur Verfügung stellen. Warnung: Diese Inhalte sind nicht moderiert."
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:472
 msgid "login on Homepage"
 msgstr "Anmeldemaske auf der Homepage"
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:472
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Zeigt Besuchern der Homepage eine Anmeldemaske, falls keine anderen Inhalte konfiguriert wurden."
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:474
+msgid "Directory Server URL"
+msgstr "Verzeichnisserver-URL"
+
+#: ../../mod/admin.php:474
+msgid "Default directory server"
+msgstr "Standard-Verzeichnisserver"
+
+#: ../../mod/admin.php:476
 msgid "Proxy user"
 msgstr "Proxy Benutzer"
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:477
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:478
 msgid "Network timeout"
 msgstr "Netzwerk-Timeout"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:478
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:479
 msgid "Delivery interval"
 msgstr "Auslieferung Intervall"
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:479
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:480
 msgid "Deliveries per process"
 msgstr "Zustellungen pro Prozess"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:480
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Anzahl der Zustellungen, die innerhalb eines einzelnen Betriebssystemprozesses versucht werden. Anpassen, falls nötig, um die System-Performance zu verbessern. Empfehlung: 1-5."
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:481
 msgid "Poll interval"
 msgstr "Abfrageintervall"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:481
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:482
 msgid "Maximum Load Average"
 msgstr "Maximales Load Average"
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:482
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:483
 msgid "Expiration period in days for imported (matrix/network) content"
 msgstr "Zeitraum in Tagen, nach dem importierte Inhalte (aus dem Grid/Netzwerk) gelöscht werden sollen"
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:483
 msgid "0 for no expiration of imported content"
 msgstr "0 = keine Löschung importierter Inhalte"
 
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:531
 msgid "No server found"
 msgstr "Kein Server gefunden"
 
-#: ../../mod/admin.php:505 ../../mod/admin.php:788
+#: ../../mod/admin.php:538 ../../mod/admin.php:821
 msgid "ID"
 msgstr "ID"
 
-#: ../../mod/admin.php:505
+#: ../../mod/admin.php:538
 msgid "for channel"
 msgstr "für Kanal"
 
-#: ../../mod/admin.php:505
+#: ../../mod/admin.php:538
 msgid "on server"
 msgstr "auf Server"
 
-#: ../../mod/admin.php:505
+#: ../../mod/admin.php:538
 msgid "Status"
 msgstr "Status"
 
-#: ../../mod/admin.php:507
+#: ../../mod/admin.php:540
 msgid "Server"
 msgstr "Server"
 
-#: ../../mod/admin.php:524
+#: ../../mod/admin.php:557
 msgid "Update has been marked successful"
 msgstr "Update wurde als erfolgreich markiert"
 
-#: ../../mod/admin.php:534
+#: ../../mod/admin.php:567
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."
 
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:570
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Update %s wurde erfolgreich ausgeführt."
 
-#: ../../mod/admin.php:541
+#: ../../mod/admin.php:574
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."
 
-#: ../../mod/admin.php:544
+#: ../../mod/admin.php:577
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Update-Funktion %s konnte nicht gefunden werden."
 
-#: ../../mod/admin.php:560
+#: ../../mod/admin.php:593
 msgid "No failed updates."
 msgstr "Keine fehlgeschlagenen Aktualisierungen."
 
-#: ../../mod/admin.php:564
+#: ../../mod/admin.php:597
 msgid "Failed Updates"
 msgstr "Fehlgeschlagene Aktualisierungen"
 
-#: ../../mod/admin.php:566
+#: ../../mod/admin.php:599
 msgid "Mark success (if update was manually applied)"
 msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"
 
-#: ../../mod/admin.php:567
+#: ../../mod/admin.php:600
 msgid "Attempt to execute this update step automatically"
 msgstr "Versuche, diesen Updateschritt automatisch auszuführen"
 
-#: ../../mod/admin.php:599
+#: ../../mod/admin.php:632
 msgid "Queue Statistics"
 msgstr "Warteschlangenstatistiken"
 
-#: ../../mod/admin.php:600
+#: ../../mod/admin.php:633
 msgid "Total Entries"
 msgstr "Einträge insgesamt"
 
-#: ../../mod/admin.php:601
+#: ../../mod/admin.php:634
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../../mod/admin.php:602
+#: ../../mod/admin.php:635
 msgid "Destination URL"
 msgstr "Ziel-URL"
 
-#: ../../mod/admin.php:603
+#: ../../mod/admin.php:636
 msgid "Mark hub permanently offline"
 msgstr "Hub als permanent offline markieren"
 
-#: ../../mod/admin.php:604
+#: ../../mod/admin.php:637
 msgid "Empty queue for this hub"
 msgstr "Warteschlange für diesen Hub leeren"
 
-#: ../../mod/admin.php:605
+#: ../../mod/admin.php:638
 msgid "Last known contact"
 msgstr "Letzter Kontakt"
 
-#: ../../mod/admin.php:641
+#: ../../mod/admin.php:674
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s Konto blockiert/freigegeben"
 msgstr[1] "%s Konten blockiert/freigegeben"
 
-#: ../../mod/admin.php:649
+#: ../../mod/admin.php:682
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s Konto gelöscht"
 msgstr[1] "%s Konten gelöscht"
 
-#: ../../mod/admin.php:685
+#: ../../mod/admin.php:718
 msgid "Account not found"
 msgstr "Konto nicht gefunden"
 
-#: ../../mod/admin.php:697
+#: ../../mod/admin.php:730
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Konto '%s' gelöscht"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:738
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Konto '%s' blockiert"
 
-#: ../../mod/admin.php:713
+#: ../../mod/admin.php:746
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Konto '%s' freigegeben"
 
-#: ../../mod/admin.php:775 ../../mod/admin.php:787
+#: ../../mod/admin.php:808 ../../mod/admin.php:820
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../../mod/admin.php:777 ../../mod/admin.php:941
+#: ../../mod/admin.php:810 ../../mod/admin.php:974
 msgid "select all"
 msgstr "Alle auswählen"
 
-#: ../../mod/admin.php:778
+#: ../../mod/admin.php:811
 msgid "User registrations waiting for confirm"
 msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
 
-#: ../../mod/admin.php:779
+#: ../../mod/admin.php:812
 msgid "Request date"
 msgstr "Antragsdatum"
 
-#: ../../mod/admin.php:780
+#: ../../mod/admin.php:813
 msgid "No registrations."
 msgstr "Keine Registrierungen."
 
-#: ../../mod/admin.php:782
+#: ../../mod/admin.php:815
 msgid "Deny"
 msgstr "Verweigern"
 
-#: ../../mod/admin.php:788
+#: ../../mod/admin.php:821
 msgid "Register date"
 msgstr "Registrierungs-Datum"
 
-#: ../../mod/admin.php:788
+#: ../../mod/admin.php:821
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
-#: ../../mod/admin.php:788
+#: ../../mod/admin.php:821
 msgid "Expires"
 msgstr "Verfällt"
 
-#: ../../mod/admin.php:788
+#: ../../mod/admin.php:821
 msgid "Service Class"
 msgstr "Service-Klasse"
 
-#: ../../mod/admin.php:790
+#: ../../mod/admin.php:823
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Die ausgewählten Konten werden gelöscht!\\n\\nAlles, was diese Konten auf diesem Hub veröffentlicht haben, wird endgültig gelöscht werden!\\n\\nBist du dir sicher?"
 
-#: ../../mod/admin.php:791
+#: ../../mod/admin.php:824
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Das Konto {0} wird gelöscht!\\n\\nAlles, was dieses Konto auf diesem Hub veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?"
 
-#: ../../mod/admin.php:827
+#: ../../mod/admin.php:860
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s Kanal gesperrt/freigegeben"
 msgstr[1] "%s Kanäle gesperrt/freigegeben"
 
-#: ../../mod/admin.php:836
+#: ../../mod/admin.php:869
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "Code für %s Kanal gesperrt/freigegeben"
 msgstr[1] "Code für %s Kanäle gesperrt/freigegeben"
 
-#: ../../mod/admin.php:843
+#: ../../mod/admin.php:876
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s Kanal gelöscht"
 msgstr[1] "%s Kanäle gelöscht"
 
-#: ../../mod/admin.php:863
+#: ../../mod/admin.php:896
 msgid "Channel not found"
 msgstr "Kanal nicht gefunden"
 
-#: ../../mod/admin.php:874
+#: ../../mod/admin.php:907
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Kanal '%s' gelöscht"
 
-#: ../../mod/admin.php:886
+#: ../../mod/admin.php:919
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Kanal '%s' gesperrt"
 
-#: ../../mod/admin.php:886
+#: ../../mod/admin.php:919
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Kanal '%s' freigegeben"
 
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:930
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Code für Kanal '%s' freigegeben"
 
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:930
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Code für Kanal '%s' gesperrt"
 
-#: ../../mod/admin.php:943
+#: ../../mod/admin.php:976
 msgid "Censor"
 msgstr "Sperren"
 
-#: ../../mod/admin.php:944
+#: ../../mod/admin.php:977
 msgid "Uncensor"
 msgstr "Freigeben"
 
-#: ../../mod/admin.php:945
+#: ../../mod/admin.php:978
 msgid "Allow Code"
 msgstr "Code erlauben"
 
-#: ../../mod/admin.php:946
+#: ../../mod/admin.php:979
 msgid "Disallow Code"
 msgstr "Code sperren"
 
-#: ../../mod/admin.php:948
+#: ../../mod/admin.php:981
 msgid "UID"
 msgstr "UID"
 
-#: ../../mod/admin.php:948 ../../mod/profiles.php:447
-msgid "Address"
-msgstr "Adresse"
-
-#: ../../mod/admin.php:950
+#: ../../mod/admin.php:983
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?"
 
-#: ../../mod/admin.php:951
+#: ../../mod/admin.php:984
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?"
 
-#: ../../mod/admin.php:991
+#: ../../mod/admin.php:1024
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plug-In %s deaktiviert."
 
-#: ../../mod/admin.php:995
+#: ../../mod/admin.php:1028
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plug-In %s aktiviert."
 
-#: ../../mod/admin.php:1005 ../../mod/admin.php:1203
+#: ../../mod/admin.php:1038 ../../mod/admin.php:1241
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: ../../mod/admin.php:1008 ../../mod/admin.php:1205
+#: ../../mod/admin.php:1041 ../../mod/admin.php:1243
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: ../../mod/admin.php:1032 ../../mod/admin.php:1232
+#: ../../mod/admin.php:1070 ../../mod/admin.php:1270
 msgid "Toggle"
 msgstr "Umschalten"
 
-#: ../../mod/admin.php:1040 ../../mod/admin.php:1242
+#: ../../mod/admin.php:1078 ../../mod/admin.php:1280
 msgid "Author: "
 msgstr "Autor: "
 
-#: ../../mod/admin.php:1041 ../../mod/admin.php:1243
+#: ../../mod/admin.php:1079 ../../mod/admin.php:1281
 msgid "Maintainer: "
 msgstr "Betreuer:"
 
-#: ../../mod/admin.php:1168
+#: ../../mod/admin.php:1206
 msgid "No themes found."
 msgstr "Keine Theme gefunden."
 
-#: ../../mod/admin.php:1224
+#: ../../mod/admin.php:1262
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: ../../mod/admin.php:1270
+#: ../../mod/admin.php:1308
 msgid "[Experimental]"
 msgstr "[Experimentell]"
 
-#: ../../mod/admin.php:1271
+#: ../../mod/admin.php:1309
 msgid "[Unsupported]"
 msgstr "[Nicht unterstützt]"
 
-#: ../../mod/admin.php:1295
+#: ../../mod/admin.php:1333
 msgid "Log settings updated."
 msgstr "Protokoll-Einstellungen aktualisiert."
 
-#: ../../mod/admin.php:1352
+#: ../../mod/admin.php:1390
 msgid "Clear"
 msgstr "Leeren"
 
-#: ../../mod/admin.php:1358
+#: ../../mod/admin.php:1396
 msgid "Debugging"
 msgstr "Debugging"
 
-#: ../../mod/admin.php:1359
+#: ../../mod/admin.php:1397
 msgid "Log file"
 msgstr "Protokolldatei"
 
-#: ../../mod/admin.php:1359
+#: ../../mod/admin.php:1397
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
-msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis."
+msgstr "Muss für den Webserver schreibbar sein. Relativ zum $Projectname-Stammverzeichnis."
 
-#: ../../mod/admin.php:1360
+#: ../../mod/admin.php:1398
 msgid "Log level"
 msgstr "Protokollstufe"
 
-#: ../../mod/admin.php:1406
+#: ../../mod/admin.php:1444
 msgid "New Profile Field"
 msgstr "Neues Profilfeld"
 
-#: ../../mod/admin.php:1407 ../../mod/admin.php:1427
+#: ../../mod/admin.php:1445 ../../mod/admin.php:1465
 msgid "Field nickname"
 msgstr "Kurzname für das Feld"
 
-#: ../../mod/admin.php:1407 ../../mod/admin.php:1427
+#: ../../mod/admin.php:1445 ../../mod/admin.php:1465
 msgid "System name of field"
 msgstr "Systemname des Feldes"
 
-#: ../../mod/admin.php:1408 ../../mod/admin.php:1428
+#: ../../mod/admin.php:1446 ../../mod/admin.php:1466
 msgid "Input type"
 msgstr "Art des Inhalts"
 
-#: ../../mod/admin.php:1409 ../../mod/admin.php:1429
+#: ../../mod/admin.php:1447 ../../mod/admin.php:1467
 msgid "Field Name"
 msgstr "Feldname"
 
-#: ../../mod/admin.php:1409 ../../mod/admin.php:1429
+#: ../../mod/admin.php:1447 ../../mod/admin.php:1467
 msgid "Label on profile pages"
 msgstr "Bezeichnung auf Profilseiten"
 
-#: ../../mod/admin.php:1410 ../../mod/admin.php:1430
+#: ../../mod/admin.php:1448 ../../mod/admin.php:1468
 msgid "Help text"
 msgstr "Hilfetext"
 
-#: ../../mod/admin.php:1410 ../../mod/admin.php:1430
+#: ../../mod/admin.php:1448 ../../mod/admin.php:1468
 msgid "Additional info (optional)"
 msgstr "Zusätzliche Informationen (optional)"
 
-#: ../../mod/admin.php:1420
+#: ../../mod/admin.php:1458
 msgid "Field definition not found"
 msgstr "Feld-Definition nicht gefunden"
 
-#: ../../mod/admin.php:1426
+#: ../../mod/admin.php:1464
 msgid "Edit Profile Field"
 msgstr "Profilfeld bearbeiten"
 
-#: ../../mod/appman.php:28 ../../mod/appman.php:44
-msgid "App installed."
-msgstr "App installiert."
-
-#: ../../mod/appman.php:37
-msgid "Malformed app."
-msgstr "Fehlerhafte App."
-
-#: ../../mod/appman.php:80
-msgid "Embed code"
-msgstr "Code einbetten"
-
-#: ../../mod/appman.php:86
-msgid "Edit App"
-msgstr "App bearbeiten"
-
-#: ../../mod/appman.php:86
-msgid "Create App"
-msgstr "App erstellen"
-
-#: ../../mod/appman.php:91
-msgid "Name of app"
-msgstr "Name der App"
-
-#: ../../mod/appman.php:92
-msgid "Location (URL) of app"
-msgstr "Ort (URL) der App"
-
-#: ../../mod/appman.php:93 ../../mod/rbmark.php:95
-msgid "Description"
-msgstr "Beschreibung"
-
-#: ../../mod/appman.php:94
-msgid "Photo icon URL"
-msgstr "URL zum Icon"
-
-#: ../../mod/appman.php:94
-msgid "80 x 80 pixels - optional"
-msgstr "80 x 80 Pixel – optional"
-
-#: ../../mod/appman.php:95
-msgid "Version ID"
-msgstr "Versions-ID"
-
-#: ../../mod/appman.php:96
-msgid "Price of app"
-msgstr "Preis der App"
-
-#: ../../mod/appman.php:97
-msgid "Location (URL) to purchase app"
-msgstr "Ort (URL), um die App zu kaufen"
-
-#: ../../mod/menu.php:45
-msgid "Unable to update menu."
-msgstr "Kann Menü nicht aktualisieren."
-
-#: ../../mod/menu.php:56
-msgid "Unable to create menu."
-msgstr "Kann Menü nicht erstellen."
-
-#: ../../mod/menu.php:94 ../../mod/menu.php:106
-msgid "Menu Name"
-msgstr "Name des Menüs"
-
-#: ../../mod/menu.php:94
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich"
-
-#: ../../mod/menu.php:95 ../../mod/menu.php:107
-msgid "Menu Title"
-msgstr "Menütitel"
-
-#: ../../mod/menu.php:95
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Sichtbar auf der Webseite – für keinen Titel leer lassen"
-
-#: ../../mod/menu.php:96
-msgid "Allow Bookmarks"
-msgstr "Lesezeichen erlauben"
-
-#: ../../mod/menu.php:96 ../../mod/menu.php:153
-msgid "Menu may be used to store saved bookmarks"
-msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
-
-#: ../../mod/menu.php:97 ../../mod/menu.php:155
-msgid "Submit and proceed"
-msgstr "Absenden und fortfahren"
-
-#: ../../mod/menu.php:109
-msgid "Drop"
-msgstr "Löschen"
-
-#: ../../mod/menu.php:113
-msgid "Bookmarks allowed"
-msgstr "Lesezeichen erlaubt"
-
-#: ../../mod/menu.php:115
-msgid "Delete this menu"
-msgstr "Lösche dieses Menü"
-
-#: ../../mod/menu.php:116 ../../mod/menu.php:150
-msgid "Edit menu contents"
-msgstr "Bearbeite Menü Inhalte"
-
-#: ../../mod/menu.php:117
-msgid "Edit this menu"
-msgstr "Dieses Menü bearbeiten"
-
-#: ../../mod/menu.php:132
-msgid "Menu could not be deleted."
-msgstr "Menü konnte nicht gelöscht werden."
-
-#: ../../mod/menu.php:145
-msgid "Edit Menu"
-msgstr "Menü bearbeiten"
-
-#: ../../mod/menu.php:149
-msgid "Add or remove entries to this menu"
-msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
-
-#: ../../mod/menu.php:151
-msgid "Menu name"
-msgstr "Menü Name"
-
-#: ../../mod/menu.php:151
-msgid "Must be unique, only seen by you"
-msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar"
-
-#: ../../mod/menu.php:152
-msgid "Menu title"
-msgstr "Menü Titel"
-
-#: ../../mod/menu.php:152
-msgid "Menu title as seen by others"
-msgstr "Menü Titel wie er von anderen gesehen wird"
-
-#: ../../mod/menu.php:153
-msgid "Allow bookmarks"
-msgstr "Erlaube Lesezeichen"
-
-#: ../../mod/notify.php:53 ../../mod/notifications.php:94
-msgid "No more system notifications."
-msgstr "Keine System-Benachrichtigungen mehr."
-
-#: ../../mod/notify.php:57 ../../mod/notifications.php:98
-msgid "System Notifications"
-msgstr "System-Benachrichtigungen"
-
-#: ../../mod/page.php:126
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
-" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-#: ../../mod/new_channel.php:109
-msgid "Add a Channel"
-msgstr "Kanal hinzufügen"
-
-#: ../../mod/new_channel.php:110
-msgid ""
-"A channel is your own collection of related web pages. A channel can be used"
-" to hold social network profiles, blogs, conversation groups and forums, "
-"celebrity pages, and much more. You may create as many channels as your "
-"service provider allows."
-msgstr "Ein Kanal ist Deine eigene Sammlung von zusammengehörigen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deines Hubs zulässt."
-
-#: ../../mod/new_channel.php:112 ../../mod/sources.php:103
-#: ../../mod/sources.php:137
-msgid "Channel Name"
-msgstr "Name des Kanals"
-
-#: ../../mod/new_channel.php:113
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
-msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "
-
-#: ../../mod/new_channel.php:114
-msgid "Choose a short nickname"
-msgstr "Wähle einen kurzen Spitznamen"
-
-#: ../../mod/new_channel.php:115
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
-msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst."
-
-#: ../../mod/new_channel.php:116
-msgid "Or <a href=\"import\">import an existing channel</a> from another location"
-msgstr "Oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server"
-
-#: ../../mod/new_channel.php:118
-msgid ""
-"Please choose a channel type (such as social networking or community forum) "
-"and privacy requirements so we can select the best permissions for you"
-msgstr "Wähle einen Kanaltyp (wie Soziales Netzwerk oder Forum) und Privatsphäre-Vorgaben, so dass wir die passenden Kanal-Zugriffsrechte für Dich setzen können"
-
-#: ../../mod/new_channel.php:119
-msgid "Channel Type"
-msgstr "Kanaltyp"
-
-#: ../../mod/new_channel.php:119
-msgid "Read more about roles"
-msgstr "Mehr Informationen über Rollen"
-
-#: ../../mod/notifications.php:26
-msgid "Invalid request identifier."
-msgstr "Ungültiger Anfrage-Identifikator."
-
-#: ../../mod/notifications.php:35
-msgid "Discard"
-msgstr "Verwerfen"
-
-#: ../../mod/pdledit.php:13
-msgid "Layout updated."
-msgstr "Layout aktualisiert."
-
-#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
-msgid "Edit System Page Description"
-msgstr "Systemseitenbeschreibung bearbeiten"
-
-#: ../../mod/pdledit.php:48
-msgid "Layout not found."
-msgstr "Layout nicht gefunden."
-
-#: ../../mod/pdledit.php:54
-msgid "Module Name:"
-msgstr "Modulname:"
-
-#: ../../mod/pdledit.php:55
-msgid "Layout Help"
-msgstr "Layout-Hilfe"
-
-#: ../../mod/subthread.php:102
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s folgt nun %2$ss %3$s"
-
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
-msgstr "Kein gültiges Konto gefunden."
-
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
-msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."
-
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Nutzer (%s)"
-
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Passwort-Rücksetzung auf %s angefordert"
-
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
-
-#: ../../mod/lostpass.php:86 ../../boot.php:1505
-msgid "Password Reset"
-msgstr "Zurücksetzen des Kennworts"
-
-#: ../../mod/lostpass.php:87
-msgid "Your password has been reset as requested."
-msgstr "Dein Passwort wurde wie angefordert neu erstellt."
-
-#: ../../mod/lostpass.php:88
-msgid "Your new password is"
-msgstr "Dein neues Passwort lautet"
-
-#: ../../mod/lostpass.php:89
-msgid "Save or copy your new password - and then"
-msgstr "Speichere oder kopiere Dein neues Passwort – und dann"
-
-#: ../../mod/lostpass.php:90
-msgid "click here to login"
-msgstr "Klicke hier, um dich anzumelden"
-
-#: ../../mod/lostpass.php:91
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden."
-
-#: ../../mod/lostpass.php:108
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Auf %s wurde Dein Passwort geändert"
-
-#: ../../mod/lostpass.php:123
-msgid "Forgot your Password?"
-msgstr "Kennwort vergessen?"
-
-#: ../../mod/lostpass.php:124
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."
-
-#: ../../mod/lostpass.php:125
-msgid "Email Address"
-msgstr "E-Mail Adresse"
-
-#: ../../mod/lostpass.php:126
-msgid "Reset"
-msgstr "Zurücksetzen"
-
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden."
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr "Album nicht gefunden."
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr "Album löschen"
-
-#: ../../mod/photos.php:170 ../../mod/photos.php:970
-msgid "Delete Photo"
-msgstr "Foto löschen"
-
-#: ../../mod/photos.php:464
-msgid "No photos selected"
-msgstr "Keine Fotos ausgewählt"
-
-#: ../../mod/photos.php:513
-msgid "Access to this item is restricted."
-msgstr "Der Zugriff auf dieses Foto ist eingeschränkt."
-
-#: ../../mod/photos.php:552
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "%1$.2f MB von %2$.2f MB Foto-Speicher belegt."
-
-#: ../../mod/photos.php:555
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB Foto-Speicher belegt."
-
-#: ../../mod/photos.php:583
-msgid "Upload Photos"
-msgstr "Fotos hochladen"
-
-#: ../../mod/photos.php:587
-msgid "Enter an album name"
-msgstr "Namen für ein neues Album eingeben"
-
-#: ../../mod/photos.php:588
-msgid "or select an existing album (doubleclick)"
-msgstr "oder ein bereits vorhandenes auswählen (Doppelklick)"
-
-#: ../../mod/photos.php:589
-msgid "Create a status post for this upload"
-msgstr "Einen Statusbeitrag für diesen Upload erzeugen"
-
-#: ../../mod/photos.php:616
-msgid "Album name could not be decoded"
-msgstr "Albumname konnte nicht dekodiert werden"
-
-#: ../../mod/photos.php:660 ../../mod/photos.php:1197
-#: ../../mod/photos.php:1214
-msgid "Contact Photos"
-msgstr "Kontakt-Bilder"
-
-#: ../../mod/photos.php:688
-msgid "Show Newest First"
-msgstr "Neueste zuerst anzeigen"
-
-#: ../../mod/photos.php:690
-msgid "Show Oldest First"
-msgstr "Älteste zuerst anzeigen"
-
-#: ../../mod/photos.php:714 ../../mod/photos.php:1247
-msgid "View Photo"
-msgstr "Foto ansehen"
-
-#: ../../mod/photos.php:743
-msgid "Edit Album"
-msgstr "Album bearbeiten"
-
-#: ../../mod/photos.php:788
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
-
-#: ../../mod/photos.php:790
-msgid "Photo not available"
-msgstr "Foto nicht verfügbar"
-
-#: ../../mod/photos.php:848
-msgid "Use as profile photo"
-msgstr "Als Profilfoto verwenden"
-
-#: ../../mod/photos.php:855
-msgid "Private Photo"
-msgstr "Privates Foto"
-
-#: ../../mod/photos.php:866 ../../mod/events.php:528
-msgid "Previous"
-msgstr "Voriges"
-
-#: ../../mod/photos.php:870
-msgid "View Full Size"
-msgstr "In voller Größe anzeigen"
-
-#: ../../mod/photos.php:875 ../../mod/events.php:529 ../../mod/setup.php:285
-msgid "Next"
-msgstr "Nächste"
-
-#: ../../mod/photos.php:915 ../../mod/tagrm.php:133
-msgid "Remove"
-msgstr "Entferne"
-
-#: ../../mod/photos.php:949
-msgid "Edit photo"
-msgstr "Foto bearbeiten"
-
-#: ../../mod/photos.php:951
-msgid "Rotate CW (right)"
-msgstr "Drehen im UZS (rechts)"
-
-#: ../../mod/photos.php:952
-msgid "Rotate CCW (left)"
-msgstr "Drehen gegen UZS (links)"
-
-#: ../../mod/photos.php:955
-msgid "Enter a new album name"
-msgstr "Gib einen Namen für ein neues Album ein"
-
-#: ../../mod/photos.php:956
-msgid "or select an existing one (doubleclick)"
-msgstr "oder wähle ein bereits vorhandenes aus (Doppelklick)"
-
-#: ../../mod/photos.php:959
-msgid "Caption"
-msgstr "Bildunterschrift"
-
-#: ../../mod/photos.php:961
-msgid "Add a Tag"
-msgstr "Schlagwort hinzufügen"
-
-#: ../../mod/photos.php:965
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Beispiele: @ben, @Karl_Prester, @lieschen@example.com"
-
-#: ../../mod/photos.php:968
-msgid "Flag as adult in album view"
-msgstr "In der Albumansicht als nicht jugendfrei markieren"
-
-#: ../../mod/photos.php:1160
-msgid "In This Photo:"
-msgstr "Auf diesem Foto:"
-
-#: ../../mod/photos.php:1165
-msgid "Map"
-msgstr "Karte"
-
-#: ../../mod/photos.php:1253
-msgid "View Album"
-msgstr "Album ansehen"
-
-#: ../../mod/photos.php:1276
-msgid "Recent Photos"
-msgstr "Neueste Fotos"
-
-#: ../../mod/dav.php:121
-msgid "$Projectname channel"
-msgstr "$Projectname-Kanal"
-
-#: ../../mod/rate.php:157
-msgid "Website:"
-msgstr "Webseite:"
-
-#: ../../mod/rate.php:160
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Kanal [%s] (auf diesem Server noch unbekannt)"
-
-#: ../../mod/rate.php:161
-msgid "Rating (this information is public)"
-msgstr "Bewertung (öffentlich sichtbar)"
-
-#: ../../mod/rate.php:162
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)"
-
-#: ../../mod/events.php:21
-msgid "Calendar entries imported."
-msgstr "Kalendereinträge wurden importiert."
-
-#: ../../mod/events.php:23
-msgid "No calendar entries found."
-msgstr "Keine Kalendereinträge gefunden."
-
-#: ../../mod/events.php:96
-msgid "Event can not end before it has started."
-msgstr "Termin-Ende liegt vor dem Beginn."
-
-#: ../../mod/events.php:98 ../../mod/events.php:107 ../../mod/events.php:127
-msgid "Unable to generate preview."
-msgstr "Vorschau konnte nicht erzeugt werden."
-
-#: ../../mod/events.php:105
-msgid "Event title and start time are required."
-msgstr "Titel und Startzeit des Termins sind erforderlich."
-
-#: ../../mod/events.php:125 ../../mod/events.php:250
-msgid "Event not found."
-msgstr "Termin nicht gefunden."
-
-#: ../../mod/events.php:448
-msgid "l, F j"
-msgstr "l, j. F"
-
-#: ../../mod/events.php:470
-msgid "Edit event"
-msgstr "Termin bearbeiten"
-
-#: ../../mod/events.php:472
-msgid "Delete event"
-msgstr "Termin löschen"
-
-#: ../../mod/events.php:506
-msgid "calendar"
-msgstr "Kalender"
-
-#: ../../mod/events.php:527
-msgid "Create New Event"
-msgstr "Neuen Termin erstellen"
-
-#: ../../mod/events.php:530
-msgid "Export"
-msgstr "Exportieren"
-
-#: ../../mod/events.php:533
-msgid "Import"
-msgstr "Import"
-
-#: ../../mod/events.php:564
-msgid "Event removed"
-msgstr "Termin gelöscht"
-
-#: ../../mod/events.php:567
-msgid "Failed to remove event"
-msgstr "Termin konnte nicht gelöscht werden"
-
-#: ../../mod/events.php:681
-msgid "Event details"
-msgstr "Termin-Details"
-
-#: ../../mod/events.php:682
-msgid "Starting date and Title are required."
-msgstr "Startdatum und Titel sind erforderlich."
-
-#: ../../mod/events.php:684
-msgid "Categories (comma-separated list)"
-msgstr "Kategorien (Kommagetrennte Liste)"
-
-#: ../../mod/events.php:686
-msgid "Event Starts:"
-msgstr "Termin beginnt:"
-
-#: ../../mod/events.php:693
-msgid "Finish date/time is not known or not relevant"
-msgstr "Ende Datum/Zeit sind unbekannt oder unwichtig"
-
-#: ../../mod/events.php:695
-msgid "Event Finishes:"
-msgstr "Termin endet:"
-
-#: ../../mod/events.php:697 ../../mod/events.php:698
-msgid "Adjust for viewer timezone"
-msgstr "An die Zeitzone des Betrachters anpassen"
-
-#: ../../mod/events.php:697
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien."
-
-#: ../../mod/events.php:703
-msgid "Title:"
-msgstr "Titel:"
-
-#: ../../mod/events.php:705
-msgid "Share this event"
-msgstr "Den Termin teilen"
-
-#: ../../mod/impel.php:192
-#, php-format
-msgid "%s element installed"
-msgstr "Element für %s installiert"
-
-#: ../../mod/impel.php:195
-#, php-format
-msgid "%s element installation failed"
-msgstr "Installation des Elements %s fehlgeschlagen"
-
-#: ../../mod/probe.php:24 ../../mod/probe.php:30
-#, php-format
-msgid "Fetching URL returns error: %1$s"
-msgstr "Abrufen der URL gab einen Fehler zurück: %1$s"
-
-#: ../../mod/match.php:22
-msgid "Profile Match"
-msgstr "Profil-Ãœbereinstimmungen"
-
-#: ../../mod/match.php:31
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu."
-
-#: ../../mod/match.php:63
-msgid "is interested in:"
-msgstr "interessiert sich für:"
-
-#: ../../mod/match.php:70
-msgid "No matches"
-msgstr "Keine Ãœbereinstimmungen"
-
-#: ../../mod/profile_photo.php:111
-msgid "Image uploaded but image cropping failed."
-msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."
-
-#: ../../mod/profile_photo.php:165
-msgid "Image resize failed."
-msgstr "Bild-Anpassung fehlgeschlagen."
-
-#: ../../mod/profile_photo.php:209
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
-
-#: ../../mod/profile_photo.php:247
-msgid "Image upload failed."
-msgstr "Hochladen des Bilds fehlgeschlagen."
-
-#: ../../mod/profile_photo.php:266
-msgid "Unable to process image."
-msgstr "Kann Bild nicht verarbeiten."
-
-#: ../../mod/profile_photo.php:294
-msgid "female"
-msgstr "weiblich"
-
-#: ../../mod/profile_photo.php:295
-#, php-format
-msgid "%1$s updated her %2$s"
-msgstr "%1$s hat ihr %2$s aktualisiert"
-
-#: ../../mod/profile_photo.php:296
-msgid "male"
-msgstr "männlich"
-
-#: ../../mod/profile_photo.php:297
-#, php-format
-msgid "%1$s updated his %2$s"
-msgstr "%1$s hat sein %2$s aktualisiert"
-
-#: ../../mod/profile_photo.php:299
-#, php-format
-msgid "%1$s updated their %2$s"
-msgstr "%1$s hat sein/ihr %2$s aktualisiert"
-
-#: ../../mod/profile_photo.php:301
-msgid "profile photo"
-msgstr "Profilfoto"
-
-#: ../../mod/profile_photo.php:365 ../../mod/profile_photo.php:406
-msgid "Photo not available."
-msgstr "Foto nicht verfügbar."
-
-#: ../../mod/profile_photo.php:447
-msgid "Upload File:"
-msgstr "Datei hochladen:"
-
-#: ../../mod/profile_photo.php:448
-msgid "Select a profile:"
-msgstr "Wähle ein Profil:"
-
-#: ../../mod/profile_photo.php:449
-msgid "Upload Profile Photo"
-msgstr "Lade neues Profilfoto hoch"
-
-#: ../../mod/profile_photo.php:454 ../../mod/settings.php:972
-msgid "or"
-msgstr "oder"
-
-#: ../../mod/profile_photo.php:454
-msgid "skip this step"
-msgstr "diesen Schritt überspringen"
-
-#: ../../mod/profile_photo.php:454
-msgid "select a photo from your photo albums"
-msgstr "ein Foto aus meinen Fotoalben"
-
-#: ../../mod/profile_photo.php:470
-msgid "Crop Image"
-msgstr "Bild zuschneiden"
-
-#: ../../mod/profile_photo.php:471
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu."
-
-#: ../../mod/profile_photo.php:473
-msgid "Done Editing"
-msgstr "Bearbeitung fertigstellen"
-
-#: ../../mod/follow.php:25
-msgid "Channel added."
-msgstr "Kanal hinzugefügt."
-
-#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
-msgid "Tag removed"
-msgstr "Schlagwort entfernt"
-
-#: ../../mod/tagrm.php:119
-msgid "Remove Item Tag"
-msgstr "Schlagwort entfernen"
-
-#: ../../mod/tagrm.php:121
-msgid "Select a tag to remove: "
-msgstr "Schlagwort zum Entfernen auswählen:"
-
-#: ../../mod/ratings.php:69
-msgid "No ratings"
-msgstr "Keine Bewertungen"
-
-#: ../../mod/ratings.php:99
-msgid "Ratings"
-msgstr "Bewertungen"
-
-#: ../../mod/ratings.php:100
-msgid "Rating: "
-msgstr "Bewertung: "
-
-#: ../../mod/ratings.php:101
-msgid "Website: "
-msgstr "Webseite: "
-
-#: ../../mod/ratings.php:103
-msgid "Description: "
-msgstr "Beschreibung: "
-
-#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Diese Website ist kein Verzeichnis-Server"
-
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr "Konnte den Empfänger nicht finden."
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen."
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr "Verifizierung des angeforderten Kanals fehlgeschlagen."
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen."
-
-#: ../../mod/mail.php:128
-msgid "Messages"
-msgstr "Nachrichten"
-
-#: ../../mod/mail.php:138
-msgid "Message deleted."
-msgstr "Nachricht gelöscht."
-
-#: ../../mod/mail.php:154
-msgid "Message recalled."
-msgstr "Nachricht widerrufen."
-
-#: ../../mod/mail.php:221
-msgid "Send Private Message"
-msgstr "Private Nachricht senden"
-
-#: ../../mod/mail.php:222 ../../mod/mail.php:352
-msgid "To:"
-msgstr "An:"
-
-#: ../../mod/mail.php:227 ../../mod/mail.php:341 ../../mod/mail.php:354
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: ../../mod/mail.php:231 ../../mod/mail.php:357 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr "Deine Nachricht:"
-
-#: ../../mod/mail.php:238
-msgid "Send"
-msgstr "Absenden"
-
-#: ../../mod/mail.php:322
-msgid "Delete message"
-msgstr "Nachricht löschen"
-
-#: ../../mod/mail.php:323
-msgid "Recall message"
-msgstr "Nachricht widerrufen"
-
-#: ../../mod/mail.php:325
-msgid "Message has been recalled."
-msgstr "Die Nachricht wurde widerrufen."
-
-#: ../../mod/mail.php:345
-msgid "Delete Conversation"
-msgstr "Unterhaltung löschen"
-
-#: ../../mod/mail.php:347
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten."
-
-#: ../../mod/mail.php:351
-msgid "Send Reply"
-msgstr "Antwort senden"
-
-#: ../../mod/webpages.php:191
-msgid "Page Title"
-msgstr "Seitentitel"
-
-#: ../../mod/register.php:44
-msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
-msgstr "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."
-
-#: ../../mod/register.php:50
-msgid ""
-"Please indicate acceptance of the Terms of Service. Registration failed."
-msgstr "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen."
-
-#: ../../mod/register.php:84
-msgid "Passwords do not match."
-msgstr "Passwörter stimmen nicht überein."
-
-#: ../../mod/register.php:117
-msgid ""
-"Registration successful. Please check your email for validation "
-"instructions."
-msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
-
-#: ../../mod/register.php:123
-msgid "Your registration is pending approval by the site owner."
-msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
-
-#: ../../mod/register.php:126
-msgid "Your registration can not be processed."
-msgstr "Deine Registrierung konnte nicht verarbeitet werden."
-
-#: ../../mod/register.php:163
-msgid "Registration on this site/hub is by approval only."
-msgstr "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator"
-
-#: ../../mod/register.php:164
-msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
-msgstr "<a href=\"pubsites\">Registrierung auf einem anderen, angeschlossenen Server</a>"
-
-#: ../../mod/register.php:174
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal."
-
-#: ../../mod/register.php:185
-msgid "Terms of Service"
-msgstr "Nutzungsbedingungen"
-
-#: ../../mod/register.php:191
-#, php-format
-msgid "I accept the %s for this website"
-msgstr "Ich akzeptiere die %s für diese Webseite"
-
-#: ../../mod/register.php:193
-#, php-format
-msgid "I am over 13 years of age and accept the %s for this website"
-msgstr "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite"
-
-#: ../../mod/register.php:212
-msgid "Membership on this site is by invitation only."
-msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
-
-#: ../../mod/register.php:213
-msgid "Please enter your invitation code"
-msgstr "Bitte trage Deinen Einladungs-Code ein"
-
-#: ../../mod/register.php:216
-msgid "Your email address"
-msgstr "Ihre E-Mail Adresse"
-
-#: ../../mod/register.php:217
-msgid "Choose a password"
-msgstr "Passwort"
-
-#: ../../mod/register.php:218
-msgid "Please re-enter your password"
-msgstr "Bitte gib Dein Passwort noch einmal ein"
-
-#: ../../mod/blocks.php:95 ../../mod/blocks.php:148
-msgid "Block Name"
-msgstr "Block-Name"
-
-#: ../../mod/blocks.php:149
-msgid "Block Title"
-msgstr "Titel des Blocks"
-
-#: ../../mod/removeaccount.php:30
-msgid ""
-"Account removals are not allowed within 48 hours of changing the account "
-"password."
-msgstr "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt."
-
-#: ../../mod/removeaccount.php:57
-msgid "Remove This Account"
-msgstr "Dieses Konto löschen"
-
-#: ../../mod/removeaccount.php:58
-msgid ""
-"This account and all its channels will be completely removed from the "
-"network. "
-msgstr "Dieses Konto mit all seinen Kanälen wird vollständig aus dem Netzwerk gelöscht."
-
-#: ../../mod/removeaccount.php:60
-msgid ""
-"Remove this account, all its channels and all its channel clones from the "
-"network"
-msgstr "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen"
-
-#: ../../mod/removeaccount.php:60
-msgid ""
-"By default only the instances of the channels located on this hub will be "
-"removed from the network"
-msgstr "Standardmäßig werden nur die Kanalklone auf diesem RedMatrix-Hub aus dem Netzwerk entfernt"
-
-#: ../../mod/removeaccount.php:61 ../../mod/settings.php:697
-msgid "Remove Account"
-msgstr "Konto entfernen"
-
-#: ../../mod/service_limits.php:19
-msgid "No service class restrictions found."
-msgstr "Keine Dienstklassenbeschränkungen gefunden."
-
-#: ../../mod/attach.php:9
-msgid "Item not available."
-msgstr "Element nicht verfügbar."
-
-#: ../../mod/sources.php:32
-msgid "Failed to create source. No channel selected."
-msgstr "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt."
-
-#: ../../mod/sources.php:45
-msgid "Source created."
-msgstr "Quelle erstellt."
-
-#: ../../mod/sources.php:57
-msgid "Source updated."
-msgstr "Quelle aktualisiert."
-
-#: ../../mod/sources.php:82
-msgid "*"
-msgstr "*"
-
-#: ../../mod/sources.php:89
-msgid "Manage remote sources of content for your channel."
-msgstr "Externe Inhaltsquellen für Deinen Kanal verwalten."
-
-#: ../../mod/sources.php:90 ../../mod/sources.php:100
-msgid "New Source"
-msgstr "Neue Quelle"
-
-#: ../../mod/sources.php:101 ../../mod/sources.php:133
-msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
-msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals."
-
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Only import content with these words (one per line)"
-msgstr "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
-
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Leave blank to import all public content"
-msgstr "Leer lassen, um alle öffentlichen Beiträge zu importieren"
-
-#: ../../mod/sources.php:123 ../../mod/sources.php:150
-msgid "Source not found."
-msgstr "Quelle nicht gefunden."
-
-#: ../../mod/sources.php:130
-msgid "Edit Source"
-msgstr "Quelle bearbeiten"
-
-#: ../../mod/sources.php:131
-msgid "Delete Source"
-msgstr "Quelle löschen"
-
-#: ../../mod/sources.php:158
-msgid "Source removed"
-msgstr "Quelle gelöscht"
-
-#: ../../mod/sources.php:160
-msgid "Unable to remove source."
-msgstr "Konnte die Quelle nicht löschen."
-
-#: ../../mod/lockview.php:37
-msgid "Remote privacy information not available."
-msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
-
-#: ../../mod/lockview.php:58
-msgid "Visible to:"
-msgstr "Sichtbar für:"
-
-#: ../../mod/acl.php:222
-msgid "network"
-msgstr "Netzwerk"
-
-#: ../../mod/acl.php:232
-msgid "RSS"
-msgstr "RSS"
-
-#: ../../mod/regmod.php:11
-msgid "Please login."
-msgstr "Bitte melde dich an."
-
-#: ../../mod/rmagic.php:40
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal."
-
-#: ../../mod/rmagic.php:40
-msgid "The error message was:"
-msgstr "Die Fehlermeldung war:"
-
-#: ../../mod/rmagic.php:44
-msgid "Authentication failed."
-msgstr "Authentifizierung fehlgeschlagen."
-
-#: ../../mod/rmagic.php:84
-msgid "Remote Authentication"
-msgstr "Entfernte Authentifizierung"
-
-#: ../../mod/rmagic.php:85
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
-
-#: ../../mod/rmagic.php:86
-msgid "Authenticate"
-msgstr "Authentifizieren"
-
-#: ../../mod/dirsearch.php:29
-msgid "This directory server requires an access token"
-msgstr "Dieser Verzeichnis-Server benötigt ein Zugangstoken"
-
-#: ../../mod/siteinfo.php:111
-#, php-format
-msgid "Version %s"
-msgstr "Version %s"
-
-#: ../../mod/siteinfo.php:132
-msgid "Installed plugins/addons/apps:"
-msgstr "Installierte Plugins/Addons/Apps"
-
-#: ../../mod/siteinfo.php:145
-msgid "No installed plugins/addons/apps"
-msgstr "Keine installierten Plugins/Addons/Apps"
-
-#: ../../mod/siteinfo.php:158
-msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
-msgstr "Dieser Hub ist Teil von $Projectname – ein globales, kooperatives Netzwerk aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen."
-
-#: ../../mod/siteinfo.php:160
-msgid "Tag: "
-msgstr "Schlagwort: "
-
-#: ../../mod/siteinfo.php:162
-msgid "Last background fetch: "
-msgstr "Letzter Hintergrundabruf:"
-
-#: ../../mod/siteinfo.php:164
-msgid "Current load average: "
-msgstr "Aktuelles Load Average:"
-
-#: ../../mod/siteinfo.php:167
-msgid "Running at web location"
-msgstr "Erreichbar unter der Web-Adresse"
-
-#: ../../mod/siteinfo.php:168
-msgid ""
-"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more"
-" about $Projectname."
-msgstr "Bitte besuche <a href=\"https://redmatrix.me\">redmatrix.me</a>, um mehr über $Projectname zu erfahren."
-
-#: ../../mod/siteinfo.php:169
-msgid "Bug reports and issues: please visit"
-msgstr "Probleme oder Fehler gefunden? Bitte besuche"
-
-#: ../../mod/siteinfo.php:171
-msgid "$projectname issues"
-msgstr "$projectname-Bugtracker"
-
-#: ../../mod/siteinfo.php:172
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
-
-#: ../../mod/siteinfo.php:174
-msgid "Site Administrators"
-msgstr "Administratoren"
-
-#: ../../mod/import.php:27
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr "Dein Vertrag erlaubt nur %d Kanäle."
-
-#: ../../mod/import.php:65 ../../mod/import_items.php:38
-msgid "Nothing to import."
-msgstr "Nichts zu importieren."
-
-#: ../../mod/import.php:89 ../../mod/import_items.php:62
-msgid "Unable to download data from old server"
-msgstr "Daten können vom alten Server nicht heruntergeladen werden"
-
-#: ../../mod/import.php:95 ../../mod/import_items.php:68
-msgid "Imported file is empty."
-msgstr "Die importierte Datei ist leer."
-
-#: ../../mod/import.php:115 ../../mod/import_items.php:82
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr "Achtung: Datenbankversionen unterscheiden sich um %1$d Aktualisierungen."
-
-#: ../../mod/import.php:148
-msgid "No channel. Import failed."
-msgstr "Kein Kanal. Import fehlgeschlagen."
-
-#: ../../mod/import.php:493
-msgid "You must be logged in to use this feature."
-msgstr "Du musst angemeldet sein um diese Funktion zu nutzen."
-
-#: ../../mod/import.php:498
-msgid "Import Channel"
-msgstr "Kanal importieren"
-
-#: ../../mod/import.php:499
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You"
-" may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file."
-msgstr "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren."
-
-#: ../../mod/import.php:500 ../../mod/import_items.php:121
-msgid "File to Upload"
-msgstr "Hochzuladende Datei:"
-
-#: ../../mod/import.php:501
-msgid "Or provide the old server/hub details"
-msgstr "Oder gib die Details Deines bisherigen Red-Servers ein"
-
-#: ../../mod/import.php:502
-msgid "Your old identity address (xyz@example.com)"
-msgstr "Bisherige Kanal-Adresse (xyz@example.com)"
-
-#: ../../mod/import.php:503
-msgid "Your old login email address"
-msgstr "Deine alte Login-E-Mail-Adresse"
-
-#: ../../mod/import.php:504
-msgid "Your old login password"
-msgstr "Dein altes Passwort"
-
-#: ../../mod/import.php:505
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be"
-" able to post from either location, but only one can be marked as the "
-"primary location for files, photos, and media."
-msgstr "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige Red-Server diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein."
-
-#: ../../mod/import.php:506
-msgid "Make this hub my primary location"
-msgstr "Dieser Red-Server ist mein primärer Server."
-
-#: ../../mod/import.php:507
-msgid ""
-"Import existing posts if possible (experimental - limited by available "
-"memory"
-msgstr "Importiere bestehende Beiträge falls möglich (experimentell - begrenzt durch zur Verfügung stehenden Speicher"
-
-#: ../../mod/import.php:508
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
-msgstr "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen."
-
-#: ../../mod/thing.php:111
-msgid "Thing updated"
-msgstr "Sache aktualisiert"
-
-#: ../../mod/thing.php:163
-msgid "Object store: failed"
-msgstr "Speichern des Objekts fehlgeschlagen"
-
-#: ../../mod/thing.php:167
-msgid "Thing added"
-msgstr "Sache hinzugefügt"
-
-#: ../../mod/thing.php:193
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr "OBJ: %1$s %2$s %3$s"
-
-#: ../../mod/thing.php:256
-msgid "Show Thing"
-msgstr "Sache anzeigen"
-
-#: ../../mod/thing.php:263
-msgid "item not found."
-msgstr "Eintrag nicht gefunden"
-
-#: ../../mod/thing.php:296
-msgid "Edit Thing"
-msgstr "Sache bearbeiten"
-
-#: ../../mod/thing.php:298 ../../mod/thing.php:348
-msgid "Select a profile"
-msgstr "Wähle ein Profil"
-
-#: ../../mod/thing.php:302 ../../mod/thing.php:351
-msgid "Post an activity"
-msgstr "Aktivitätsnachricht senden"
-
-#: ../../mod/thing.php:302 ../../mod/thing.php:351
-msgid "Only sends to viewers of the applicable profile"
-msgstr "Nur an Betrachter des ausgewählten Profils senden"
-
-#: ../../mod/thing.php:304 ../../mod/thing.php:353
-msgid "Name of thing e.g. something"
-msgstr "Name der Sache, z. B. irgendwas"
-
-#: ../../mod/thing.php:306 ../../mod/thing.php:354
-msgid "URL of thing (optional)"
-msgstr "URL der Sache (optional)"
-
-#: ../../mod/thing.php:308 ../../mod/thing.php:355
-msgid "URL for photo of thing (optional)"
-msgstr "URL eines Fotos der Sache (optional)"
-
-#: ../../mod/thing.php:346
-msgid "Add Thing to your Profile"
-msgstr "Die Sache Deinem Profil hinzufügen"
-
-#: ../../mod/invite.php:25
-msgid "Total invitation limit exceeded."
-msgstr "Einladungslimit überschritten."
-
-#: ../../mod/invite.php:49
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : Keine gültige Email Adresse."
-
-#: ../../mod/invite.php:76
-msgid "Please join us on $Projectname"
-msgstr "Schließe Dich uns auf $Projectname an!"
-
-#: ../../mod/invite.php:87
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines Red-Servers."
-
-#: ../../mod/invite.php:92
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Nachricht konnte nicht zugestellt werden."
-
-#: ../../mod/invite.php:96
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d Nachricht gesendet."
-msgstr[1] "%d Nachrichten gesendet."
-
-#: ../../mod/invite.php:115
-msgid "You have no more invitations available"
-msgstr "Du hast keine weiteren verfügbare Einladungen"
-
-#: ../../mod/invite.php:129
-msgid "Send invitations"
-msgstr "Einladungen senden"
-
-#: ../../mod/invite.php:130
-msgid "Enter email addresses, one per line:"
-msgstr "Email-Adressen eintragen, eine pro Zeile:"
-
-#: ../../mod/invite.php:132
-msgid "Please join my community on $Projectname."
-msgstr "Schließe Dich uns auf $Projectname an!"
-
-#: ../../mod/invite.php:134
-msgid "You will need to supply this invitation code: "
-msgstr "Gib folgenden Einladungs-Code ein:"
-
-#: ../../mod/invite.php:135
-msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Registriere Dich auf einem beliebigen $Projectname-Hub (sie sind alle miteinander verbunden)"
-
-#: ../../mod/invite.php:137
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Gib meine $Projectname-Adresse im Suchfeld ein."
-
-#: ../../mod/invite.php:138
-msgid "or visit "
-msgstr "oder besuche"
+#: ../../mod/editlayout.php:112
+msgid "Delete layout?"
+msgstr "Layout löschen?"
 
-#: ../../mod/invite.php:140
-msgid "3. Click [Connect]"
-msgstr "3. Klicke auf [Verbinden]"
+#: ../../mod/editlayout.php:159 ../../mod/layouts.php:124
+msgid "Layout Description (Optional)"
+msgstr "Layout-Beschreibung (optional)"
 
-#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25
-#: ../../mod/update_home.php:21 ../../mod/update_network.php:23
-#: ../../mod/update_search.php:46 ../../mod/update_public.php:21
-msgid "[Embedded content - reload page to view]"
-msgstr "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]"
+#: ../../mod/editlayout.php:161 ../../mod/layouts.php:121
+#: ../../mod/layouts.php:179
+msgid "Layout Name"
+msgstr "Layout-Name"
 
-#: ../../mod/viewsrc.php:40
-msgid "Source of Item"
-msgstr "Quelle des Elements"
+#: ../../mod/editlayout.php:178
+msgid "Edit Layout"
+msgstr "Layout bearbeiten"
 
 #: ../../mod/settings.php:76
 msgid "Name is required"
@@ -7430,556 +7500,709 @@ msgstr "Name ist erforderlich"
 msgid "Key and Secret are required"
 msgstr "Schlüssel und Geheimnis werden benötigt"
 
-#: ../../mod/settings.php:231
+#: ../../mod/settings.php:232
 msgid "Passwords do not match. Password unchanged."
 msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
 
-#: ../../mod/settings.php:235
+#: ../../mod/settings.php:236
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
 
-#: ../../mod/settings.php:249
+#: ../../mod/settings.php:250
 msgid "Password changed."
 msgstr "Kennwort geändert."
 
-#: ../../mod/settings.php:251
+#: ../../mod/settings.php:252
 msgid "Password update failed. Please try again."
 msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
 
-#: ../../mod/settings.php:265
+#: ../../mod/settings.php:266
 msgid "Not valid email."
 msgstr "Keine gültige E-Mail Adresse."
 
-#: ../../mod/settings.php:268
+#: ../../mod/settings.php:269
 msgid "Protected email address. Cannot change to that email."
 msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
 
-#: ../../mod/settings.php:277
+#: ../../mod/settings.php:278
 msgid "System failure storing new email. Please try again."
 msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
 
-#: ../../mod/settings.php:518
+#: ../../mod/settings.php:521
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: ../../mod/settings.php:582 ../../mod/settings.php:608
-#: ../../mod/settings.php:644
+#: ../../mod/settings.php:585 ../../mod/settings.php:611
+#: ../../mod/settings.php:647
 msgid "Add application"
 msgstr "Anwendung hinzufügen"
 
-#: ../../mod/settings.php:585
+#: ../../mod/settings.php:588
 msgid "Name of application"
 msgstr "Name der Anwendung"
 
-#: ../../mod/settings.php:586 ../../mod/settings.php:612
+#: ../../mod/settings.php:589 ../../mod/settings.php:615
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:586 ../../mod/settings.php:587
+#: ../../mod/settings.php:589 ../../mod/settings.php:590
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"
 
-#: ../../mod/settings.php:587 ../../mod/settings.php:613
+#: ../../mod/settings.php:590 ../../mod/settings.php:616
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:588 ../../mod/settings.php:614
+#: ../../mod/settings.php:591 ../../mod/settings.php:617
 msgid "Redirect"
 msgstr "Umleitung"
 
-#: ../../mod/settings.php:588
+#: ../../mod/settings.php:591
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "Umleitungs-URl – lasse das leer, solange Deine Anwendung es nicht explizit erfordert"
 
-#: ../../mod/settings.php:589 ../../mod/settings.php:615
+#: ../../mod/settings.php:592 ../../mod/settings.php:618
 msgid "Icon url"
 msgstr "Symbol-URL"
 
-#: ../../mod/settings.php:589
+#: ../../mod/settings.php:592
 msgid "Optional"
 msgstr "Optional"
 
-#: ../../mod/settings.php:600
+#: ../../mod/settings.php:603
 msgid "You can't edit this application."
 msgstr "Diese Anwendung kann nicht bearbeitet werden."
 
-#: ../../mod/settings.php:643
+#: ../../mod/settings.php:646
 msgid "Connected Apps"
 msgstr "Verbundene Apps"
 
-#: ../../mod/settings.php:647
+#: ../../mod/settings.php:650
 msgid "Client key starts with"
 msgstr "Client Key beginnt mit"
 
-#: ../../mod/settings.php:648
+#: ../../mod/settings.php:651
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../../mod/settings.php:649
+#: ../../mod/settings.php:652
 msgid "Remove authorization"
 msgstr "Authorisierung aufheben"
 
-#: ../../mod/settings.php:662
+#: ../../mod/settings.php:665
 msgid "No feature settings configured"
 msgstr "Keine Funktions-Einstellungen konfiguriert"
 
-#: ../../mod/settings.php:669
+#: ../../mod/settings.php:672
 msgid "Feature/Addon Settings"
 msgstr "Funktions-/Addon-Einstellungen"
 
-#: ../../mod/settings.php:692
+#: ../../mod/settings.php:695
 msgid "Account Settings"
 msgstr "Konto-Einstellungen"
 
-#: ../../mod/settings.php:693
+#: ../../mod/settings.php:696
 msgid "Enter New Password:"
 msgstr "Neues Passwort eingeben:"
 
-#: ../../mod/settings.php:694
+#: ../../mod/settings.php:697
 msgid "Confirm New Password:"
 msgstr "Neues Passwort bestätigen:"
 
-#: ../../mod/settings.php:694
+#: ../../mod/settings.php:697
 msgid "Leave password fields blank unless changing"
 msgstr "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern"
 
-#: ../../mod/settings.php:696 ../../mod/settings.php:1027
+#: ../../mod/settings.php:699 ../../mod/settings.php:1030
 msgid "Email Address:"
 msgstr "Email Adresse:"
 
-#: ../../mod/settings.php:698
+#: ../../mod/settings.php:701
 msgid "Remove this account including all its channels"
 msgstr "Dieses Konto inklusive all seiner Kanäle löschen"
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:717
 msgid "Off"
 msgstr "Aus"
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:717
 msgid "On"
 msgstr "An"
 
-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:724
 msgid "Additional Features"
 msgstr "Zusätzliche Funktionen"
 
-#: ../../mod/settings.php:745
+#: ../../mod/settings.php:748
 msgid "Connector Settings"
 msgstr "Connector-Einstellungen"
 
-#: ../../mod/settings.php:784
+#: ../../mod/settings.php:787
 msgid "No special theme for mobile devices"
 msgstr "Keine spezielle Theme für mobile Geräte"
 
-#: ../../mod/settings.php:787
+#: ../../mod/settings.php:790
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s – (experimentell)"
 
-#: ../../mod/settings.php:826
+#: ../../mod/settings.php:829
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../../mod/settings.php:827
+#: ../../mod/settings.php:830
 msgid "Theme Settings"
 msgstr "Theme-Einstellungen"
 
-#: ../../mod/settings.php:828
+#: ../../mod/settings.php:831
 msgid "Custom Theme Settings"
 msgstr "Benutzerdefinierte Theme-Einstellungen"
 
-#: ../../mod/settings.php:829
+#: ../../mod/settings.php:832
 msgid "Content Settings"
 msgstr "Inhaltseinstellungen"
 
-#: ../../mod/settings.php:835
+#: ../../mod/settings.php:838
 msgid "Display Theme:"
 msgstr "Anzeige-Theme:"
 
-#: ../../mod/settings.php:836
+#: ../../mod/settings.php:839
 msgid "Mobile Theme:"
 msgstr "Mobile Theme:"
 
-#: ../../mod/settings.php:837
+#: ../../mod/settings.php:840
 msgid "Enable user zoom on mobile devices"
 msgstr "Zoom auf Mobilgeräten aktivieren"
 
-#: ../../mod/settings.php:838
+#: ../../mod/settings.php:841
 msgid "Update browser every xx seconds"
 msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../mod/settings.php:838
+#: ../../mod/settings.php:841
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum 10 Sekunden, kein Maximum"
 
-#: ../../mod/settings.php:839
+#: ../../mod/settings.php:842
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:"
 
-#: ../../mod/settings.php:839
+#: ../../mod/settings.php:842
 msgid "Maximum of 100 items"
 msgstr "Maximum: 100 Beiträge"
 
-#: ../../mod/settings.php:840
+#: ../../mod/settings.php:843
 msgid "Show emoticons (smilies) as images"
 msgstr "Emoticons (Smilies) als Bilder anzeigen"
 
-#: ../../mod/settings.php:841
+#: ../../mod/settings.php:844
 msgid "Link post titles to source"
 msgstr "Beitragstitel zum Originalbeitrag verlinken"
 
-#: ../../mod/settings.php:842
+#: ../../mod/settings.php:845
 msgid "System Page Layout Editor - (advanced)"
 msgstr "System-Seitenlayout-Editor (für Experten)"
 
-#: ../../mod/settings.php:845
+#: ../../mod/settings.php:848
 msgid "Use blog/list mode on channel page"
 msgstr "Blog-/Listenmodus auf der Kanalseite verwenden"
 
-#: ../../mod/settings.php:845 ../../mod/settings.php:846
+#: ../../mod/settings.php:848 ../../mod/settings.php:849
 msgid "(comments displayed separately)"
 msgstr "(Kommentare werden separat angezeigt)"
 
-#: ../../mod/settings.php:846
+#: ../../mod/settings.php:849
 msgid "Use blog/list mode on matrix page"
 msgstr "Blog-/Listenmodus auf der Matrixseite verwenden"
 
-#: ../../mod/settings.php:847
+#: ../../mod/settings.php:850
 msgid "Channel page max height of content (in pixels)"
 msgstr "Maximale Höhe von Beitragsblöcken auf der Kanalseite (in Pixeln)"
 
-#: ../../mod/settings.php:847 ../../mod/settings.php:848
+#: ../../mod/settings.php:850 ../../mod/settings.php:851
 msgid "click to expand content exceeding this height"
 msgstr "Blöcke, deren Inhalt diese Höhe überschreitet, können per Klick vergrößert werden."
 
-#: ../../mod/settings.php:848
+#: ../../mod/settings.php:851
 msgid "Matrix page max height of content (in pixels)"
 msgstr "Maximale Höhe von Beitragsblöcken auf der Matrixseite (in Pixeln)"
 
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:885
 msgid "Nobody except yourself"
 msgstr "Niemand außer Dir selbst"
 
-#: ../../mod/settings.php:883
+#: ../../mod/settings.php:886
 msgid "Only those you specifically allow"
 msgstr "Nur die, denen Du es explizit erlaubst"
 
-#: ../../mod/settings.php:884
+#: ../../mod/settings.php:887
 msgid "Approved connections"
 msgstr "Angenommene Verbindungen"
 
-#: ../../mod/settings.php:885
+#: ../../mod/settings.php:888
 msgid "Any connections"
 msgstr "Beliebige Verbindungen"
 
-#: ../../mod/settings.php:886
+#: ../../mod/settings.php:889
 msgid "Anybody on this website"
 msgstr "Jeder auf dieser Website"
 
-#: ../../mod/settings.php:887
+#: ../../mod/settings.php:890
 msgid "Anybody in this network"
-msgstr "Alle Red-Nutzer"
+msgstr "Alle $Projectname-Mitglieder"
 
-#: ../../mod/settings.php:888
+#: ../../mod/settings.php:891
 msgid "Anybody authenticated"
 msgstr "Jeder authentifizierte"
 
-#: ../../mod/settings.php:889
+#: ../../mod/settings.php:892
 msgid "Anybody on the internet"
 msgstr "Jeder im Internet"
 
-#: ../../mod/settings.php:963
+#: ../../mod/settings.php:966
 msgid "Publish your default profile in the network directory"
 msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
 
-#: ../../mod/settings.php:968
+#: ../../mod/settings.php:971
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../mod/settings.php:977
+#: ../../mod/settings.php:980
 msgid "Your channel address is"
 msgstr "Deine Kanal-Adresse lautet"
 
-#: ../../mod/settings.php:1018
+#: ../../mod/settings.php:1021
 msgid "Channel Settings"
 msgstr "Kanal-Einstellungen"
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1028
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../mod/settings.php:1028
+#: ../../mod/settings.php:1031
 msgid "Your Timezone:"
 msgstr "Ihre Zeitzone:"
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1032
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1032
 msgid "Geographical location to display on your posts"
 msgstr "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll"
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1033
 msgid "Use Browser Location:"
 msgstr "Standort des Browsers verwenden:"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1035
 msgid "Adult Content"
 msgstr "Nicht jugendfreie Inhalte"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1035
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1037
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Datenschutz-Einstellungen"
 
-#: ../../mod/settings.php:1036
+#: ../../mod/settings.php:1039
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Deine Zugriffsrechte sind schon konfiguriert. Klicke hier, um sie zu betrachten oder zu ändern"
 
-#: ../../mod/settings.php:1038
+#: ../../mod/settings.php:1041
 msgid "Hide my online presence"
 msgstr "Meine Online-Präsenz verbergen"
 
-#: ../../mod/settings.php:1038
+#: ../../mod/settings.php:1041
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
 
-#: ../../mod/settings.php:1040
+#: ../../mod/settings.php:1043
 msgid "Simple Privacy Settings:"
 msgstr "Einfache Privatsphäre-Einstellungen"
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1044
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Komplett offen – <em>extrem ungeschützt (mit großer Vorsicht verwenden!)</em>"
 
-#: ../../mod/settings.php:1042
+#: ../../mod/settings.php:1045
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Typisch – <em>Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)</em>"
 
-#: ../../mod/settings.php:1043
+#: ../../mod/settings.php:1046
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privat – <em>Standard privat, nie offen oder öffentlich</em>"
 
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1047
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Blockiert – <em>Alle standardmäßig blockiert</em>"
 
-#: ../../mod/settings.php:1046
+#: ../../mod/settings.php:1049
 msgid "Allow others to tag your posts"
 msgstr "Erlaube anderen, Deine Beiträge zu verschlagworten"
 
-#: ../../mod/settings.php:1046
+#: ../../mod/settings.php:1049
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren"
 
-#: ../../mod/settings.php:1048
+#: ../../mod/settings.php:1051
 msgid "Advanced Privacy Settings"
 msgstr "Fortgeschrittene Privatsphäre-Einstellungen"
 
-#: ../../mod/settings.php:1050
+#: ../../mod/settings.php:1053
 msgid "Expire other channel content after this many days"
 msgstr "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen"
 
-#: ../../mod/settings.php:1050
+#: ../../mod/settings.php:1053
 msgid "0 or blank prevents expiration"
 msgstr "0 oder kein Inhalt verhindern das Verfallen"
 
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1054
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Kontaktanfragen pro Tag:"
 
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1054
 msgid "May reduce spam activity"
 msgstr "Kann die Spam-Aktivität verringern"
 
-#: ../../mod/settings.php:1052
+#: ../../mod/settings.php:1055
 msgid "Default Post Permissions"
 msgstr "Standardeinstellungen für Beitrags-Zugriffsrechte"
 
-#: ../../mod/settings.php:1057
+#: ../../mod/settings.php:1056 ../../mod/mitem.php:150 ../../mod/mitem.php:223
+msgid "(click to open/close)"
+msgstr "(zum öffnen/schließen anklicken)"
+
+#: ../../mod/settings.php:1060
 msgid "Channel permissions category:"
 msgstr "Zugriffsrechte-Kategorie des Kanals:"
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1066
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1066
 msgid "Useful to reduce spamming"
 msgstr "Nützlich, um Spam zu verringern"
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1069
 msgid "Notification Settings"
 msgstr "Benachrichtigungs-Einstellungen"
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1070
 msgid "By default post a status message when:"
 msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1071
 msgid "accepting a friend request"
 msgstr "Du eine Verbindungsanfrage annimmst"
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1072
 msgid "joining a forum/community"
 msgstr "Du einem Forum beitrittst"
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1073
 msgid "making an <em>interesting</em> profile change"
 msgstr "Du eine <em>interessante</em> Änderung an Deinem Profil vornimmst"
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1074
 msgid "Send a notification email when:"
 msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1075
 msgid "You receive a connection request"
 msgstr "Du eine Verbindungsanfrage erhältst"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1076
 msgid "Your connections are confirmed"
 msgstr "Eine Verbindung bestätigt wurde"
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1077
 msgid "Someone writes on your profile wall"
 msgstr "Jemand auf Deine Pinnwand schreibt"
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1078
 msgid "Someone writes a followup comment"
 msgstr "Jemand einen Beitrag kommentiert"
 
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1079
 msgid "You receive a private message"
 msgstr "Du eine private Nachricht erhältst"
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1080
 msgid "You receive a friend suggestion"
 msgstr "Du einen Kontaktvorschlag erhältst"
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1081
 msgid "You are tagged in a post"
 msgstr "Du in einem Beitrag erwähnt wurdest"
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1082
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
 
-#: ../../mod/settings.php:1082
+#: ../../mod/settings.php:1085
 msgid "Show visual notifications including:"
 msgstr "Visuelle Benachrichtigungen anzeigen für:"
 
-#: ../../mod/settings.php:1084
+#: ../../mod/settings.php:1087
 msgid "Unseen matrix activity"
 msgstr "Ungesehene Matrix-Aktivität"
 
-#: ../../mod/settings.php:1085
+#: ../../mod/settings.php:1088
 msgid "Unseen channel activity"
 msgstr "Ungesehene Kanal-Aktivität"
 
-#: ../../mod/settings.php:1086
+#: ../../mod/settings.php:1089
 msgid "Unseen private messages"
 msgstr "Ungelesene persönliche Nachrichten"
 
-#: ../../mod/settings.php:1086 ../../mod/settings.php:1091
-#: ../../mod/settings.php:1092 ../../mod/settings.php:1093
+#: ../../mod/settings.php:1089 ../../mod/settings.php:1094
+#: ../../mod/settings.php:1095 ../../mod/settings.php:1096
 msgid "Recommended"
 msgstr "Empfohlen"
 
-#: ../../mod/settings.php:1087
+#: ../../mod/settings.php:1090
 msgid "Upcoming events"
 msgstr "Baldige Termine"
 
-#: ../../mod/settings.php:1088
+#: ../../mod/settings.php:1091
 msgid "Events today"
 msgstr "Heutige Termine"
 
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1092
 msgid "Upcoming birthdays"
 msgstr "Baldige Geburtstage"
 
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1092
 msgid "Not available in all themes"
 msgstr "Nicht in allen Themes verfügbar"
 
-#: ../../mod/settings.php:1090
+#: ../../mod/settings.php:1093
 msgid "System (personal) notifications"
 msgstr "System – (persönliche) Benachrichtigungen"
 
-#: ../../mod/settings.php:1091
+#: ../../mod/settings.php:1094
 msgid "System info messages"
 msgstr "System – Info-Nachrichten"
 
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1095
 msgid "System critical alerts"
 msgstr "System – kritische Warnungen"
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1096
 msgid "New connections"
 msgstr "Neue Verbindungen"
 
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1097
 msgid "System Registrations"
 msgstr "System – Registrierungen"
 
-#: ../../mod/settings.php:1095
+#: ../../mod/settings.php:1098
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Zeigt neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen an"
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1100
 msgid "Notify me of events this many days in advance"
 msgstr "Benachrichtige mich zu Terminen so viele Tage im Voraus"
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1100
 msgid "Must be greater than 0"
 msgstr "Muss größer als 0 sein"
 
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1102
 msgid "Advanced Account/Page Type Settings"
 msgstr "Erweiterte Account- und Seitenart-Einstellungen"
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1103
 msgid "Change the behaviour of this account for special situations"
 msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1106
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr "Aktiviere den Expertenmodus (unter <a href=\"settings/features\">Settings > Zusätzliche Funktionen</a>), um hier Einstellungen vorzunehmen!"
 
-#: ../../mod/settings.php:1104
+#: ../../mod/settings.php:1107
 msgid "Miscellaneous Settings"
 msgstr "Sonstige Einstellungen"
 
-#: ../../mod/settings.php:1105
+#: ../../mod/settings.php:1108
 msgid "Default photo upload folder"
 msgstr "Voreingestellter Ordner für hochgeladene Fotos"
 
-#: ../../mod/settings.php:1106
+#: ../../mod/settings.php:1108 ../../mod/settings.php:1109
+msgid "%Y - current year, %m -  current month"
+msgstr "%Y - aktuelles Jahr, %m -  aktueller Monat"
+
+#: ../../mod/settings.php:1109
 msgid "Default file upload folder"
 msgstr "Voreingestellter Ordner für hochgeladene Dateien"
 
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1111
 msgid "Personal menu to display in your channel pages"
 msgstr "Eigenes Menü zur Anzeige auf den Seiten deines Kanals"
 
-#: ../../mod/settings.php:1110
+#: ../../mod/settings.php:1113
 msgid "Remove this channel."
 msgstr "Diesen Kanal löschen"
 
+#: ../../mod/settings.php:1114
+msgid "Firefox Share $Projectname provider"
+msgstr "$Projectname-Provider für Firefox Share"
+
+#: ../../mod/settings.php:1115
+msgid "Start calendar week on monday"
+msgstr "Montag als erster Tag der Kalenderwoche"
+
+#: ../../mod/webpages.php:191
+msgid "Page Title"
+msgstr "Seitentitel"
+
+#: ../../mod/appman.php:28 ../../mod/appman.php:44
+msgid "App installed."
+msgstr "App installiert."
+
+#: ../../mod/appman.php:37
+msgid "Malformed app."
+msgstr "Fehlerhafte App."
+
+#: ../../mod/appman.php:80
+msgid "Embed code"
+msgstr "Code einbetten"
+
+#: ../../mod/appman.php:86
+msgid "Edit App"
+msgstr "App bearbeiten"
+
+#: ../../mod/appman.php:86
+msgid "Create App"
+msgstr "App erstellen"
+
+#: ../../mod/appman.php:91
+msgid "Name of app"
+msgstr "Name der App"
+
+#: ../../mod/appman.php:92
+msgid "Location (URL) of app"
+msgstr "Ort (URL) der App"
+
+#: ../../mod/appman.php:94
+msgid "Photo icon URL"
+msgstr "URL zum Icon"
+
+#: ../../mod/appman.php:94
+msgid "80 x 80 pixels - optional"
+msgstr "80 x 80 Pixel – optional"
+
+#: ../../mod/appman.php:95
+msgid "Version ID"
+msgstr "Versions-ID"
+
+#: ../../mod/appman.php:96
+msgid "Price of app"
+msgstr "Preis der App"
+
+#: ../../mod/appman.php:97
+msgid "Location (URL) to purchase app"
+msgstr "Ort (URL), um die App zu kaufen"
+
+#: ../../mod/filer.php:48
+msgid "- select -"
+msgstr "– auswählen –"
+
+#: ../../mod/layouts.php:176
+msgid "Comanche page description language help"
+msgstr "Hilfe zur Comanche-Seitenbeschreibungssprache"
+
+#: ../../mod/layouts.php:180
+msgid "Layout Description"
+msgstr "Layout-Beschreibung"
+
+#: ../../mod/layouts.php:185
+msgid "Download PDL file"
+msgstr "PDL-Datei herunterladen"
+
+#: ../../mod/locs.php:21 ../../mod/locs.php:50
+msgid "Location not found."
+msgstr "Klon nicht gefunden."
+
+#: ../../mod/locs.php:58
+msgid "Location lookup failed."
+msgstr "Nachschlagen des Kanal-Ortes fehlgeschlagen"
+
+#: ../../mod/locs.php:62
+msgid ""
+"Please select another location to become primary before removing the primary"
+" location."
+msgstr "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst."
+
+#: ../../mod/locs.php:91
+msgid "Syncing locations"
+msgstr "Synchronisiere Klone"
+
+#: ../../mod/locs.php:101
+msgid "No locations found."
+msgstr "Keine Klon-Adressen gefunden."
+
+#: ../../mod/locs.php:112
+msgid "Manage Channel Locations"
+msgstr "Klon-Adressen verwalten"
+
+#: ../../mod/locs.php:113
+msgid "Location (address)"
+msgstr "URL (Adresse)"
+
+#: ../../mod/locs.php:114
+msgid "Primary Location"
+msgstr "Primärer Klon"
+
+#: ../../mod/locs.php:115
+msgid "Drop location"
+msgstr "Klon löschen"
+
+#: ../../mod/locs.php:117
+msgid "Sync now"
+msgstr "Jetzt synchronisieren"
+
+#: ../../mod/locs.php:118
+msgid "Please wait several minutes between consecutive operations."
+msgstr "Bitte warte mehrere Minuten zwischen dem Ausführen zweier Operationen!"
+
+#: ../../mod/locs.php:119
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing"
+" your channel."
+msgstr "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub einloggst und den Kanal dort löschst."
+
+#: ../../mod/locs.php:120
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt."
+
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:61
+msgid "$Projectname"
+msgstr "$Projectname"
+
+#: ../../mod/home.php:75
+#, php-format
+msgid "Welcome to %s"
+msgstr "Willkommen auf %s"
+
+#: ../../mod/regmod.php:11
+msgid "Please login."
+msgstr "Bitte melde dich an."
+
 #: ../../mod/xchan.php:6
 msgid "Xchan Lookup"
 msgstr "Xchan-Suche"
@@ -7988,62 +8211,338 @@ msgstr "Xchan-Suche"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:"
 
-#: ../../mod/manage.php:130
+#: ../../mod/xchan.php:37 ../../mod/menu.php:162 ../../mod/mitem.php:116
+msgid "Not found."
+msgstr "Nicht gefunden."
+
+#: ../../mod/channel.php:25 ../../mod/chat.php:19
+msgid "You must be logged in to see this page."
+msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
+
+#: ../../mod/channel.php:97
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
+
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr "Element nicht verfügbar."
+
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden."
+
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr "Album nicht gefunden."
+
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr "Album löschen"
+
+#: ../../mod/photos.php:171 ../../mod/photos.php:1006
+msgid "Delete Photo"
+msgstr "Foto löschen"
+
+#: ../../mod/photos.php:501
+msgid "No photos selected"
+msgstr "Keine Fotos ausgewählt"
+
+#: ../../mod/photos.php:550
+msgid "Access to this item is restricted."
+msgstr "Der Zugriff auf dieses Foto ist eingeschränkt."
+
+#: ../../mod/photos.php:589
 #, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "%1$.2f MB von %2$.2f MB Foto-Speicher belegt."
 
-#: ../../mod/manage.php:138
-msgid "Create a new channel"
-msgstr "Neuen Kanal anlegen"
+#: ../../mod/photos.php:592
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB Foto-Speicher belegt."
 
-#: ../../mod/manage.php:161
-msgid "Current Channel"
-msgstr "Aktueller Kanal"
+#: ../../mod/photos.php:620
+msgid "Upload Photos"
+msgstr "Fotos hochladen"
 
-#: ../../mod/manage.php:163
-msgid "Switch to one of your channels by selecting it."
-msgstr "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst."
+#: ../../mod/photos.php:624
+msgid "Enter an album name"
+msgstr "Namen für ein neues Album eingeben"
 
-#: ../../mod/manage.php:164
-msgid "Default Channel"
-msgstr "Standard Kanal"
+#: ../../mod/photos.php:625
+msgid "or select an existing album (doubleclick)"
+msgstr "oder ein bereits vorhandenes auswählen (Doppelklick)"
 
-#: ../../mod/manage.php:165
-msgid "Make Default"
-msgstr "Zum Standard machen"
+#: ../../mod/photos.php:626
+msgid "Create a status post for this upload"
+msgstr "Einen Statusbeitrag für diesen Upload erzeugen"
 
-#: ../../mod/manage.php:168
+#: ../../mod/photos.php:627
+msgid "Caption (optional):"
+msgstr "Beschriftung (optional):"
+
+#: ../../mod/photos.php:628
+msgid "Description (optional):"
+msgstr "Beschreibung (optional):"
+
+#: ../../mod/photos.php:655
+msgid "Album name could not be decoded"
+msgstr "Albumname konnte nicht dekodiert werden"
+
+#: ../../mod/photos.php:699 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1250
+msgid "Contact Photos"
+msgstr "Kontakt-Bilder"
+
+#: ../../mod/photos.php:722
+msgid "Show Newest First"
+msgstr "Neueste zuerst anzeigen"
+
+#: ../../mod/photos.php:724
+msgid "Show Oldest First"
+msgstr "Älteste zuerst anzeigen"
+
+#: ../../mod/photos.php:824
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
+
+#: ../../mod/photos.php:826
+msgid "Photo not available"
+msgstr "Foto nicht verfügbar"
+
+#: ../../mod/photos.php:884
+msgid "Use as profile photo"
+msgstr "Als Profilfoto verwenden"
+
+#: ../../mod/photos.php:891
+msgid "Private Photo"
+msgstr "Privates Foto"
+
+#: ../../mod/photos.php:902 ../../mod/events.php:652 ../../mod/events.php:659
+msgid "Previous"
+msgstr "Voriges"
+
+#: ../../mod/photos.php:906
+msgid "View Full Size"
+msgstr "In voller Größe anzeigen"
+
+#: ../../mod/photos.php:985
+msgid "Edit photo"
+msgstr "Foto bearbeiten"
+
+#: ../../mod/photos.php:987
+msgid "Rotate CW (right)"
+msgstr "Drehen im UZS (rechts)"
+
+#: ../../mod/photos.php:988
+msgid "Rotate CCW (left)"
+msgstr "Drehen gegen UZS (links)"
+
+#: ../../mod/photos.php:991
+msgid "Enter a new album name"
+msgstr "Gib einen Namen für ein neues Album ein"
+
+#: ../../mod/photos.php:992
+msgid "or select an existing one (doubleclick)"
+msgstr "oder wähle ein bereits vorhandenes aus (Doppelklick)"
+
+#: ../../mod/photos.php:995
+msgid "Caption"
+msgstr "Bildunterschrift"
+
+#: ../../mod/photos.php:997
+msgid "Add a Tag"
+msgstr "Schlagwort hinzufügen"
+
+#: ../../mod/photos.php:1001
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Beispiele: @ben, @Karl_Prester, @lieschen@example.com"
+
+#: ../../mod/photos.php:1004
+msgid "Flag as adult in album view"
+msgstr "In der Albumansicht als nicht jugendfrei markieren"
+
+#: ../../mod/photos.php:1196
+msgid "In This Photo:"
+msgstr "Auf diesem Foto:"
+
+#: ../../mod/photos.php:1201
+msgid "Map"
+msgstr "Karte"
+
+#: ../../mod/photos.php:1289
+msgid "View Album"
+msgstr "Album ansehen"
+
+#: ../../mod/photos.php:1300 ../../mod/photos.php:1313
+#: ../../mod/photos.php:1314
+msgid "Recent Photos"
+msgstr "Neueste Fotos"
+
+#: ../../mod/lockview.php:37
+msgid "Remote privacy information not available."
+msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
+
+#: ../../mod/lockview.php:58
+msgid "Visible to:"
+msgstr "Sichtbar für:"
+
+#: ../../mod/uexport.php:51 ../../mod/uexport.php:52
+msgid "Export Channel"
+msgstr "Kanal exportieren"
+
+#: ../../mod/uexport.php:53
+msgid ""
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält."
+
+#: ../../mod/uexport.php:54
+msgid "Export Content"
+msgstr "Kanal und Inhalte exportieren"
+
+#: ../../mod/uexport.php:55
+msgid ""
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet."
+
+#: ../../mod/uexport.php:56
+msgid "Export your posts from a given year."
+msgstr "Exportiert die Beiträge des angegebenen Jahres."
+
+#: ../../mod/uexport.php:58
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne."
+
+#: ../../mod/uexport.php:59
 #, php-format
-msgid "%d new messages"
-msgstr "%d neue Nachrichten"
+msgid ""
+"To select all posts for a given year, such as this year, visit <a "
+"href=\"%1$s\">%2$s</a>"
+msgstr "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1$s\">%2$s</a>."
 
-#: ../../mod/manage.php:169
+#: ../../mod/uexport.php:60
 #, php-format
-msgid "%d new introductions"
-msgstr "%d neue Vorstellungen"
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1$s\">%2$s</a>."
 
-#: ../../mod/manage.php:171
-msgid "Delegated Channels"
-msgstr "Delegierte Kanäle"
+#: ../../mod/uexport.php:61
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a "
+"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
+" please import or restore these in date order (oldest first)."
+msgstr "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1$s\">%2$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst."
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
-msgstr "Zugriff für die Anwendung autorisieren"
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "Element kann nicht bearbeitet werden."
 
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Trage folgenden Sicherheitscode in der Anwendung ein:"
+#: ../../mod/editpost.php:57
+msgid "Delete item?"
+msgstr "Eintrag löschen?"
 
-#: ../../mod/api.php:89
-msgid "Please login to continue."
-msgstr "Zum Weitermachen, bitte einloggen."
+#: ../../mod/editpost.php:164 ../../mod/rpost.php:128
+msgid "Edit post"
+msgstr "Bearbeite Beitrag"
 
-#: ../../mod/api.php:104
+#: ../../mod/follow.php:25
+msgid "Channel added."
+msgstr "Kanal hinzugefügt."
+
+#: ../../mod/rmagic.php:40
 msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal."
+
+#: ../../mod/rmagic.php:40
+msgid "The error message was:"
+msgstr "Die Fehlermeldung war:"
+
+#: ../../mod/rmagic.php:44
+msgid "Authentication failed."
+msgstr "Authentifizierung fehlgeschlagen."
+
+#: ../../mod/rmagic.php:84
+msgid "Remote Authentication"
+msgstr "Entfernte Authentifizierung"
+
+#: ../../mod/rmagic.php:85
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
+
+#: ../../mod/rmagic.php:86
+msgid "Authenticate"
+msgstr "Authentifizieren"
+
+#: ../../mod/chat.php:174
+msgid "Room not found"
+msgstr "Chatraum nicht gefunden"
+
+#: ../../mod/chat.php:185
+msgid "Leave Room"
+msgstr "Raum verlassen"
+
+#: ../../mod/chat.php:186
+msgid "Delete This Room"
+msgstr "Diesen Raum löschen"
+
+#: ../../mod/chat.php:187
+msgid "I am away right now"
+msgstr "Ich bin gerade nicht da"
+
+#: ../../mod/chat.php:188
+msgid "I am online"
+msgstr "Ich bin online"
+
+#: ../../mod/chat.php:190
+msgid "Bookmark this room"
+msgstr "Lesezeichen für diesen Raum setzen"
+
+#: ../../mod/chat.php:208 ../../mod/chat.php:231
+msgid "New Chatroom"
+msgstr "Neuer Chatraum"
+
+#: ../../mod/chat.php:209
+msgid "Chatroom Name"
+msgstr "Name des Chatraums"
+
+#: ../../mod/chat.php:210
+msgid "Expiration of chats (minutes)"
+msgstr "Verfall von Chats (Minuten)"
+
+#: ../../mod/chat.php:227
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "%1$ss Chaträume"
+
+#: ../../mod/viewsrc.php:40
+msgid "Source of Item"
+msgstr "Quelle des Elements"
+
+#: ../../mod/ffsapi.php:8
+msgid "Share content from Firefox to $Projectname"
+msgstr "Inhalte von Firefox nach $Projectname teilen"
+
+#: ../../mod/ffsapi.php:11
+msgid "Activate the Firefox $Projectname provider"
+msgstr "Aktiviert den $Projectname-Provider für firefox"
+
+#: ../../mod/magic.php:69
+msgid "Hub not found."
+msgstr "Server nicht gefunden."
 
 #: ../../mod/connections.php:52 ../../mod/connections.php:150
 msgid "Blocked"
@@ -8122,589 +8621,298 @@ msgstr "Verbindungen durchsuchen"
 msgid "Finding: "
 msgstr "Ergebnisse:"
 
-#: ../../mod/editlayout.php:112
-msgid "Delete layout?"
-msgstr "Layout löschen?"
-
-#: ../../mod/editlayout.php:178
-msgid "Edit Layout"
-msgstr "Layout bearbeiten"
-
-#: ../../mod/editwebpage.php:153
-msgid "Delete webpage?"
-msgstr "Webseite löschen?"
-
-#: ../../mod/editwebpage.php:172
-msgid "Page link title"
-msgstr "Seitentitel-Link"
-
-#: ../../mod/editwebpage.php:222
-msgid "Edit Webpage"
-msgstr "Webseite bearbeiten"
-
-#: ../../mod/group.php:20
-msgid "Collection created."
-msgstr "Sammlung erstellt."
-
-#: ../../mod/group.php:26
-msgid "Could not create collection."
-msgstr "Sammlung kann nicht erstellt werden."
-
-#: ../../mod/group.php:54
-msgid "Collection updated."
-msgstr "Sammlung aktualisiert."
-
-#: ../../mod/group.php:86
-msgid "Create a collection of channels."
-msgstr "Erstelle eine Sammlung von Kanälen."
-
-#: ../../mod/group.php:87 ../../mod/group.php:180
-msgid "Collection Name: "
-msgstr "Name der Sammlung:"
-
-#: ../../mod/group.php:89 ../../mod/group.php:183
-msgid "Members are visible to other channels"
-msgstr "Mitglieder sind sichtbar für andere Kanäle"
-
-#: ../../mod/group.php:107
-msgid "Collection removed."
-msgstr "Sammlung gelöscht."
-
-#: ../../mod/group.php:109
-msgid "Unable to remove collection."
-msgstr "Löschen der Sammlung nicht möglich."
-
-#: ../../mod/group.php:179
-msgid "Collection Editor"
-msgstr "Sammlung-Editor"
-
-#: ../../mod/group.php:193
-msgid "Members"
-msgstr "Mitglieder"
-
-#: ../../mod/group.php:195
-msgid "All Connected Channels"
-msgstr "Alle verbundenen Kanäle"
-
-#: ../../mod/group.php:227
-msgid "Click on a channel to add or remove."
-msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
-
-#: ../../mod/connect.php:56 ../../mod/connect.php:104
-msgid "Continue"
-msgstr "Fortfahren"
-
-#: ../../mod/connect.php:85
-msgid "Premium Channel Setup"
-msgstr "Premium-Kanal-Einrichtung"
-
-#: ../../mod/connect.php:87
-msgid "Enable premium channel connection restrictions"
-msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
-
-#: ../../mod/connect.php:88
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."
-
-#: ../../mod/connect.php:90 ../../mod/connect.php:110
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
-
-#: ../../mod/connect.php:91
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
-
-#: ../../mod/connect.php:92 ../../mod/connect.php:113
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite."
+#: ../../mod/help.php:147
+msgid "Documentation Search"
+msgstr "Suche in der Dokumentation"
 
-#: ../../mod/connect.php:101
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
+#: ../../mod/help.php:184 ../../mod/help.php:190 ../../mod/help.php:196
+msgid "Help:"
+msgstr "Hilfe:"
 
-#: ../../mod/connect.php:109
-msgid "Restricted or Premium Channel"
-msgstr "Eingeschränkter oder Premium-Kanal"
+#: ../../mod/help.php:211 ../../index.php:238
+msgid "Not Found"
+msgstr "Nicht gefunden"
 
-#: ../../mod/viewconnections.php:59
-msgid "No connections."
-msgstr "Keine Verbindungen."
+#: ../../mod/help.php:235
+msgid "$Projectname Documentation"
+msgstr "$Projectname-Dokumentation"
 
-#: ../../mod/viewconnections.php:72
+#: ../../mod/manage.php:130
 #, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "%ss Profil [%s] besuchen"
-
-#: ../../mod/locs.php:21 ../../mod/locs.php:49
-msgid "Location not found."
-msgstr "Klon nicht gefunden."
-
-#: ../../mod/locs.php:57
-msgid "Location lookup failed."
-msgstr "Nachschlagen des Kanal-Ortes fehlgeschlagen"
-
-#: ../../mod/locs.php:61
-msgid ""
-"Please select another location to become primary before removing the primary"
-" location."
-msgstr "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst."
-
-#: ../../mod/locs.php:93
-msgid "No locations found."
-msgstr "Keine Klon-Adressen gefunden."
-
-#: ../../mod/locs.php:104
-msgid "Manage Channel Locations"
-msgstr "Klon-Adressen verwalten"
-
-#: ../../mod/locs.php:105
-msgid "Location (address)"
-msgstr "URL (Adresse)"
-
-#: ../../mod/locs.php:106
-msgid "Primary Location"
-msgstr "Primärer Klon"
-
-#: ../../mod/locs.php:107
-msgid "Drop location"
-msgstr "Klon löschen"
-
-#: ../../mod/post.php:234
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."
-
-#: ../../mod/setup.php:191
-msgid "$Projectname Server - Setup"
-msgstr "$Projectname Server-Einrichtung"
-
-#: ../../mod/setup.php:195
-msgid "Could not connect to database."
-msgstr "Kann nicht mit der Datenbank verbinden."
-
-#: ../../mod/setup.php:199
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS."
-
-#: ../../mod/setup.php:206
-msgid "Could not create table."
-msgstr "Kann Tabelle nicht erstellen."
-
-#: ../../mod/setup.php:211
-msgid "Your site database has been installed."
-msgstr "Die Datenbank Deines Hubs wurde installiert."
-
-#: ../../mod/setup.php:215
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren."
-
-#: ../../mod/setup.php:216 ../../mod/setup.php:284 ../../mod/setup.php:734
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Lies die Datei \"install/INSTALL.txt\"."
-
-#: ../../mod/setup.php:281
-msgid "System check"
-msgstr "Systemprüfung"
-
-#: ../../mod/setup.php:286
-msgid "Check again"
-msgstr "Bitte nochmal prüfen"
-
-#: ../../mod/setup.php:308
-msgid "Database connection"
-msgstr "Datenbank Verbindung"
-
-#: ../../mod/setup.php:309
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
-msgstr "Um $Projectname zu installieren, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."
-
-#: ../../mod/setup.php:310
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast."
-
-#: ../../mod/setup.php:311
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst."
-
-#: ../../mod/setup.php:315
-msgid "Database Server Name"
-msgstr "Datenbank-Servername"
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
 
-#: ../../mod/setup.php:315
-msgid "Default is localhost"
-msgstr "Standard ist localhost"
+#: ../../mod/manage.php:138
+msgid "Create a new channel"
+msgstr "Neuen Kanal anlegen"
 
-#: ../../mod/setup.php:316
-msgid "Database Port"
-msgstr "Datenbank-Port"
+#: ../../mod/manage.php:161
+msgid "Current Channel"
+msgstr "Aktueller Kanal"
 
-#: ../../mod/setup.php:316
-msgid "Communication port number - use 0 for default"
-msgstr "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung"
+#: ../../mod/manage.php:163
+msgid "Switch to one of your channels by selecting it."
+msgstr "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst."
 
-#: ../../mod/setup.php:317
-msgid "Database Login Name"
-msgstr "Datenbank-Benutzername"
+#: ../../mod/manage.php:164
+msgid "Default Channel"
+msgstr "Standard Kanal"
 
-#: ../../mod/setup.php:318
-msgid "Database Login Password"
-msgstr "Datenbank-Kennwort"
+#: ../../mod/manage.php:165
+msgid "Make Default"
+msgstr "Zum Standard machen"
 
-#: ../../mod/setup.php:319
-msgid "Database Name"
-msgstr "Datenbank-Name"
+#: ../../mod/manage.php:168
+#, php-format
+msgid "%d new messages"
+msgstr "%d neue Nachrichten"
 
-#: ../../mod/setup.php:320
-msgid "Database Type"
-msgstr "Datenbanktyp"
+#: ../../mod/manage.php:169
+#, php-format
+msgid "%d new introductions"
+msgstr "%d neue Vorstellungen"
 
-#: ../../mod/setup.php:322 ../../mod/setup.php:363
-msgid "Site administrator email address"
-msgstr "E-Mail Adresse des Seiten-Administrators"
+#: ../../mod/manage.php:171
+msgid "Delegated Channels"
+msgstr "Delegierte Kanäle"
 
-#: ../../mod/setup.php:322 ../../mod/setup.php:363
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst."
+#: ../../mod/menu.php:45
+msgid "Unable to update menu."
+msgstr "Kann Menü nicht aktualisieren."
 
-#: ../../mod/setup.php:323 ../../mod/setup.php:365
-msgid "Website URL"
-msgstr "Server-URL"
+#: ../../mod/menu.php:56
+msgid "Unable to create menu."
+msgstr "Kann Menü nicht erstellen."
 
-#: ../../mod/setup.php:323 ../../mod/setup.php:365
-msgid "Please use SSL (https) URL if available."
-msgstr "Nutze wenn möglich eine SSL-URL (https)."
+#: ../../mod/menu.php:94 ../../mod/menu.php:106
+msgid "Menu Name"
+msgstr "Name des Menüs"
 
-#: ../../mod/setup.php:325 ../../mod/setup.php:367
-msgid "Please select a default timezone for your website"
-msgstr "Standard-Zeitzone für Deinen Server"
+#: ../../mod/menu.php:94
+msgid "Unique name (not visible on webpage) - required"
+msgstr "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich"
 
-#: ../../mod/setup.php:352
-msgid "Site settings"
-msgstr "Seiteneinstellungen"
+#: ../../mod/menu.php:95 ../../mod/menu.php:107
+msgid "Menu Title"
+msgstr "Menütitel"
 
-#: ../../mod/setup.php:417
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden."
+#: ../../mod/menu.php:95
+msgid "Visible on webpage - leave empty for no title"
+msgstr "Sichtbar auf der Webseite – für keinen Titel leer lassen"
 
-#: ../../mod/setup.php:418
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen."
+#: ../../mod/menu.php:96
+msgid "Allow Bookmarks"
+msgstr "Lesezeichen erlauben"
 
-#: ../../mod/setup.php:422
-msgid "PHP executable path"
-msgstr "PHP Pfad zu ausführbarer Datei"
+#: ../../mod/menu.php:96 ../../mod/menu.php:153
+msgid "Menu may be used to store saved bookmarks"
+msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
 
-#: ../../mod/setup.php:422
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren."
+#: ../../mod/menu.php:97 ../../mod/menu.php:155
+msgid "Submit and proceed"
+msgstr "Absenden und fortfahren"
 
-#: ../../mod/setup.php:427
-msgid "Command line PHP"
-msgstr "PHP Befehlszeile"
+#: ../../mod/menu.php:109
+msgid "Drop"
+msgstr "Löschen"
 
-#: ../../mod/setup.php:436
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert."
+#: ../../mod/menu.php:113
+msgid "Bookmarks allowed"
+msgstr "Lesezeichen erlaubt"
 
-#: ../../mod/setup.php:437
-msgid "This is required for message delivery to work."
-msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
+#: ../../mod/menu.php:115
+msgid "Delete this menu"
+msgstr "Lösche dieses Menü"
 
-#: ../../mod/setup.php:440
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
+#: ../../mod/menu.php:116 ../../mod/menu.php:150
+msgid "Edit menu contents"
+msgstr "Bearbeite Menü Inhalte"
 
-#: ../../mod/setup.php:458
-#, php-format
-msgid ""
-"Your max allowed total upload size is set to %s. Maximum size of one file to"
-" upload is set to %s. You are allowed to upload up to %d files at once."
-msgstr "Die Maximalgröße für Uploads insgesamt liegt bei %s. Die Maximalgröße für eine Datei liegt bei %s. Es können maximal %d Dateien gleichzeitig hochgeladen werden."
+#: ../../mod/menu.php:117
+msgid "Edit this menu"
+msgstr "Dieses Menü bearbeiten"
 
-#: ../../mod/setup.php:463
-msgid "You can adjust these settings in the servers php.ini."
-msgstr "Du kannst diese Einstellungen in der php.ini des Servers ändern."
+#: ../../mod/menu.php:132
+msgid "Menu could not be deleted."
+msgstr "Menü konnte nicht gelöscht werden."
 
-#: ../../mod/setup.php:465
-msgid "PHP upload limits"
-msgstr "PHP-Hochladebeschränkungen"
+#: ../../mod/menu.php:140 ../../mod/mitem.php:24
+msgid "Menu not found."
+msgstr "Menü nicht gefunden"
 
-#: ../../mod/setup.php:488
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen."
+#: ../../mod/menu.php:145
+msgid "Edit Menu"
+msgstr "Menü bearbeiten"
 
-#: ../../mod/setup.php:489
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung."
+#: ../../mod/menu.php:149
+msgid "Add or remove entries to this menu"
+msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
 
-#: ../../mod/setup.php:492
-msgid "Generate encryption keys"
-msgstr "Verschlüsselungsschlüssel  generieren"
+#: ../../mod/menu.php:151
+msgid "Menu name"
+msgstr "Menü Name"
 
-#: ../../mod/setup.php:504
-msgid "libCurl PHP module"
-msgstr "libCurl-PHP-Modul"
+#: ../../mod/menu.php:151
+msgid "Must be unique, only seen by you"
+msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar"
 
-#: ../../mod/setup.php:505
-msgid "GD graphics PHP module"
-msgstr "GD-Grafik-PHP-Modul"
+#: ../../mod/menu.php:152
+msgid "Menu title"
+msgstr "Menü Titel"
 
-#: ../../mod/setup.php:506
-msgid "OpenSSL PHP module"
-msgstr "OpenSSL-PHP-Modul"
+#: ../../mod/menu.php:152
+msgid "Menu title as seen by others"
+msgstr "Menü Titel wie er von anderen gesehen wird"
 
-#: ../../mod/setup.php:507
-msgid "mysqli or postgres PHP module"
-msgstr "mysqli oder postgres PHP-Modul"
+#: ../../mod/menu.php:153
+msgid "Allow bookmarks"
+msgstr "Erlaube Lesezeichen"
 
-#: ../../mod/setup.php:508
-msgid "mb_string PHP module"
-msgstr "mb_string-PHP-Modul"
+#: ../../mod/mail.php:34
+msgid "Unable to lookup recipient."
+msgstr "Konnte den Empfänger nicht finden."
 
-#: ../../mod/setup.php:509
-msgid "mcrypt PHP module"
-msgstr "mcrypt-PHP-Modul"
+#: ../../mod/mail.php:42
+msgid "Unable to communicate with requested channel."
+msgstr "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen."
 
-#: ../../mod/setup.php:510
-msgid "xml PHP module"
-msgstr "xml-PHP-Modul"
+#: ../../mod/mail.php:49
+msgid "Cannot verify requested channel."
+msgstr "Verifizierung des angeforderten Kanals fehlgeschlagen."
 
-#: ../../mod/setup.php:514 ../../mod/setup.php:516
-msgid "Apache mod_rewrite module"
-msgstr "Apache-mod_rewrite-Modul"
+#: ../../mod/mail.php:75
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen."
 
-#: ../../mod/setup.php:514
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert."
+#: ../../mod/mail.php:140
+msgid "Messages"
+msgstr "Nachrichten"
 
-#: ../../mod/setup.php:520 ../../mod/setup.php:523
-msgid "proc_open"
-msgstr "proc_open"
+#: ../../mod/mail.php:175
+msgid "Message recalled."
+msgstr "Nachricht widerrufen."
 
-#: ../../mod/setup.php:520
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
+#: ../../mod/mail.php:188
+msgid "Conversation removed."
+msgstr "Unterhaltung gelöscht."
 
-#: ../../mod/setup.php:528
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert."
+#: ../../mod/mail.php:231
+msgid "Requested channel is not in this network"
+msgstr "Angeforderter Kanal ist nicht in diesem Netzwerk."
 
-#: ../../mod/setup.php:532
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert."
+#: ../../mod/mail.php:239
+msgid "Send Private Message"
+msgstr "Private Nachricht senden"
 
-#: ../../mod/setup.php:536
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert."
+#: ../../mod/mail.php:240 ../../mod/mail.php:370
+msgid "To:"
+msgstr "An:"
 
-#: ../../mod/setup.php:540
-msgid ""
-"Error: mysqli or postgres PHP module required but neither are installed."
-msgstr "Fehler: Das mysqli oder postgres PHP-Modul ist erforderlich, aber keines von beiden ist installiert."
+#: ../../mod/mail.php:243 ../../mod/mail.php:372
+msgid "Subject:"
+msgstr "Betreff:"
 
-#: ../../mod/setup.php:544
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."
+#: ../../mod/mail.php:250
+msgid "Send"
+msgstr "Absenden"
 
-#: ../../mod/setup.php:548
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert."
+#: ../../mod/mail.php:342
+msgid "Delete message"
+msgstr "Nachricht löschen"
 
-#: ../../mod/setup.php:552
-msgid "Error: xml PHP module required for DAV but not installed."
-msgstr "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert."
+#: ../../mod/mail.php:343
+msgid "Delivery report"
+msgstr "Zustellungsbericht"
 
-#: ../../mod/setup.php:570
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht."
+#: ../../mod/mail.php:344
+msgid "Recall message"
+msgstr "Nachricht widerrufen"
 
-#: ../../mod/setup.php:571
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst."
+#: ../../mod/mail.php:346
+msgid "Message has been recalled."
+msgstr "Die Nachricht wurde widerrufen."
 
-#: ../../mod/setup.php:572
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Red-Installation speichern musst."
+#: ../../mod/mail.php:363
+msgid "Delete Conversation"
+msgstr "Unterhaltung löschen"
 
-#: ../../mod/setup.php:573
+#: ../../mod/mail.php:365
 msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
-
-#: ../../mod/setup.php:576
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php ist beschreibbar"
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten."
 
-#: ../../mod/setup.php:590
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen."
+#: ../../mod/mail.php:369
+msgid "Send Reply"
+msgstr "Antwort senden"
 
-#: ../../mod/setup.php:591
+#: ../../mod/mail.php:374
 #, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the Red top level folder."
-msgstr "Um diese kompilierten Vorlagen speichern zu können, braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Red-Installationsverzeichnisses."
-
-#: ../../mod/setup.php:592 ../../mod/setup.php:613
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat."
+msgid "Your message for %s (%s):"
+msgstr "Deine Nachricht für %s (%s):"
 
-#: ../../mod/setup.php:593
-#, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
-msgstr "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält."
+#: ../../mod/service_limits.php:19
+msgid "No service class restrictions found."
+msgstr "Keine Dienstklassenbeschränkungen gefunden."
 
-#: ../../mod/setup.php:596
+#: ../../mod/siteinfo.php:15
 #, php-format
-msgid "%s is writable"
-msgstr "%s ist beschreibbar"
-
-#: ../../mod/setup.php:612
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to"
-" have write access to the store directory under the Red top level folder"
-msgstr "Red benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses"
-
-#: ../../mod/setup.php:616
-msgid "store is writable"
-msgstr "store ist schreibbar"
-
-#: ../../mod/setup.php:649
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server."
-
-#: ../../mod/setup.php:650
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
-msgstr "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich."
+msgid "Version %s"
+msgstr "Version %s"
 
-#: ../../mod/setup.php:651
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können."
+#: ../../mod/siteinfo.php:36
+msgid "Installed plugins/addons/apps:"
+msgstr "Installierte Plugins/Addons/Apps"
 
-#: ../../mod/setup.php:652
-msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
-msgstr "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer Red-Server (die mit korrekten Zertifikaten ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird)."
+#: ../../mod/siteinfo.php:49
+msgid "No installed plugins/addons/apps"
+msgstr "Keine installierten Plugins/Addons/Apps"
 
-#: ../../mod/setup.php:653
+#: ../../mod/siteinfo.php:62
 msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen."
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Dieser Hub ist Teil von $Projectname – ein globales, kooperatives Netzwerk aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen."
 
-#: ../../mod/setup.php:654
-msgid ""
-"Providers are available that issue free certificates which are browser-"
-"valid."
-msgstr "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind."
+#: ../../mod/siteinfo.php:64
+msgid "Tag: "
+msgstr "Schlagwort: "
 
-#: ../../mod/setup.php:656
-msgid "SSL certificate validation"
-msgstr "SSL Zertifikatverifizierung"
+#: ../../mod/siteinfo.php:66
+msgid "Last background fetch: "
+msgstr "Letzter Hintergrundabruf:"
 
-#: ../../mod/setup.php:662
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server "
-"configuration.Test: "
-msgstr "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:"
+#: ../../mod/siteinfo.php:68
+msgid "Current load average: "
+msgstr "Aktuelles Load Average:"
 
-#: ../../mod/setup.php:665
-msgid "Url rewrite is working"
-msgstr "Url rewrite funktioniert"
+#: ../../mod/siteinfo.php:71
+msgid "Running at web location"
+msgstr "Erreichbar unter der Web-Adresse"
 
-#: ../../mod/setup.php:674
+#: ../../mod/siteinfo.php:72
 msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr "Bitte besuchen Sie <a href=\"http://hubzilla.org\">hubzilla.org</a>, um mehr über $Projectname zu erfahren."
 
-#: ../../mod/setup.php:698
-msgid "Errors encountered creating database tables."
-msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
+#: ../../mod/siteinfo.php:73
+msgid "Bug reports and issues: please visit"
+msgstr "Probleme oder Fehler gefunden? Bitte besuche"
 
-#: ../../mod/setup.php:732
-msgid "<h1>What next</h1>"
-msgstr "<h1>Was als Nächstes</h1>"
+#: ../../mod/siteinfo.php:75
+msgid "$projectname issues"
+msgstr "$projectname-Bugtracker"
 
-#: ../../mod/setup.php:733
+#: ../../mod/siteinfo.php:76
 msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten."
-
-#: ../../mod/sharedwithme.php:94
-msgid "Files: shared with me"
-msgstr "Dateien, die mit mir geteilt wurden"
-
-#: ../../mod/sharedwithme.php:96
-msgid "NEW"
-msgstr "NEU"
-
-#: ../../mod/sharedwithme.php:99
-msgid "Remove all files"
-msgstr "Alle Dateien löschen"
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
 
-#: ../../mod/sharedwithme.php:100
-msgid "Remove this file"
-msgstr "Diese Datei löschen"
+#: ../../mod/siteinfo.php:78
+msgid "Site Administrators"
+msgstr "Administratoren"
 
 #: ../../mod/suggest.php:35
 msgid ""
@@ -8712,299 +8920,288 @@ msgid ""
 "hours."
 msgstr "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal."
 
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:174
-#: ../../mod/profiles.php:231 ../../mod/profiles.php:600
-msgid "Profile not found."
-msgstr "Profil nicht gefunden."
-
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
-msgstr "Profil gelöscht."
-
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
-msgstr "Profil-"
-
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
-msgstr "Neues Profil erstellt."
+#: ../../mod/events.php:21
+msgid "Calendar entries imported."
+msgstr "Kalendereinträge wurden importiert."
 
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
-msgstr "Profil kann nicht geklont werden."
+#: ../../mod/events.php:23
+msgid "No calendar entries found."
+msgstr "Keine Kalendereinträge gefunden."
 
-#: ../../mod/profiles.php:136
-msgid "Profile unavailable to export."
-msgstr "Dieses Profil kann nicht exportiert werden."
+#: ../../mod/events.php:100
+msgid "Event can not end before it has started."
+msgstr "Termin-Ende liegt vor dem Beginn."
 
-#: ../../mod/profiles.php:241
-msgid "Profile Name is required."
-msgstr "Profil-Name erforderlich."
+#: ../../mod/events.php:102 ../../mod/events.php:111 ../../mod/events.php:131
+msgid "Unable to generate preview."
+msgstr "Vorschau konnte nicht erzeugt werden."
 
-#: ../../mod/profiles.php:404
-msgid "Marital Status"
-msgstr "Familienstand"
+#: ../../mod/events.php:109
+msgid "Event title and start time are required."
+msgstr "Titel und Startzeit des Termins sind erforderlich."
 
-#: ../../mod/profiles.php:408
-msgid "Romantic Partner"
-msgstr "Romantische Partner"
+#: ../../mod/events.php:129 ../../mod/events.php:254
+msgid "Event not found."
+msgstr "Termin nicht gefunden."
 
-#: ../../mod/profiles.php:412
-msgid "Likes"
-msgstr "Gefällt"
+#: ../../mod/events.php:437
+msgid "Edit event titel"
+msgstr "Termintitel bearbeiten"
 
-#: ../../mod/profiles.php:416
-msgid "Dislikes"
-msgstr "Gefällt nicht"
+#: ../../mod/events.php:437
+msgid "Event titel"
+msgstr "Termintitel"
 
-#: ../../mod/profiles.php:420
-msgid "Work/Employment"
-msgstr "Arbeit/Anstellung"
+#: ../../mod/events.php:439
+msgid "Categories (comma-separated list)"
+msgstr "Kategorien (Kommagetrennte Liste)"
 
-#: ../../mod/profiles.php:423
-msgid "Religion"
-msgstr "Religion"
+#: ../../mod/events.php:440
+msgid "Edit Category"
+msgstr "Kategorie bearbeiten"
 
-#: ../../mod/profiles.php:427
-msgid "Political Views"
-msgstr "Politische Ansichten"
+#: ../../mod/events.php:440
+msgid "Category"
+msgstr "Kategorie"
 
-#: ../../mod/profiles.php:435
-msgid "Sexual Preference"
-msgstr "Sexuelle Orientierung"
+#: ../../mod/events.php:443
+msgid "Edit start date and time"
+msgstr "Startdatum und -zeit bearbeiten"
 
-#: ../../mod/profiles.php:439
-msgid "Homepage"
-msgstr "Webseite"
+#: ../../mod/events.php:443
+msgid "Start date and time"
+msgstr "Startdatum und -zeit"
 
-#: ../../mod/profiles.php:443
-msgid "Interests"
-msgstr "Hobbys/Interessen"
+#: ../../mod/events.php:444 ../../mod/events.php:447
+msgid "Finish date and time are not known or not relevant"
+msgstr "Enddatum und -zeit sind unbekannt oder irrelevant"
 
-#: ../../mod/profiles.php:537
-msgid "Profile updated."
-msgstr "Profil aktualisiert."
+#: ../../mod/events.php:446
+msgid "Edit finish date and time"
+msgstr "Enddatum und -zeit bearbeiten"
 
-#: ../../mod/profiles.php:626
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?"
+#: ../../mod/events.php:446
+msgid "Finish date and time"
+msgstr "Enddatum und -zeit"
 
-#: ../../mod/profiles.php:666
-msgid "Edit Profile Details"
-msgstr "Bearbeite Profil-Details"
+#: ../../mod/events.php:448 ../../mod/events.php:449
+msgid "Adjust for viewer timezone"
+msgstr "An die Zeitzone des Betrachters anpassen"
 
-#: ../../mod/profiles.php:668
-msgid "View this profile"
-msgstr "Dieses Profil ansehen"
+#: ../../mod/events.php:448
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
+msgstr "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien."
 
-#: ../../mod/profiles.php:670
-msgid "Change Profile Photo"
-msgstr "Profilfoto ändern"
+#: ../../mod/events.php:450
+msgid "Edit Description"
+msgstr "Beschreibung bearbeiten"
 
-#: ../../mod/profiles.php:671
-msgid "Create a new profile using these settings"
-msgstr "Neues Profil anlegen und diese Einstellungen übernehmen"
+#: ../../mod/events.php:452
+msgid "Edit Location"
+msgstr "Ort bearbeiten"
 
-#: ../../mod/profiles.php:672
-msgid "Clone this profile"
-msgstr "Dieses Profil klonen"
+#: ../../mod/events.php:455 ../../mod/events.php:457
+msgid "Share this event"
+msgstr "Den Termin teilen"
 
-#: ../../mod/profiles.php:673
-msgid "Delete this profile"
-msgstr "Dieses Profil löschen"
+#: ../../mod/events.php:462
+msgid "Advanced Options"
+msgstr "Weitere Optionen"
 
-#: ../../mod/profiles.php:675
-msgid "Import profile from file"
-msgstr "Profil aus einer Datei importieren"
+#: ../../mod/events.php:574
+msgid "l, F j"
+msgstr "l, j. F"
 
-#: ../../mod/profiles.php:676
-msgid "Export profile to file"
-msgstr "Profil in eine Datei exportieren"
+#: ../../mod/events.php:596
+msgid "Edit event"
+msgstr "Termin bearbeiten"
 
-#: ../../mod/profiles.php:677
-msgid "Profile Name:"
-msgstr "Profilname:"
+#: ../../mod/events.php:598
+msgid "Delete event"
+msgstr "Termin löschen"
 
-#: ../../mod/profiles.php:678
-msgid "Your Full Name:"
-msgstr "Dein voller Name:"
+#: ../../mod/events.php:632
+msgid "calendar"
+msgstr "Kalender"
 
-#: ../../mod/profiles.php:679
-msgid "Title/Description:"
-msgstr "Titel/Beschreibung:"
+#: ../../mod/events.php:651
+msgid "Edit Event"
+msgstr "Termin bearbeiten"
 
-#: ../../mod/profiles.php:680
-msgid "Your Gender:"
-msgstr "Dein Geschlecht:"
+#: ../../mod/events.php:651
+msgid "Create Event"
+msgstr "Termin anlegen"
 
-#: ../../mod/profiles.php:681
-msgid "Birthday :"
-msgstr "Geburtstag:"
+#: ../../mod/events.php:661
+msgid "Today"
+msgstr "Heute"
 
-#: ../../mod/profiles.php:682
-msgid "Street Address:"
-msgstr "Straße und Hausnummer:"
+#: ../../mod/events.php:692
+msgid "Event removed"
+msgstr "Termin gelöscht"
 
-#: ../../mod/profiles.php:683
-msgid "Locality/City:"
-msgstr "Wohnort:"
+#: ../../mod/events.php:695
+msgid "Failed to remove event"
+msgstr "Termin konnte nicht gelöscht werden"
 
-#: ../../mod/profiles.php:684
-msgid "Postal/Zip Code:"
-msgstr "Postleitzahl:"
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
+msgstr "Ungültiger Profil-Identifikator"
 
-#: ../../mod/profiles.php:685
-msgid "Country:"
-msgstr "Land:"
+#: ../../mod/profperm.php:110
+msgid "Profile Visibility Editor"
+msgstr "Profil-Sichtbarkeits-Editor"
 
-#: ../../mod/profiles.php:686
-msgid "Region/State:"
-msgstr "Region/Bundesstaat:"
+#: ../../mod/profperm.php:114
+msgid "Click on a contact to add or remove."
+msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
 
-#: ../../mod/profiles.php:687
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr "<span class=\"heart\">&hearts;</span> Beziehungsstatus:"
+#: ../../mod/profperm.php:123
+msgid "Visible To"
+msgstr "Sichtbar für"
 
-#: ../../mod/profiles.php:688
-msgid "Who: (if applicable)"
-msgstr "Wer: (falls anwendbar)"
+#: ../../mod/mitem.php:48
+msgid "Unable to create element."
+msgstr "Element konnte nicht erstellt werden."
 
-#: ../../mod/profiles.php:689
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
+#: ../../mod/mitem.php:72
+msgid "Unable to update menu element."
+msgstr "Kann Menü-Element nicht aktualisieren."
 
-#: ../../mod/profiles.php:690
-msgid "Since [date]:"
-msgstr "Seit [Datum]:"
+#: ../../mod/mitem.php:88
+msgid "Unable to add menu element."
+msgstr "Kann Menü-Bestandteil nicht hinzufügen."
 
-#: ../../mod/profiles.php:692
-msgid "Homepage URL:"
-msgstr "Homepage URL:"
+#: ../../mod/mitem.php:149 ../../mod/mitem.php:222
+msgid "Menu Item Permissions"
+msgstr "Zugriffsrechte des Menü-Elements"
 
-#: ../../mod/profiles.php:695
-msgid "Religious Views:"
-msgstr "Religiöse Ansichten:"
+#: ../../mod/mitem.php:152 ../../mod/mitem.php:168
+msgid "Link Name"
+msgstr "Name des Links"
 
-#: ../../mod/profiles.php:696
-msgid "Keywords:"
-msgstr "Schlüsselwörter:"
+#: ../../mod/mitem.php:153 ../../mod/mitem.php:227
+msgid "Link or Submenu Target"
+msgstr "Ziel des Links oder Untermenüs"
 
-#: ../../mod/profiles.php:699
-msgid "Example: fishing photography software"
-msgstr "Beispiel: Angeln Fotografie Software"
+#: ../../mod/mitem.php:153
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen."
 
-#: ../../mod/profiles.php:700
-msgid "Used in directory listings"
-msgstr "Wird in Verzeichnis-Auflistungen verwendet"
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:228
+msgid "Use magic-auth if available"
+msgstr "Magic-Auth verwenden, falls verfügbar"
 
-#: ../../mod/profiles.php:701
-msgid "Tell us about yourself..."
-msgstr "Erzähle uns ein wenig von Dir …"
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:229
+msgid "Open link in new window"
+msgstr "Öffne Link in neuem Fenster"
 
-#: ../../mod/profiles.php:702
-msgid "Hobbies/Interests"
-msgstr "Hobbys/Interessen"
+#: ../../mod/mitem.php:156 ../../mod/mitem.php:230
+msgid "Order in list"
+msgstr "Reihenfolge in der Liste"
 
-#: ../../mod/profiles.php:703
-msgid "Contact information and Social Networks"
-msgstr "Kontaktinformation und soziale Netzwerke"
+#: ../../mod/mitem.php:156 ../../mod/mitem.php:230
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
 
-#: ../../mod/profiles.php:704
-msgid "My other channels"
-msgstr "Meine anderen Kanäle"
+#: ../../mod/mitem.php:157
+msgid "Submit and finish"
+msgstr "Absenden und fertigstellen"
 
-#: ../../mod/profiles.php:705
-msgid "Musical interests"
-msgstr "Musikalische Interessen"
+#: ../../mod/mitem.php:158
+msgid "Submit and continue"
+msgstr "Absenden und fortfahren"
 
-#: ../../mod/profiles.php:706
-msgid "Books, literature"
-msgstr "Bücher, Literatur"
+#: ../../mod/mitem.php:166
+msgid "Menu:"
+msgstr "Menü:"
 
-#: ../../mod/profiles.php:707
-msgid "Television"
-msgstr "Fernsehen"
+#: ../../mod/mitem.php:169
+msgid "Link Target"
+msgstr "Ziel des Links"
 
-#: ../../mod/profiles.php:708
-msgid "Film/dance/culture/entertainment"
-msgstr "Film/Tanz/Kultur/Unterhaltung"
+#: ../../mod/mitem.php:172
+msgid "Edit menu"
+msgstr "Menü bearbeiten"
 
-#: ../../mod/profiles.php:709
-msgid "Love/romance"
-msgstr "Liebe/Romantik"
+#: ../../mod/mitem.php:175
+msgid "Edit element"
+msgstr "Bestandteil bearbeiten"
 
-#: ../../mod/profiles.php:710
-msgid "Work/employment"
-msgstr "Arbeit/Anstellung"
+#: ../../mod/mitem.php:176
+msgid "Drop element"
+msgstr "Bestandteil löschen"
 
-#: ../../mod/profiles.php:711
-msgid "School/education"
-msgstr "Schule/Ausbildung"
+#: ../../mod/mitem.php:177
+msgid "New element"
+msgstr "Neues Bestandteil"
 
-#: ../../mod/profiles.php:717
-msgid "This is your default profile."
-msgstr "Das ist Dein Standardprofil."
+#: ../../mod/mitem.php:178
+msgid "Edit this menu container"
+msgstr "Diesen Menü-Container bearbeiten"
 
-#: ../../mod/profiles.php:728
-msgid "Age: "
-msgstr "Alter:"
+#: ../../mod/mitem.php:179
+msgid "Add menu element"
+msgstr "Menüelement hinzufügen"
 
-#: ../../mod/profiles.php:771
-msgid "Edit/Manage Profiles"
-msgstr "Profile bearbeiten/verwalten"
+#: ../../mod/mitem.php:180
+msgid "Delete this menu item"
+msgstr "Lösche dieses Menü-Bestandteil"
 
-#: ../../mod/profiles.php:772
-msgid "Add profile things"
-msgstr "Sachen zum Profil hinzufügen"
+#: ../../mod/mitem.php:181
+msgid "Edit this menu item"
+msgstr "Bearbeite dieses Menü-Bestandteil"
 
-#: ../../mod/profiles.php:773
-msgid "Include desirable objects in your profile"
-msgstr "Binde begehrenswerte Dinge in Dein Profil ein"
+#: ../../mod/mitem.php:198
+msgid "Menu item not found."
+msgstr "Menü-Bestandteil nicht gefunden."
 
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
-msgstr "Ungültiger Profil-Identifikator"
+#: ../../mod/mitem.php:211
+msgid "Menu item deleted."
+msgstr "Menü-Bestandteil gelöscht."
 
-#: ../../mod/profperm.php:110
-msgid "Profile Visibility Editor"
-msgstr "Profil-Sichtbarkeits-Editor"
+#: ../../mod/mitem.php:213
+msgid "Menu item could not be deleted."
+msgstr "Menü-Bestandteil kann nicht gelöscht werden."
 
-#: ../../mod/profperm.php:114
-msgid "Click on a contact to add or remove."
-msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
+#: ../../mod/mitem.php:220
+msgid "Edit Menu Element"
+msgstr "Bearbeite Menü-Bestandteil"
 
-#: ../../mod/profperm.php:123
-msgid "Visible To"
-msgstr "Sichtbar für"
+#: ../../mod/mitem.php:226
+msgid "Link text"
+msgstr "Link Text"
 
-#: ../../mod/rbmark.php:88
-msgid "Select a bookmark folder"
-msgstr "Lesezeichenordner wählen"
+#: ../../mod/wholikesme.php:13
+msgid "Who likes me?"
+msgstr "Wer mag mich?"
 
-#: ../../mod/rbmark.php:93
-msgid "Save Bookmark"
-msgstr "Lesezeichen speichern"
+#: ../../mod/sharedwithme.php:94
+msgid "Files: shared with me"
+msgstr "Dateien, die mit mir geteilt wurden"
 
-#: ../../mod/rbmark.php:94
-msgid "URL of bookmark"
-msgstr "URL des Lesezeichens"
+#: ../../mod/sharedwithme.php:96
+msgid "NEW"
+msgstr "NEU"
 
-#: ../../mod/rbmark.php:99
-msgid "Or enter new bookmark folder name"
-msgstr "Oder gib einen neuen Namen für den Lesezeichenordner ein"
+#: ../../mod/sharedwithme.php:99
+msgid "Remove all files"
+msgstr "Alle Dateien löschen"
 
-#: ../../mod/import_items.php:101
-msgid "Import completed"
-msgstr "Import abgeschlossen"
+#: ../../mod/sharedwithme.php:100
+msgid "Remove this file"
+msgstr "Diese Datei löschen"
 
-#: ../../mod/import_items.php:119
-msgid "Import Items"
-msgstr "Beiträge importieren"
+#: ../../mod/viewconnections.php:59
+msgid "No connections."
+msgstr "Keine Verbindungen."
 
-#: ../../mod/import_items.php:120
-msgid ""
-"Use this form to import existing posts and content from an export file."
-msgstr "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren."
+#: ../../mod/viewconnections.php:72
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "%ss Profil [%s] besuchen"
 
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
@@ -9142,51 +9339,57 @@ msgstr "Größe der Avatare von Themenstartern"
 msgid "Set size of followup author photos"
 msgstr "Größe der Avatare von Kommentatoren"
 
-#: ../../boot.php:1302
+#: ../../boot.php:1292
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."
 
-#: ../../boot.php:1305
+#: ../../boot.php:1295
 #, php-format
 msgid "Update Error at %s"
 msgstr "Aktualisierungsfehler auf %s"
 
-#: ../../boot.php:1472
+#: ../../boot.php:1462
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Erstelle ein Konto, um Anwendungen und Dienste innerhalb von Hubzilla nutzen zu können."
 
-#: ../../boot.php:1500
+#: ../../boot.php:1484
 msgid "Password"
 msgstr "Kennwort"
 
-#: ../../boot.php:1501
+#: ../../boot.php:1485
 msgid "Remember me"
 msgstr "Angaben speichern"
 
-#: ../../boot.php:1504
+#: ../../boot.php:1488
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:2130
+#: ../../boot.php:2108
 msgid "toggle mobile"
 msgstr "auf/von mobile Ansicht wechseln"
 
-#: ../../boot.php:2265
+#: ../../boot.php:2243
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben."
 
-#: ../../boot.php:2268
+#: ../../boot.php:2246
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Website-SSL-Fehler für %s"
 
-#: ../../boot.php:2305
+#: ../../boot.php:2283
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron-Aufgaben laufen nicht."
 
-#: ../../boot.php:2309
+#: ../../boot.php:2287
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron-Aufgaben für %s laufen nicht"
+
+#: ../../Zotlabs/Zot/Auth.php:140
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."
diff --git a/view/de/hstrings.php b/view/de/hstrings.php
index c890dbc29..03f765eee 100644
--- a/view/de/hstrings.php
+++ b/view/de/hstrings.php
@@ -5,19 +5,28 @@ function string_plural_select_de($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["No username found in import file."] = "Kein Benutzername in der Importdatei gefunden.";
+$a->strings["Connect"] = "Verbinden";
+$a->strings["New window"] = "Neues Fenster";
+$a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab";
+$a->strings["User '%s' deleted"] = "Benutzer '%s' gelöscht";
+$a->strings["Missing room name"] = "Der Chatraum hat keinen Namen";
+$a->strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
+$a->strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
+$a->strings["Room not found."] = "Chatraum konnte nicht gefunden werden.";
+$a->strings["Permission denied."] = "Berechtigung verweigert.";
+$a->strings["Room is full"] = "Der Raum ist voll";
+$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen.";
 $a->strings["Unable to create a unique channel address. Import failed."] = "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Import ist fehlgeschlagen.";
-$a->strings["Import completed."] = "Import abgeschlossen.";
+$a->strings["Channel clone failed. Import failed."] = "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen.";
+$a->strings["Cloned channel not found. Import failed."] = "Geklonter Kanal nicht gefunden. Import fehlgeschlagen.";
 $a->strings["parent"] = "Ãœbergeordnetes Verzeichnis";
-$a->strings["Collection"] = "Ordner";
+$a->strings["Collection"] = "Sammlung";
 $a->strings["Principal"] = "Prinzipal";
 $a->strings["Addressbook"] = "Adressbuch";
 $a->strings["Calendar"] = "Kalender";
 $a->strings["Schedule Inbox"] = "Posteingang für überwachte Kalender";
 $a->strings["Schedule Outbox"] = "Postausgang für überwachte Kalender";
 $a->strings["Unknown"] = "Unbekannt";
-$a->strings["%1\$s used"] = "%1\$s verwendet";
-$a->strings["%1\$s used of %2\$s (%3\$s&#37;)"] = "%1\$s von %2\$s verwendet (%3\$s&#37;)";
 $a->strings["Files"] = "Dateien";
 $a->strings["Total"] = "Summe";
 $a->strings["Shared"] = "Geteilt";
@@ -29,130 +38,11 @@ $a->strings["Size"] = "Größe";
 $a->strings["Last Modified"] = "Zuletzt geändert";
 $a->strings["Edit"] = "Bearbeiten";
 $a->strings["Delete"] = "Löschen";
+$a->strings["You are using %1\$s of your available file storage."] = "Sie verwenden %1\$s von Ihrem verfügbaren Dateispeicher.";
+$a->strings["You are using %1\$s of %2\$s available file storage. (%3\$s&#37;)"] = "Sie verwenden %1\$s von %2\$s verfügbarem Dateispeicher. (%3\$s&#37;)";
+$a->strings["WARNING:"] = "WARNUNG:";
 $a->strings["Create new folder"] = "Neuen Ordner anlegen";
 $a->strings["Upload file"] = "Datei hochladen";
-$a->strings["Can view my normal stream and posts"] = "Kann meine normalen Beiträge sehen";
-$a->strings["Can view my default channel profile"] = "Kann mein Standardprofil sehen";
-$a->strings["Can view my connections"] = "Kann meine Verbindungen sehen";
-$a->strings["Can view my file storage and photos"] = "Kann meine Datei- und Bilderordner sehen";
-$a->strings["Can view my webpages"] = "Kann meine Webseiten sehen";
-$a->strings["Can send me their channel stream and posts"] = "Kann mir die Beiträge aus seinem/ihrem Kanal schicken";
-$a->strings["Can post on my channel page (\"wall\")"] = "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen";
-$a->strings["Can comment on or like my posts"] = "Darf meine Beiträge kommentieren und mögen/nicht mögen";
-$a->strings["Can send me private mail messages"] = "Kann mir private Nachrichten schicken";
-$a->strings["Can like/dislike stuff"] = "Kann andere Elemente mögen/nicht mögen";
-$a->strings["Profiles and things other than posts/comments"] = "Profile und alles außer Beiträge und Kommentare";
-$a->strings["Can forward to all my channel contacts via post @mentions"] = "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten";
-$a->strings["Advanced - useful for creating group forum channels"] = "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen";
-$a->strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
-$a->strings["Can write to my file storage and photos"] = "Kann in meine Datei- und Bilderordner schreiben";
-$a->strings["Can edit my webpages"] = "Kann meine Webseiten bearbeiten";
-$a->strings["Can source my public posts in derived channels"] = "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden";
-$a->strings["Somewhat advanced - very useful in open communities"] = "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften";
-$a->strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
-$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust";
-$a->strings["Social Networking"] = "Soziales Netzwerk";
-$a->strings["Mostly Public"] = "Weitgehend öffentlich";
-$a->strings["Restricted"] = "Beschränkt";
-$a->strings["Private"] = "Privat";
-$a->strings["Community Forum"] = "Forum";
-$a->strings["Feed Republish"] = "Teilen von Feeds";
-$a->strings["Special Purpose"] = "Für besondere Zwecke";
-$a->strings["Celebrity/Soapbox"] = "Mitteilungs-Kanal (keine Kommentare)";
-$a->strings["Group Repository"] = "Gruppenarchiv";
-$a->strings["Other"] = "Andere";
-$a->strings["Custom/Expert Mode"] = "Benutzerdefiniert/Expertenmodus";
-$a->strings["Missing room name"] = "Der Chatraum hat keinen Namen";
-$a->strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
-$a->strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
-$a->strings["Room not found."] = "Chatraum konnte nicht gefunden werden.";
-$a->strings["Permission denied."] = "Zugang verweigert";
-$a->strings["Room is full"] = "Der Raum ist voll";
-$a->strings["Miscellaneous"] = "Verschiedenes";
-$a->strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-TT oder MM-TT";
-$a->strings["Required"] = "Benötigt";
-$a->strings["never"] = "Nie";
-$a->strings["less than a second ago"] = "Vor weniger als einer Sekunde";
-$a->strings["year"] = "Jahr";
-$a->strings["years"] = "Jahre";
-$a->strings["month"] = "Monat";
-$a->strings["months"] = "Monate";
-$a->strings["week"] = "Woche";
-$a->strings["weeks"] = "Wochen";
-$a->strings["day"] = "Tag";
-$a->strings["days"] = "Tage";
-$a->strings["hour"] = "Stunde";
-$a->strings["hours"] = "Stunden";
-$a->strings["minute"] = "Minute";
-$a->strings["minutes"] = "Minuten";
-$a->strings["second"] = "Sekunde";
-$a->strings["seconds"] = "Sekunden";
-$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "vor %1\$d %2\$s";
-$a->strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
-$a->strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
-$a->strings["General Features"] = "Allgemeine Funktionen";
-$a->strings["Content Expiration"] = "Verfall von Inhalten";
-$a->strings["Remove posts/comments and/or private messages at a future time"] = "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum.";
-$a->strings["Multiple Profiles"] = "Mehrfachprofile";
-$a->strings["Ability to create multiple profiles"] = "Mehrfachprofile anlegen können";
-$a->strings["Advanced Profiles"] = "Erweiterte Profile";
-$a->strings["Additional profile sections and selections"] = "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung";
-$a->strings["Profile Import/Export"] = "Profil-Import/Export";
-$a->strings["Save and load profile details across sites/channels"] = "Speichere Dein Profil, um es in einen anderen Kanal zu importieren";
-$a->strings["Web Pages"] = "Webseiten";
-$a->strings["Provide managed web pages on your channel"] = "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung";
-$a->strings["Private Notes"] = "Private Notizen";
-$a->strings["Enables a tool to store notes and reminders"] = "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren";
-$a->strings["Navigation Channel Select"] = "Kanal-Auswahl in der Navigationsleiste";
-$a->strings["Change channels directly from within the navigation dropdown menu"] = "Wechsle direkt über das Navigationsmenü zu anderen Kanälen";
-$a->strings["Photo Location"] = "Aufnahmeort";
-$a->strings["If location data is available on uploaded photos, link this to a map."] = "Aufnahmeort des Fotos auf einer Karte verlinken, falls verfügbar.";
-$a->strings["Expert Mode"] = "Expertenmodus";
-$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren";
-$a->strings["Premium Channel"] = "Premium-Kanal";
-$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen";
-$a->strings["Post Composition Features"] = "Nachbearbeitungsfunktionen";
-$a->strings["Use Markdown"] = "Markdown benutzen";
-$a->strings["Allow use of \"Markdown\" to format posts"] = "Erlaube die Verwendung von \"Markdown\"-Syntax zur Formatierung von Beiträgen";
-$a->strings["Large Photos"] = "Große Fotos";
-$a->strings["Include large (640px) photo thumbnails in posts. If not enabled, use small (320px) photo thumbnails"] = "Große Vorschaubilder (640px) in Beiträgen anzeigen. Ist das deaktiviert, werden kleine Vorschaubilder (320px) angezeigt.";
-$a->strings["Channel Sources"] = "Kanal-Quellen";
-$a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds";
-$a->strings["Even More Encryption"] = "Noch mehr Verschlüsselung";
-$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)";
-$a->strings["Enable voting tools"] = "Umfragewerkzeuge aktivieren";
-$a->strings["Provide a class of post which others can vote on"] = "Aktiviere die Umfragewerkzeuge, um anderen die Möglichkeit zu geben, Deinem Beitrag zuzustimmen, ihn abzulehnen oder sich zu enthalten. (Muss im Beitrag selbst noch aktiviert werden.)";
-$a->strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter";
-$a->strings["Search by Date"] = "Suche nach Datum";
-$a->strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen";
-$a->strings["Collections Filter"] = "Filter für Sammlung";
-$a->strings["Enable widget to display Network posts only from selected collections"] = "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen";
-$a->strings["Saved Searches"] = "Gespeicherte Suchanfragen";
-$a->strings["Save search terms for re-use"] = "Suchbegriffe zur Wiederverwendung abspeichern";
-$a->strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter";
-$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast";
-$a->strings["Network New Tab"] = "Netzwerkreiter Neu";
-$a->strings["Enable tab to display all new Network activity"] = "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen";
-$a->strings["Affinity Tool"] = "Beziehungs-Tool";
-$a->strings["Filter stream activity by depth of relationships"] = "Filter Aktivitätenstream nach Tiefe der Beziehung";
-$a->strings["Connection Filtering"] = "Filter für Sammlungen";
-$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtert eingehende Beiträge anhand von Schlüsselwörtern.";
-$a->strings["Suggest Channels"] = "Kanäle vorschlagen";
-$a->strings["Show channel suggestions"] = "Kanalvorschläge anzeigen";
-$a->strings["Post/Comment Tools"] = "Beitrag-/Kommentar-Tools";
-$a->strings["Tagging"] = "Verschlagworten";
-$a->strings["Ability to tag existing posts"] = "Möglichkeit, um existierende Beiträge zu verschlagworten";
-$a->strings["Post Categories"] = "Beitrags-Kategorien";
-$a->strings["Add categories to your posts"] = "Kategorien für Beiträge";
-$a->strings["Saved Folders"] = "Gespeicherte Ordner";
-$a->strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln";
-$a->strings["Dislike Posts"] = "Gefällt-mir-nicht Beiträge";
-$a->strings["Ability to dislike posts/comments"] = "„Gefällt mir nicht“ ermöglichen";
-$a->strings["Star Posts"] = "Beiträge mit Sternchen versehen";
-$a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren";
-$a->strings["Tag Cloud"] = "Schlagwort-Wolke";
-$a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen";
-$a->strings["Default"] = "Standard";
 $a->strings["Delete this item?"] = "Dieses Element löschen?";
 $a->strings["Comment"] = "Kommentar";
 $a->strings["[+] show all"] = "[+] Alle anzeigen";
@@ -173,6 +63,7 @@ $a->strings["Describe (optional)"] = "Beschreibung (optional)";
 $a->strings["Submit"] = "Bestätigen";
 $a->strings["Please enter a link URL"] = "Gib eine URL ein:";
 $a->strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlassen möchtest?";
+$a->strings["Location"] = "Ort";
 $a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
 $a->strings["timeago.prefixFromNow"] = " ";
 $a->strings["ago"] = "her";
@@ -233,34 +124,368 @@ $a->strings["__ctx:calendar__ month"] = "Monat";
 $a->strings["__ctx:calendar__ week"] = "Woche";
 $a->strings["__ctx:calendar__ day"] = "Tag";
 $a->strings["__ctx:calendar__ All day"] = "Ganztägig";
-$a->strings["Frequently"] = "Häufig";
-$a->strings["Hourly"] = "Stündlich";
-$a->strings["Twice daily"] = "Zwei Mal am Tag";
-$a->strings["Daily"] = "Täglich";
-$a->strings["Weekly"] = "Wöchentlich";
-$a->strings["Monthly"] = "Monatlich";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["OStatus"] = "OStatus";
-$a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Email"] = "E-Mail";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Zot!"] = "Zot!";
-$a->strings["LinkedIn"] = "LinkedIn";
-$a->strings["XMPP/IM"] = "XMPP/IM";
-$a->strings["MySpace"] = "MySpace";
+$a->strings["No username found in import file."] = "Kein Benutzername in der Importdatei gefunden.";
+$a->strings["Import completed."] = "Import abgeschlossen.";
+$a->strings["Default"] = "Standard";
+$a->strings["Permission denied"] = "Keine Berechtigung";
+$a->strings["(Unknown)"] = "(Unbekannt)";
+$a->strings["Visible to anybody on the internet."] = "Für jeden im Internet sichtbar.";
+$a->strings["Visible to you only."] = "Nur für Dich sichtbar.";
+$a->strings["Visible to anybody in this network."] = "Für jedes \$Projectname-Mitglied sichtbar.";
+$a->strings["Visible to anybody authenticated."] = "Für jeden sichtbar, der angemeldet ist.";
+$a->strings["Visible to anybody on %s."] = "Für jeden auf %s sichtbar.";
+$a->strings["Visible to all connections."] = "Für alle Verbindungen sichtbar.";
+$a->strings["Visible to approved connections."] = "Nur für akzeptierte Verbindungen sichtbar.";
+$a->strings["Visible to specific connections."] = "Sichtbar für bestimmte Verbindungen.";
+$a->strings["Item not found."] = "Element nicht gefunden.";
+$a->strings["Collection not found."] = "Sammlung nicht gefunden";
+$a->strings["Collection is empty."] = "Sammlung ist leer.";
+$a->strings["Collection: %s"] = "Sammlung: %s";
+$a->strings["Connection: %s"] = "Verbindung: %s";
+$a->strings["Connection not found."] = "Die Verbindung wurde nicht gefunden.";
+$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y, H:i";
+$a->strings["Starts:"] = "Beginnt:";
+$a->strings["Finishes:"] = "Endet:";
+$a->strings["Location:"] = "Ort:";
+$a->strings["This event has been added to your calendar."] = "Dieser Termin wurde zu Deinem Kalender hinzugefügt";
+$a->strings["event"] = "Termin";
+$a->strings["Not specified"] = "Keine Angabe";
+$a->strings["Needs Action"] = "Aktion erforderlich";
+$a->strings["Completed"] = "Abgeschlossen";
+$a->strings["In Process"] = "In Bearbeitung";
+$a->strings["Cancelled"] = "gestrichen";
+$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
+$a->strings["Empty name"] = "Namensfeld leer";
+$a->strings["Name too long"] = "Name ist zu lang";
+$a->strings["No account identifier"] = "Keine Account-Kennung";
+$a->strings["Nickname is required."] = "Spitzname ist erforderlich.";
+$a->strings["Reserved nickname. Please choose another."] = "Reservierter Kurzname. Bitte wähle einen anderen.";
+$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
+$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
+$a->strings["Default Profile"] = "Standard-Profil";
+$a->strings["Friends"] = "Freunde";
+$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
+$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar.";
+$a->strings["Change profile photo"] = "Profilfoto ändern";
+$a->strings["Profiles"] = "Profile";
+$a->strings["Manage/edit profiles"] = "Profile verwalten/bearbeiten";
+$a->strings["Create New Profile"] = "Neues Profil erstellen";
+$a->strings["Edit Profile"] = "Profile bearbeiten";
+$a->strings["Profile Image"] = "Profilfoto:";
+$a->strings["visible to everybody"] = "sichtbar für jeden";
+$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
+$a->strings["Gender:"] = "Geschlecht:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Homepage:";
+$a->strings["Online Now"] = "gerade online";
+$a->strings["g A l F d"] = "l, d. F, G:i \\U\\h\\r";
+$a->strings["F d"] = "d. F";
+$a->strings["[today]"] = "[Heute]";
+$a->strings["Birthday Reminders"] = "Geburtstags Erinnerungen";
+$a->strings["Birthdays this week:"] = "Geburtstage in dieser Woche:";
+$a->strings["[No description]"] = "[Keine Beschreibung]";
+$a->strings["Event Reminders"] = "Termin-Erinnerungen";
+$a->strings["Events this week:"] = "Termine in dieser Woche:";
+$a->strings["Profile"] = "Profil";
+$a->strings["Full Name:"] = "Voller Name:";
+$a->strings["Like this channel"] = "Dieser Kanal gefällt mir";
+$a->strings["__ctx:noun__ Like"] = array(
+	0 => "Gefällt mir",
+	1 => "Gefällt mir",
+);
+$a->strings["j F, Y"] = "j. F Y";
+$a->strings["j F"] = "j. F";
+$a->strings["Birthday:"] = "Geburtstag:";
+$a->strings["Age:"] = "Alter:";
+$a->strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s";
+$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:";
+$a->strings["Hometown:"] = "Heimatstadt:";
+$a->strings["Tags:"] = "Schlagworte:";
+$a->strings["Political Views:"] = "Politische Ansichten:";
+$a->strings["Religion:"] = "Religion:";
+$a->strings["About:"] = "Ãœber:";
+$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
+$a->strings["Likes:"] = "Gefällt:";
+$a->strings["Dislikes:"] = "Gefällt nicht:";
+$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
+$a->strings["My other channels:"] = "Meine anderen Kanäle:";
+$a->strings["Musical interests:"] = "Musikalische Interessen:";
+$a->strings["Books, literature:"] = "Bücher, Literatur:";
+$a->strings["Television:"] = "Fernsehen:";
+$a->strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:";
+$a->strings["Love/Romance:"] = "Liebe/Romantik:";
+$a->strings["Work/employment:"] = "Arbeit/Anstellung:";
+$a->strings["School/education:"] = "Schule/Ausbildung:";
+$a->strings["Like this thing"] = "Gefällt mir";
+$a->strings["Tags"] = "Schlagwörter";
+$a->strings["Categories"] = "Kategorien";
+$a->strings["Keywords"] = "Schlüsselwörter";
+$a->strings["have"] = "habe";
+$a->strings["has"] = "hat";
+$a->strings["want"] = "will";
+$a->strings["wants"] = "will";
+$a->strings["like"] = "mag";
+$a->strings["likes"] = "gefällt";
+$a->strings["dislike"] = "verurteile";
+$a->strings["dislikes"] = "missfällt";
+$a->strings["Visible to your default audience"] = "Standard-Sichtbarkeit";
+$a->strings["Show"] = "Anzeigen";
+$a->strings["Don't show"] = "Nicht anzeigen";
+$a->strings["Other networks and post services"] = "Andere Netzwerke und Platformen";
+$a->strings["Permissions"] = "Berechtigungen";
+$a->strings["Close"] = "Schließen";
 $a->strings[" and "] = "und";
 $a->strings["public profile"] = "öffentliches Profil";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s hat %2\$s auf &ldquo;%3\$s&rdquo; geändert";
 $a->strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat ein aktualisiertes %2\$s, %3\$s wurde verändert.";
-$a->strings["Connect"] = "Verbinden";
-$a->strings["New window"] = "Neues Fenster";
-$a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab";
-$a->strings["User '%s' deleted"] = "Benutzer '%s' gelöscht";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden";
+$a->strings["Item was not found."] = "Beitrag wurde nicht gefunden.";
+$a->strings["No source file."] = "Keine Quelldatei.";
+$a->strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden";
+$a->strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden";
+$a->strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
+$a->strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
+$a->strings["Path not available."] = "Pfad nicht verfügbar.";
+$a->strings["Empty pathname"] = "Leere Pfadangabe";
+$a->strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
+$a->strings["Path not found."] = "Pfad nicht gefunden.";
+$a->strings["mkdir failed."] = "mkdir fehlgeschlagen.";
+$a->strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
+$a->strings["Empty path"] = "Leere Pfadangabe";
+$a->strings["Attachments:"] = "Anhänge:";
+$a->strings["\$Projectname event notification:"] = "\$Projectname-Terminbenachrichtigung:";
+$a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
+$a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
+$a->strings["Apps"] = "Apps";
+$a->strings["System"] = "System";
+$a->strings["Personal"] = "Persönlich";
+$a->strings["Create Personal App"] = "Persönliche App erstellen";
+$a->strings["Edit Personal App"] = "Persönliche App bearbeiten";
+$a->strings["Ignore/Hide"] = "Ignorieren/Verstecken";
+$a->strings["Suggestions"] = "Vorschläge";
+$a->strings["See more..."] = "Mehr anzeigen …";
+$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen.";
+$a->strings["Add New Connection"] = "Neue Verbindung hinzufügen";
+$a->strings["Enter the channel address"] = "Adresse des Kanals eingeben";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara";
+$a->strings["Notes"] = "Notizen";
+$a->strings["Save"] = "Speichern";
+$a->strings["Remove term"] = "Eintrag löschen";
+$a->strings["Saved Searches"] = "Gespeicherte Suchanfragen";
+$a->strings["add"] = "hinzufügen";
+$a->strings["Saved Folders"] = "Gespeicherte Ordner";
+$a->strings["Everything"] = "Alles";
+$a->strings["Archives"] = "Archive";
+$a->strings["Me"] = "Ich";
+$a->strings["Family"] = "Familie";
+$a->strings["Acquaintances"] = "Bekannte";
+$a->strings["All"] = "Alle";
+$a->strings["Refresh"] = "Aktualisieren";
+$a->strings["Account settings"] = "Konto-Einstellungen";
+$a->strings["Channel settings"] = "Kanal-Einstellungen";
+$a->strings["Additional features"] = "Zusätzliche Funktionen";
+$a->strings["Feature/Addon settings"] = "Plugin-Einstellungen";
+$a->strings["Display settings"] = "Anzeige-Einstellungen";
+$a->strings["Connected apps"] = "Verbundene Apps";
+$a->strings["Export channel"] = "Kanal exportieren";
+$a->strings["Connection Default Permissions"] = "Standardzugriffsrechte für neue Verbindungen:";
+$a->strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen";
+$a->strings["Channel Sources"] = "Kanal-Quellen";
+$a->strings["Settings"] = "Einstellungen";
+$a->strings["Private Mail Menu"] = "Private Nachrichten";
+$a->strings["Combined View"] = "Kombinierte Anzeige";
+$a->strings["Inbox"] = "Eingang";
+$a->strings["Outbox"] = "Ausgang";
+$a->strings["New Message"] = "Neue Nachricht";
+$a->strings["Conversations"] = "Konversationen";
+$a->strings["Received Messages"] = "Erhaltene Nachrichten";
+$a->strings["Sent Messages"] = "Gesendete Nachrichten";
+$a->strings["No messages."] = "Keine Nachrichten.";
+$a->strings["Delete conversation"] = "Unterhaltung löschen";
+$a->strings["Events Menu"] = "Kalendermenü";
+$a->strings["Day View"] = "Tagesansicht";
+$a->strings["Week View"] = "Wochenansicht";
+$a->strings["Month View"] = "Monatsansicht";
+$a->strings["Export"] = "Exportieren";
+$a->strings["Import"] = "Import";
+$a->strings["Events Tools"] = "Kalenderwerkzeuge";
+$a->strings["Export Calendar"] = "Kalender exportieren";
+$a->strings["Import Calendar"] = "Kalender importieren";
+$a->strings["Chat Rooms"] = "Chaträume";
+$a->strings["Bookmarked Chatrooms"] = "Gespeicherte Chatrooms";
+$a->strings["Suggested Chatrooms"] = "Chatraum-Vorschläge";
+$a->strings["photo/image"] = "Foto/Bild";
+$a->strings["Rate Me"] = "Bewerte mich";
+$a->strings["View Ratings"] = "Bewertungen ansehen";
+$a->strings["Public Hubs"] = "Öffentliche Hubs";
+$a->strings["Forums"] = "Foren";
+$a->strings["Tasks"] = "Aufgaben";
+$a->strings["Documentation"] = "Dokumentation";
+$a->strings["Project/Site Information"] = "Informationen über das Projekt und diesen Hub";
+$a->strings["For Members"] = "Für Mitglieder";
+$a->strings["For Administrators"] = "Für Administratoren";
+$a->strings["For Developers"] = "Für Entwickler";
+$a->strings["Site"] = "Seite";
+$a->strings["Accounts"] = "Konten";
+$a->strings["Channels"] = "Kanäle";
+$a->strings["Plugins"] = "Plug-Ins";
+$a->strings["Themes"] = "Themes";
+$a->strings["Inspect queue"] = "Warteschlange kontrollieren";
+$a->strings["Profile Config"] = "Profilkonfiguration";
+$a->strings["DB updates"] = "DB-Aktualisierungen";
+$a->strings["Logs"] = "Protokolle";
+$a->strings["Admin"] = "Administration";
+$a->strings["Plugin Features"] = "Plug-In Funktionen";
+$a->strings["User registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
+$a->strings["View Photo"] = "Foto ansehen";
+$a->strings["Edit Album"] = "Album bearbeiten";
+$a->strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen";
+$a->strings["General Features"] = "Allgemeine Funktionen";
+$a->strings["Content Expiration"] = "Verfall von Inhalten";
+$a->strings["Remove posts/comments and/or private messages at a future time"] = "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum.";
+$a->strings["Multiple Profiles"] = "Mehrfachprofile";
+$a->strings["Ability to create multiple profiles"] = "Mehrfachprofile anlegen können";
+$a->strings["Advanced Profiles"] = "Erweiterte Profile";
+$a->strings["Additional profile sections and selections"] = "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung";
+$a->strings["Profile Import/Export"] = "Profil-Import/Export";
+$a->strings["Save and load profile details across sites/channels"] = "Speichere Dein Profil, um es in einen anderen Kanal zu importieren";
+$a->strings["Web Pages"] = "Webseiten";
+$a->strings["Provide managed web pages on your channel"] = "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung";
+$a->strings["Private Notes"] = "Private Notizen";
+$a->strings["Enables a tool to store notes and reminders"] = "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren";
+$a->strings["Navigation Channel Select"] = "Kanal-Auswahl in der Navigationsleiste";
+$a->strings["Change channels directly from within the navigation dropdown menu"] = "Wechsle direkt über das Navigationsmenü zu anderen Kanälen";
+$a->strings["Photo Location"] = "Aufnahmeort";
+$a->strings["If location data is available on uploaded photos, link this to a map."] = "Aufnahmeort des Fotos auf einer Karte verlinken, falls verfügbar.";
+$a->strings["Expert Mode"] = "Expertenmodus";
+$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren";
+$a->strings["Premium Channel"] = "Premium-Kanal";
+$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen";
+$a->strings["Post Composition Features"] = "Nachbearbeitungsfunktionen";
+$a->strings["Use Markdown"] = "Markdown benutzen";
+$a->strings["Allow use of \"Markdown\" to format posts"] = "Erlaube die Verwendung von \"Markdown\"-Syntax zur Formatierung von Beiträgen";
+$a->strings["Large Photos"] = "Große Fotos";
+$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Große Vorschaubilder (1024px) in Beiträgen anzeigen. Falls nicht aktiviert, werden kleine Vorschaubilder (640px) verwendet.";
+$a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds";
+$a->strings["Even More Encryption"] = "Noch mehr Verschlüsselung";
+$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)";
+$a->strings["Enable Voting Tools"] = "Umfragewerkzeuge aktivieren";
+$a->strings["Provide a class of post which others can vote on"] = "Aktiviere die Umfragewerkzeuge, um anderen die Möglichkeit zu geben, Deinem Beitrag zuzustimmen, ihn abzulehnen oder sich zu enthalten. (Muss im Beitrag selbst noch aktiviert werden.)";
+$a->strings["Delayed Posting"] = "Verzögertes Senden";
+$a->strings["Allow posts to be published at a later date"] = "Ermöglicht es, Beiträge zu einem späteren Zeitpunkt zu veröffentlichen";
+$a->strings["Suppress Duplicate Posts/Comments"] = "Doppelte Beiträge unterdrücken";
+$a->strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Verhindert, dass innerhalb von zwei Minuten Beiträge mit identischem Inhalt veröffentlicht werden.";
+$a->strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter";
+$a->strings["Search by Date"] = "Suche nach Datum";
+$a->strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen";
+$a->strings["Collections Filter"] = "Filter für Sammlung";
+$a->strings["Enable widget to display Network posts only from selected collections"] = "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen";
+$a->strings["Save search terms for re-use"] = "Suchbegriffe zur Wiederverwendung abspeichern";
+$a->strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast";
+$a->strings["Network New Tab"] = "Netzwerkreiter Neu";
+$a->strings["Enable tab to display all new Network activity"] = "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen";
+$a->strings["Affinity Tool"] = "Beziehungs-Tool";
+$a->strings["Filter stream activity by depth of relationships"] = "Filter Aktivitätenstream nach Tiefe der Beziehung";
+$a->strings["Connection Filtering"] = "Filter für Sammlungen";
+$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtert eingehende Beiträge anhand von Schlüsselwörtern.";
+$a->strings["Suggest Channels"] = "Kanäle vorschlagen";
+$a->strings["Show channel suggestions"] = "Kanalvorschläge anzeigen";
+$a->strings["Post/Comment Tools"] = "Beitrag-/Kommentar-Tools";
+$a->strings["Tagging"] = "Verschlagworten";
+$a->strings["Ability to tag existing posts"] = "Möglichkeit, um existierende Beiträge zu verschlagworten";
+$a->strings["Post Categories"] = "Beitrags-Kategorien";
+$a->strings["Add categories to your posts"] = "Kategorien für Beiträge";
+$a->strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln";
+$a->strings["Dislike Posts"] = "Gefällt-mir-nicht Beiträge";
+$a->strings["Ability to dislike posts/comments"] = "„Gefällt mir nicht“ ermöglichen";
+$a->strings["Star Posts"] = "Beiträge mit Sternchen versehen";
+$a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren";
+$a->strings["Tag Cloud"] = "Schlagwort-Wolke";
+$a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen";
+$a->strings["Male"] = "Männlich";
+$a->strings["Female"] = "Weiblich";
+$a->strings["Currently Male"] = "Momentan männlich";
+$a->strings["Currently Female"] = "Momentan weiblich";
+$a->strings["Mostly Male"] = "Größtenteils männlich";
+$a->strings["Mostly Female"] = "Größtenteils weiblich";
+$a->strings["Transgender"] = "Transsexuell";
+$a->strings["Intersex"] = "Zwischengeschlechtlich";
+$a->strings["Transsexual"] = "Transsexuell";
+$a->strings["Hermaphrodite"] = "Zwitter";
+$a->strings["Neuter"] = "Geschlechtslos";
+$a->strings["Non-specific"] = "unklar";
+$a->strings["Other"] = "Andere";
+$a->strings["Undecided"] = "Unentschieden";
+$a->strings["Males"] = "Männer";
+$a->strings["Females"] = "Frauen";
+$a->strings["Gay"] = "Schwul";
+$a->strings["Lesbian"] = "Lesbisch";
+$a->strings["No Preference"] = "Keine Bevorzugung";
+$a->strings["Bisexual"] = "Bisexuell";
+$a->strings["Autosexual"] = "Autosexuell";
+$a->strings["Abstinent"] = "Enthaltsam";
+$a->strings["Virgin"] = "Jungfräulich";
+$a->strings["Deviant"] = "Abweichend";
+$a->strings["Fetish"] = "Fetisch";
+$a->strings["Oodles"] = "Unmengen";
+$a->strings["Nonsexual"] = "Sexlos";
+$a->strings["Single"] = "Single";
+$a->strings["Lonely"] = "Einsam";
+$a->strings["Available"] = "Verfügbar";
+$a->strings["Unavailable"] = "Nicht verfügbar";
+$a->strings["Has crush"] = "Verguckt";
+$a->strings["Infatuated"] = "Verknallt";
+$a->strings["Dating"] = "Lerne gerade jemanden kennen";
+$a->strings["Unfaithful"] = "Treulos";
+$a->strings["Sex Addict"] = "Sexabhängig";
+$a->strings["Friends/Benefits"] = "Freunde/Begünstigte";
+$a->strings["Casual"] = "Lose";
+$a->strings["Engaged"] = "Verlobt";
+$a->strings["Married"] = "Verheiratet";
+$a->strings["Imaginarily married"] = "Gewissermaßen verheiratet";
+$a->strings["Partners"] = "Partner";
+$a->strings["Cohabiting"] = "Lebensgemeinschaft";
+$a->strings["Common law"] = "Informelle Ehe";
+$a->strings["Happy"] = "Glücklich";
+$a->strings["Not looking"] = "Nicht Ausschau haltend";
+$a->strings["Swinger"] = "Swinger";
+$a->strings["Betrayed"] = "Betrogen";
+$a->strings["Separated"] = "Getrennt";
+$a->strings["Unstable"] = "Labil";
+$a->strings["Divorced"] = "Geschieden";
+$a->strings["Imaginarily divorced"] = "Gewissermaßen geschieden";
+$a->strings["Widowed"] = "Verwitwet";
+$a->strings["Uncertain"] = "Ungewiss";
+$a->strings["It's complicated"] = "Es ist kompliziert";
+$a->strings["Don't care"] = "Interessiert mich nicht";
+$a->strings["Ask me"] = "Frag mich mal";
+$a->strings["Miscellaneous"] = "Verschiedenes";
+$a->strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-TT oder MM-TT";
+$a->strings["Required"] = "Benötigt";
+$a->strings["never"] = "Nie";
+$a->strings["less than a second ago"] = "Vor weniger als einer Sekunde";
+$a->strings["year"] = "Jahr";
+$a->strings["years"] = "Jahre";
+$a->strings["month"] = "Monat";
+$a->strings["months"] = "Monate";
+$a->strings["week"] = "Woche";
+$a->strings["weeks"] = "Wochen";
+$a->strings["day"] = "Tag";
+$a->strings["days"] = "Tage";
+$a->strings["hour"] = "Stunde";
+$a->strings["hours"] = "Stunden";
+$a->strings["minute"] = "Minute";
+$a->strings["minutes"] = "Minuten";
+$a->strings["second"] = "Sekunde";
+$a->strings["seconds"] = "Sekunden";
+$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "vor %1\$d %2\$s";
+$a->strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
+$a->strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
+$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
 $a->strings["photo"] = "Foto";
-$a->strings["event"] = "Termin";
 $a->strings["channel"] = "Kanal";
 $a->strings["status"] = "Status";
 $a->strings["comment"] = "Kommentar";
@@ -295,6 +520,7 @@ $a->strings["Loading..."] = "Lädt ...";
 $a->strings["Delete Selected Items"] = "Lösche die ausgewählten Elemente";
 $a->strings["View Source"] = "Quelle anzeigen";
 $a->strings["Follow Thread"] = "Unterhaltung folgen";
+$a->strings["Unfollow Thread"] = "Unterhaltung nicht mehr folgen";
 $a->strings["View Status"] = "Status ansehen";
 $a->strings["View Profile"] = "Profil ansehen";
 $a->strings["View Photos"] = "Fotos ansehen";
@@ -358,6 +584,7 @@ $a->strings["permissions"] = "Berechtigungen";
 $a->strings["Public post"] = "Öffentlicher Beitrag";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com";
 $a->strings["Set expiration date"] = "Verfallsdatum";
+$a->strings["Set publish date"] = "Veröffentlichungsdatum festlegen";
 $a->strings["Encrypt text"] = "Text verschlüsseln";
 $a->strings["OK"] = "Ok";
 $a->strings["Cancel"] = "Abbrechen";
@@ -367,7 +594,6 @@ $a->strings["Commented Order"] = "Neueste Kommentare";
 $a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert";
 $a->strings["Posted Order"] = "Neueste Beiträge";
 $a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortiert";
-$a->strings["Personal"] = "Persönlich";
 $a->strings["Posts that mention or involve you"] = "Beiträge mit Beteiligung Deinerseits";
 $a->strings["New"] = "Neu";
 $a->strings["Activity Stream - by date"] = "Activity Stream – nach Datum sortiert";
@@ -388,10 +614,6 @@ $a->strings["Saved Bookmarks"] = "Gespeicherte Lesezeichen";
 $a->strings["Webpages"] = "Webseiten";
 $a->strings["Manage Webpages"] = "Webseiten verwalten";
 $a->strings["View all"] = "Alles anzeigen";
-$a->strings["__ctx:noun__ Like"] = array(
-	0 => "Gefällt mir",
-	1 => "Gefällt mir",
-);
 $a->strings["__ctx:noun__ Dislike"] = array(
 	0 => "Gefällt nicht",
 	1 => "Gefällt nicht",
@@ -420,18 +642,63 @@ $a->strings["__ctx:noun__ Abstain"] = array(
 	0 => "Enthaltung",
 	1 => "Enthaltungen",
 );
-$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
-$a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Limit der Webseite von %lu bytes";
-$a->strings["Image file is empty."] = "Bilddatei ist leer.";
-$a->strings["Unable to process image"] = "Kann Bild nicht verarbeiten";
-$a->strings["Photo storage failed."] = "Foto speichern schlug fehl";
-$a->strings["Upload New Photos"] = "Lade neue Fotos hoch";
+$a->strings["Logged out."] = "Ausgeloggt.";
+$a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
+$a->strings["Login failed."] = "Login fehlgeschlagen.";
+$a->strings["Frequently"] = "Häufig";
+$a->strings["Hourly"] = "Stündlich";
+$a->strings["Twice daily"] = "Zwei Mal am Tag";
+$a->strings["Daily"] = "Täglich";
+$a->strings["Weekly"] = "Wöchentlich";
+$a->strings["Monthly"] = "Monatlich";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Email"] = "E-Mail";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
+$a->strings["Image/photo"] = "Bild/Foto";
+$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
+$a->strings["Install %s element: "] = "Element %s installieren: ";
+$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren.";
+$a->strings["webpage"] = "Webseite";
+$a->strings["layout"] = "Layout";
+$a->strings["block"] = "Block";
+$a->strings["menu"] = "Menü";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
+$a->strings["post"] = "Beitrag";
+$a->strings["Different viewers will see this text differently"] = "Verschiedene Betrachter werden diesen Text unterschiedlich sehen";
+$a->strings["$1 spoiler"] = "$1 Spoiler";
+$a->strings["$1 wrote:"] = "$1 schrieb:";
+$a->strings["%d invitation available"] = array(
+	0 => "%d Einladung verfügbar",
+	1 => "%d Einladungen verfügbar",
+);
+$a->strings["Advanced"] = "Fortgeschritten";
+$a->strings["Find Channels"] = "Finde Kanäle";
+$a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
+$a->strings["Connect/Follow"] = "Verbinden/Folgen";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiele: Robert Morgenstein, Angeln";
+$a->strings["Find"] = "Finde";
+$a->strings["Channel Suggestions"] = "Kanal-Vorschläge";
+$a->strings["Random Profile"] = "Zufallsprofil";
+$a->strings["Invite Friends"] = "Lade Freunde ein";
+$a->strings["Advanced example: name=fred and country=iceland"] = "Fortgeschrittenes Beispiel: name=fred and country=iceland";
+$a->strings["%d connection in common"] = array(
+	0 => "%d gemeinsame Verbindung",
+	1 => "%d gemeinsame Verbindungen",
+);
+$a->strings["show more"] = "mehr zeigen";
 $a->strings["\$Projectname Notification"] = "\$Projectname-Benachrichtigung";
 $a->strings["\$projectname"] = "\$projectname";
 $a->strings["Thank You,"] = "Danke.";
 $a->strings["%s Administrator"] = "der Administrator von %s";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Red:Notify] New mail received at %s"] = "[Red:Benachrichtigung] Neue Mail auf %s empfangen";
+$a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Benachrichtigung] Neue Mail empfangen auf %s";
 $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat Dir eine private Nachricht auf %3\$s gesendet.";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s hat Dir %2\$s geschickt.";
 $a->strings["a private message"] = "eine private Nachricht";
@@ -439,37 +706,102 @@ $a->strings["Please visit %s to view and/or reply to your private messages."] =
 $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]einen %4\$s[/zrl] kommentiert";
 $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]%4\$ss %5\$s[/zrl] kommentiert";
 $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen %4\$s[/zrl] kommentiert";
-$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s";
+$a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s";
 $a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat eine Unterhaltung kommentiert, der Du folgst.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren.";
-$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Hinweis] %s schrieb auf Deine Pinnwand";
+$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Benachrichtigung] %s schrieb auf Deine Pinnwand";
 $a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s hat auf Deine Pinnwand auf %3\$s geschrieben";
 $a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s hat auf [zrl=%3\$s]Deine Pinnwand[/zrl] geschrieben";
-$a->strings["[Red:Notify] %s tagged you"] = "[Red:Benachrichtigung] %s hat Dich erwähnt";
+$a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Benachrichtigung] %s hat Dich erwähnt";
 $a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s hat Dich auf %3\$s erwähnt";
 $a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]hat Dich erwähnt[/zrl].";
-$a->strings["[Red:Notify] %1\$s poked you"] = "[Red:Benachrichtigung] %1\$s hat Dich angestupst";
+$a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Benachrichtigung] %1\$s hat Dich angestupst";
 $a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat Dich auf %3\$s angestupst";
 $a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]hat Dich angestupst[/zrl].";
-$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Benachrichtigung] %s hat Deinen Beitrag verschlagwortet";
+$a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Benachrichtigung] %s  hat Deinen Beitrag verschlagwortet";
 $a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s hat Deinen Beitrag auf %3\$s verschlagwortet";
 $a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen Beitrag[/zrl] verschlagwortet";
-$a->strings["[Red:Notify] Introduction received"] = "[Red:Benachrichtigung] Vorstellung erhalten";
+$a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Benachrichtigung] Vorstellung erhalten";
 $a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, Du hast eine neue Verbindungsanfrage von '%2\$s' auf %3\$s erhalten";
 $a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, Du hast [zrl=%2\$s]eine neue Verbindungsanfrage[/zrl] von %3\$s erhalten.";
 $a->strings["You may visit their profile at %s"] = "Du kannst Dir das Profil unter %s ansehen";
 $a->strings["Please visit %s to approve or reject the connection request."] = "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen.";
-$a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten";
+$a->strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Benachrichtigung] Freundschaftsvorschlag erhalten";
 $a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, Du hast einen Kontaktvorschlag von „%2\$s“ auf %3\$s erhalten";
 $a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, Du hast [zrl=%2\$s]einen Kontaktvorschlag[/zrl] für %3\$s von %4\$s erhalten.";
 $a->strings["Name:"] = "Name:";
 $a->strings["Photo:"] = "Foto:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen.";
-$a->strings["[Red:Notify]"] = "[Red:Benachrichtigung]";
-$a->strings["view full size"] = "In Vollbildansicht anschauen";
-$a->strings["Administrator"] = "Administrator";
-$a->strings["No Subject"] = "Kein Betreff";
-$a->strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen";
+$a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Benachrichtigung]";
+$a->strings["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert ";
+$a->strings["Channel location missing."] = "Adresse des Kanals fehlt.";
+$a->strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
+$a->strings["Channel was deleted and no longer exists."] = "Kanal wurde gelöscht und existiert nicht mehr.";
+$a->strings["Protocol disabled."] = "Protokoll deaktiviert.";
+$a->strings["Channel discovery failed."] = "Kanalsuche fehlgeschlagen";
+$a->strings["local account not found."] = "Lokales Konto nicht gefunden.";
+$a->strings["Cannot connect to yourself."] = "Du kannst Dich nicht mit Dir selbst verbinden.";
+$a->strings["Embedded content"] = "Eingebetteter Inhalt";
+$a->strings["Embedding disabled"] = "Einbetten ausgeschaltet";
+$a->strings["No recipient provided."] = "Kein Empfänger angegeben";
+$a->strings["[no subject]"] = "[no subject]";
+$a->strings["Unable to determine sender."] = "Kann Absender nicht bestimmen.";
+$a->strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden.";
+$a->strings["Logout"] = "Abmelden";
+$a->strings["End this session"] = "Beende diese Sitzung";
+$a->strings["Home"] = "Home";
+$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
+$a->strings["Your profile page"] = "Deine Profilseite";
+$a->strings["Edit Profiles"] = "Profile bearbeiten";
+$a->strings["Manage/Edit profiles"] = "Profile verwalten";
+$a->strings["Edit your profile"] = "Profil bearbeiten";
+$a->strings["Your photos"] = "Deine Bilder";
+$a->strings["Your files"] = "Deine Dateien";
+$a->strings["Chat"] = "Chat";
+$a->strings["Your chatrooms"] = "Deine Chaträume";
+$a->strings["Your bookmarks"] = "Deine Lesezeichen";
+$a->strings["Your webpages"] = "Deine Webseiten";
+$a->strings["Login"] = "Anmelden";
+$a->strings["Sign in"] = "Anmelden";
+$a->strings["%s - click to logout"] = "%s - Klick zum Abmelden";
+$a->strings["Remote authentication"] = "Ãœber Konto auf anderem Server einloggen";
+$a->strings["Click to authenticate to your home hub"] = "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren";
+$a->strings["Home Page"] = "Homepage";
+$a->strings["Register"] = "Registrieren";
+$a->strings["Create an account"] = "Erzeuge ein Konto";
+$a->strings["Help"] = "Hilfe";
+$a->strings["Help and documentation"] = "Hilfe und Dokumentation";
+$a->strings["Applications, utilities, links, games"] = "Anwendungen (Apps), Zubehör, Links, Spiele";
+$a->strings["Search"] = "Suche";
+$a->strings["Search site @name, #tag, ?docs, content"] = "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt";
+$a->strings["Directory"] = "Verzeichnis";
+$a->strings["Channel Directory"] = "Kanal-Verzeichnis";
+$a->strings["Grid"] = "Grid";
+$a->strings["Your grid"] = "Dein Grid";
+$a->strings["Mark all grid notifications seen"] = "Alle Grid-Benachrichtigungen als angesehen markieren";
+$a->strings["Channel Home"] = "Mein Kanal";
+$a->strings["Channel home"] = "Mein Kanal";
+$a->strings["Mark all channel notifications seen"] = "Markiere alle Kanal-Benachrichtigungen als angesehen";
+$a->strings["Connections"] = "Verbindungen";
+$a->strings["Notices"] = "Benachrichtigungen";
+$a->strings["Notifications"] = "Benachrichtigungen";
+$a->strings["See all notifications"] = "Alle Benachrichtigungen ansehen";
+$a->strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gesehen";
+$a->strings["Mail"] = "Mail";
+$a->strings["Private mail"] = "Persönliche Mail";
+$a->strings["See all private messages"] = "Alle persönlichen Nachrichten ansehen";
+$a->strings["Mark all private messages seen"] = "Markiere alle persönlichen Nachrichten als gesehen";
+$a->strings["Events"] = "Termine";
+$a->strings["Event Calendar"] = "Terminkalender";
+$a->strings["See all events"] = "Alle Termine ansehen";
+$a->strings["Mark all events seen"] = "Markiere alle Termine als gesehen";
+$a->strings["Channel Manager"] = "Kanal-Manager";
+$a->strings["Manage Your Channels"] = "Verwalte Deine Kanäle";
+$a->strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen";
+$a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
+$a->strings["@name, #tag, ?doc, content"] = "@Name, #Schlagwort, ?Dokumentation, Inhalt";
+$a->strings["Please wait..."] = "Bitte warten...";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
 $a->strings["prev"] = "vorherige";
 $a->strings["first"] = "erste";
 $a->strings["last"] = "letzte";
@@ -482,8 +814,6 @@ $a->strings["%d Connection"] = array(
 	1 => "%d Verbindungen",
 );
 $a->strings["View Connections"] = "Verbindungen anzeigen";
-$a->strings["Search"] = "Suche";
-$a->strings["Save"] = "Speichern";
 $a->strings["poke"] = "anstupsen";
 $a->strings["ping"] = "anpingen";
 $a->strings["pinged"] = "pingte";
@@ -517,8 +847,8 @@ $a->strings["motivated"] = "motiviert";
 $a->strings["relaxed"] = "entspannt";
 $a->strings["surprised"] = "überrascht";
 $a->strings["May"] = "Mai";
-$a->strings["unknown.???"] = "unbekannt.???";
-$a->strings["bytes"] = "Bytes";
+$a->strings["Unknown Attachment"] = "Unbekannter Anhang";
+$a->strings["unknown"] = "unbekannt";
 $a->strings["remove category"] = "Kategorie entfernen";
 $a->strings["remove from file"] = "aus der Datei entfernen";
 $a->strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
@@ -534,198 +864,12 @@ $a->strings["Blocks"] = "Blöcke";
 $a->strings["Menus"] = "Menüs";
 $a->strings["Layouts"] = "Layouts";
 $a->strings["Pages"] = "Seiten";
-$a->strings["Visible to your default audience"] = "Standard-Sichtbarkeit";
-$a->strings["Show"] = "Anzeigen";
-$a->strings["Don't show"] = "Nicht anzeigen";
-$a->strings["Permissions"] = "Berechtigungen";
-$a->strings["Close"] = "Schließen";
-$a->strings["Item was not found."] = "Beitrag wurde nicht gefunden.";
-$a->strings["No source file."] = "Keine Quelldatei.";
-$a->strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden";
-$a->strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden";
-$a->strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
-$a->strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
-$a->strings["Path not available."] = "Pfad nicht verfügbar.";
-$a->strings["Empty pathname"] = "Leere Pfadangabe";
-$a->strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
-$a->strings["Path not found."] = "Pfad nicht gefunden.";
-$a->strings["mkdir failed."] = "mkdir fehlgeschlagen.";
-$a->strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
-$a->strings["Empty path"] = "Leere Pfadangabe";
-$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen.";
-$a->strings["Channel clone failed. Import failed."] = "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen.";
-$a->strings["Cloned channel not found. Import failed."] = "Geklonter Kanal nicht gefunden. Import fehlgeschlagen.";
-$a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
-$a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
-$a->strings["New Page"] = "Neue Seite";
-$a->strings["View"] = "Ansicht";
-$a->strings["Actions"] = "Aktionen";
-$a->strings["Page Link"] = "Seiten-Link";
-$a->strings["Title"] = "Titel";
-$a->strings["Created"] = "Erstellt";
-$a->strings["Edited"] = "Geändert";
-$a->strings["Profile Photos"] = "Profilfotos";
-$a->strings["Male"] = "Männlich";
-$a->strings["Female"] = "Weiblich";
-$a->strings["Currently Male"] = "Momentan männlich";
-$a->strings["Currently Female"] = "Momentan weiblich";
-$a->strings["Mostly Male"] = "Größtenteils männlich";
-$a->strings["Mostly Female"] = "Größtenteils weiblich";
-$a->strings["Transgender"] = "Transsexuell";
-$a->strings["Intersex"] = "Zwischengeschlechtlich";
-$a->strings["Transsexual"] = "Transsexuell";
-$a->strings["Hermaphrodite"] = "Zwitter";
-$a->strings["Neuter"] = "Geschlechtslos";
-$a->strings["Non-specific"] = "unklar";
-$a->strings["Undecided"] = "Unentschieden";
-$a->strings["Males"] = "Männer";
-$a->strings["Females"] = "Frauen";
-$a->strings["Gay"] = "Schwul";
-$a->strings["Lesbian"] = "Lesbisch";
-$a->strings["No Preference"] = "Keine Bevorzugung";
-$a->strings["Bisexual"] = "Bisexuell";
-$a->strings["Autosexual"] = "Autosexuell";
-$a->strings["Abstinent"] = "Enthaltsam";
-$a->strings["Virgin"] = "Jungfräulich";
-$a->strings["Deviant"] = "Abweichend";
-$a->strings["Fetish"] = "Fetisch";
-$a->strings["Oodles"] = "Unmengen";
-$a->strings["Nonsexual"] = "Sexlos";
-$a->strings["Single"] = "Single";
-$a->strings["Lonely"] = "Einsam";
-$a->strings["Available"] = "Verfügbar";
-$a->strings["Unavailable"] = "Nicht verfügbar";
-$a->strings["Has crush"] = "Verguckt";
-$a->strings["Infatuated"] = "Verknallt";
-$a->strings["Dating"] = "Lerne gerade jemanden kennen";
-$a->strings["Unfaithful"] = "Treulos";
-$a->strings["Sex Addict"] = "Sexabhängig";
-$a->strings["Friends"] = "Freunde";
-$a->strings["Friends/Benefits"] = "Freunde/Begünstigte";
-$a->strings["Casual"] = "Lose";
-$a->strings["Engaged"] = "Verlobt";
-$a->strings["Married"] = "Verheiratet";
-$a->strings["Imaginarily married"] = "Gewissermaßen verheiratet";
-$a->strings["Partners"] = "Partner";
-$a->strings["Cohabiting"] = "Lebensgemeinschaft";
-$a->strings["Common law"] = "Informelle Ehe";
-$a->strings["Happy"] = "Glücklich";
-$a->strings["Not looking"] = "Nicht Ausschau haltend";
-$a->strings["Swinger"] = "Swinger";
-$a->strings["Betrayed"] = "Betrogen";
-$a->strings["Separated"] = "Getrennt";
-$a->strings["Unstable"] = "Labil";
-$a->strings["Divorced"] = "Geschieden";
-$a->strings["Imaginarily divorced"] = "Gewissermaßen geschieden";
-$a->strings["Widowed"] = "Verwitwet";
-$a->strings["Uncertain"] = "Ungewiss";
-$a->strings["It's complicated"] = "Es ist kompliziert";
-$a->strings["Don't care"] = "Interessiert mich nicht";
-$a->strings["Ask me"] = "Frag mich mal";
-$a->strings["Embedded content"] = "Eingebetteter Inhalt";
-$a->strings["Embedding disabled"] = "Einbetten ausgeschaltet";
-$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y, H:i";
-$a->strings["Starts:"] = "Beginnt:";
-$a->strings["Finishes:"] = "Endet:";
-$a->strings["Location:"] = "Ort:";
-$a->strings["This event has been added to your calendar."] = "Dieser Termin wurde zu Deinem Kalender hinzugefügt";
-$a->strings["Not specified"] = "Keine Angabe";
-$a->strings["Needs Action"] = "Aktion erforderlich";
-$a->strings["Completed"] = "Abgeschlossen";
-$a->strings["In Process"] = "In Bearbeitung";
-$a->strings["Cancelled"] = "gestrichen";
-$a->strings["Site Admin"] = "Hub-Administration";
-$a->strings["Address Book"] = "Adressbuch";
-$a->strings["Login"] = "Anmelden";
-$a->strings["Channel Manager"] = "Kanal-Manager";
-$a->strings["Matrix"] = "Matrix";
-$a->strings["Settings"] = "Einstellungen";
-$a->strings["Channel Home"] = "Mein Kanal";
-$a->strings["Profile"] = "Profil";
-$a->strings["Events"] = "Termine";
-$a->strings["Directory"] = "Verzeichnis";
-$a->strings["Help"] = "Hilfe";
-$a->strings["Mail"] = "Mail";
-$a->strings["Mood"] = "Laune";
-$a->strings["Chat"] = "Chat";
-$a->strings["Probe"] = "Testen";
-$a->strings["Suggest"] = "Empfehlen";
-$a->strings["Random Channel"] = "Zufälliger Kanal";
-$a->strings["Invite"] = "Einladen";
-$a->strings["Features"] = "Funktionen";
-$a->strings["Language"] = "Sprache";
-$a->strings["Post"] = "Beitrag";
-$a->strings["Profile Photo"] = "Profilfoto";
-$a->strings["Update"] = "Aktualisieren";
-$a->strings["Install"] = "Installieren";
-$a->strings["Purchase"] = "Kaufen";
-$a->strings["Logged out."] = "Ausgeloggt.";
-$a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
-$a->strings["Login failed."] = "Login fehlgeschlagen.";
-$a->strings["Attachments:"] = "Anhänge:";
-$a->strings["\$Projectname event notification:"] = "\$Projectname-Terminbenachrichtigung:";
-$a->strings["Image/photo"] = "Bild/Foto";
-$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
-$a->strings["Install %s element: "] = "Element %s installieren: ";
-$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren.";
-$a->strings["webpage"] = "Webseite";
-$a->strings["layout"] = "Layout";
-$a->strings["block"] = "Block";
-$a->strings["menu"] = "Menü";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
-$a->strings["post"] = "Beitrag";
-$a->strings["Different viewers will see this text differently"] = "Verschiedene Betrachter werden diesen Text unterschiedlich sehen";
-$a->strings["$1 spoiler"] = "$1 Spoiler";
-$a->strings["$1 wrote:"] = "$1 schrieb:";
-$a->strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
-$a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt";
-$a->strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
-$a->strings["An invitation is required."] = "Eine Einladung wird benötigt";
-$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht bestätigt werden";
-$a->strings["Please enter the required information."] = "Bitte gib die benötigten Informationen ein.";
-$a->strings["Failed to store account information."] = "Speichern der Account-Informationen fehlgeschlagen";
-$a->strings["Registration confirmation for %s"] = "Registrierungsbestätigung für %s";
-$a->strings["Registration request at %s"] = "Registrierungsanfrage auf %s";
-$a->strings["your registration password"] = "Dein Registrierungspasswort";
-$a->strings["Registration details for %s"] = "Registrierungsdetails für %s";
-$a->strings["Account approved."] = "Account bestätigt.";
-$a->strings["Registration revoked for %s"] = "Registrierung für %s widerrufen";
-$a->strings["Account verified. Please login."] = "Konto geprüft. Bitte melde Dich an!";
-$a->strings["Click here to upgrade."] = "Klicke hier, um das Upgrade durchzuführen.";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Grenzen Ihres Abonnements.";
-$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar.";
-$a->strings["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert ";
-$a->strings["Channel location missing."] = "Adresse des Kanals fehlt.";
-$a->strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
-$a->strings["Channel was deleted and no longer exists."] = "Kanal wurde gelöscht und existiert nicht mehr.";
-$a->strings["Protocol disabled."] = "Protokoll deaktiviert.";
-$a->strings["Channel discovery failed."] = "Kanalsuche fehlgeschlagen";
-$a->strings["local account not found."] = "Lokales Konto nicht gefunden.";
-$a->strings["Cannot connect to yourself."] = "Du kannst Dich nicht mit Dir selbst verbinden.";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
-$a->strings["%d invitation available"] = array(
-	0 => "%d Einladung verfügbar",
-	1 => "%d Einladungen verfügbar",
-);
-$a->strings["Advanced"] = "Fortgeschritten";
-$a->strings["Find Channels"] = "Finde Kanäle";
-$a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
-$a->strings["Connect/Follow"] = "Verbinden/Folgen";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiele: Robert Morgenstein, Angeln";
-$a->strings["Find"] = "Finde";
-$a->strings["Channel Suggestions"] = "Kanal-Vorschläge";
-$a->strings["Random Profile"] = "Zufallsprofil";
-$a->strings["Invite Friends"] = "Lade Freunde ein";
-$a->strings["Advanced example: name=fred and country=iceland"] = "Fortgeschrittenes Beispiel: name=fred and country=iceland";
-$a->strings["Everything"] = "Alles";
-$a->strings["Categories"] = "Kategorien";
-$a->strings["%d connection in common"] = array(
-	0 => "%d gemeinsame Verbindung",
-	1 => "%d gemeinsame Verbindungen",
-);
-$a->strings["show more"] = "mehr zeigen";
+$a->strings["Directory Options"] = "Verzeichnisoptionen";
+$a->strings["Safe Mode"] = "Sicherer Modus";
+$a->strings["No"] = "Nein";
+$a->strings["Yes"] = "Ja";
+$a->strings["Public Forums Only"] = "Nur öffentliche Foren";
+$a->strings["This Website Only"] = "Nur dieser Hub";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Es hat früher schon einmal eine Sammlung mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Sammlung den Zugriff erlauben. Wenn das nicht Dein Plan war, erstelle bitte eine neue Sammlung mit einem anderen Namen.";
 $a->strings["Add new connections to this collection (privacy group)"] = "Neue Verbindungen zu dieser Sammlung (Privatsphäre-Gruppe) hinzufügen";
 $a->strings["All Channels"] = "Alle Kanäle";
@@ -734,84 +878,26 @@ $a->strings["Collections"] = "Sammlungen";
 $a->strings["Edit collection"] = "Sammlung bearbeiten";
 $a->strings["Add new collection"] = "Neue Sammlung hinzufügen";
 $a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sammlung sind";
-$a->strings["add"] = "hinzufügen";
-$a->strings["Tags"] = "Schlagwörter";
-$a->strings["Keywords"] = "Schlüsselwörter";
-$a->strings["have"] = "habe";
-$a->strings["has"] = "hat";
-$a->strings["want"] = "will";
-$a->strings["wants"] = "will";
-$a->strings["like"] = "mag";
-$a->strings["likes"] = "gefällt";
-$a->strings["dislike"] = "verurteile";
-$a->strings["dislikes"] = "missfällt";
-$a->strings["Directory Options"] = "Verzeichnisoptionen";
-$a->strings["Safe Mode"] = "Sicherer Modus";
-$a->strings["No"] = "Nein";
-$a->strings["Yes"] = "Ja";
-$a->strings["Public Forums Only"] = "Nur öffentliche Foren";
-$a->strings["This Website Only"] = "Nur dieser Hub";
-$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
-$a->strings["Empty name"] = "Namensfeld leer";
-$a->strings["Name too long"] = "Name ist zu lang";
-$a->strings["No account identifier"] = "Keine Account-Kennung";
-$a->strings["Nickname is required."] = "Spitzname ist erforderlich.";
-$a->strings["Reserved nickname. Please choose another."] = "Reservierter Kurzname. Bitte wähle einen anderen.";
-$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
-$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
-$a->strings["Default Profile"] = "Standard-Profil";
-$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
-$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar.";
-$a->strings["Change profile photo"] = "Profilfoto ändern";
-$a->strings["Profiles"] = "Profile";
-$a->strings["Manage/edit profiles"] = "Profile verwalten/bearbeiten";
-$a->strings["Create New Profile"] = "Neues Profil erstellen";
-$a->strings["Edit Profile"] = "Profile bearbeiten";
-$a->strings["Profile Image"] = "Profilfoto:";
-$a->strings["visible to everybody"] = "sichtbar für jeden";
-$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
-$a->strings["Gender:"] = "Geschlecht:";
-$a->strings["Status:"] = "Status:";
-$a->strings["Homepage:"] = "Homepage:";
-$a->strings["Online Now"] = "gerade online";
-$a->strings["g A l F d"] = "l, d. F, G:i \\U\\h\\r";
-$a->strings["F d"] = "d. F";
-$a->strings["[today]"] = "[Heute]";
-$a->strings["Birthday Reminders"] = "Geburtstags Erinnerungen";
-$a->strings["Birthdays this week:"] = "Geburtstage in dieser Woche:";
-$a->strings["[No description]"] = "[Keine Beschreibung]";
-$a->strings["Event Reminders"] = "Termin-Erinnerungen";
-$a->strings["Events this week:"] = "Termine in dieser Woche:";
-$a->strings["Full Name:"] = "Voller Name:";
-$a->strings["Like this channel"] = "Dieser Kanal gefällt mir";
-$a->strings["j F, Y"] = "j. F Y";
-$a->strings["j F"] = "j. F";
-$a->strings["Birthday:"] = "Geburtstag:";
-$a->strings["Age:"] = "Alter:";
-$a->strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s";
-$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:";
-$a->strings["Hometown:"] = "Heimatstadt:";
-$a->strings["Tags:"] = "Schlagworte:";
-$a->strings["Political Views:"] = "Politische Ansichten:";
-$a->strings["Religion:"] = "Religion:";
-$a->strings["About:"] = "Ãœber:";
-$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
-$a->strings["Likes:"] = "Gefällt:";
-$a->strings["Dislikes:"] = "Gefällt nicht:";
-$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
-$a->strings["My other channels:"] = "Meine anderen Kanäle:";
-$a->strings["Musical interests:"] = "Musikalische Interessen:";
-$a->strings["Books, literature:"] = "Bücher, Literatur:";
-$a->strings["Television:"] = "Fernsehen:";
-$a->strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:";
-$a->strings["Love/Romance:"] = "Liebe/Romantik:";
-$a->strings["Work/employment:"] = "Arbeit/Anstellung:";
-$a->strings["School/education:"] = "Schule/Ausbildung:";
-$a->strings["Like this thing"] = "Gefällt mir";
-$a->strings["No recipient provided."] = "Kein Empfänger angegeben";
-$a->strings["[no subject]"] = "[no subject]";
-$a->strings["Unable to determine sender."] = "Kann Absender nicht bestimmen.";
-$a->strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden.";
+$a->strings["Invalid data packet"] = "Ungültiges Datenpaket";
+$a->strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
+$a->strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
+$a->strings["invalid target signature"] = "Ungültige Signatur des Ziels";
+$a->strings["New Page"] = "Neue Seite";
+$a->strings["View"] = "Ansicht";
+$a->strings["Actions"] = "Aktionen";
+$a->strings["Page Link"] = "Seiten-Link";
+$a->strings["Title"] = "Titel";
+$a->strings["Created"] = "Erstellt";
+$a->strings["Edited"] = "Geändert";
+$a->strings["view full size"] = "In Vollbildansicht anschauen";
+$a->strings["Administrator"] = "Administrator";
+$a->strings["No Subject"] = "Kein Betreff";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Webseitenlimit von %lu Bytes";
+$a->strings["Image file is empty."] = "Bilddatei ist leer.";
+$a->strings["Unable to process image"] = "Kann Bild nicht verarbeiten";
+$a->strings["Photo storage failed."] = "Fotospeicherung fehlgeschlagen.";
+$a->strings["Upload New Photos"] = "Neue Fotos hochladen";
 $a->strings["Save to Folder"] = "In Ordner speichern";
 $a->strings["I will attend"] = "Ich werde teilnehmen";
 $a->strings["I will not attend"] = "Ich werde nicht teilnehmen";
@@ -828,6 +914,7 @@ $a->strings["I like this (toggle)"] = "Mir gefällt das (Umschalter)";
 $a->strings["I don't like this (toggle)"] = "Mir gefällt das nicht (Umschalter)";
 $a->strings["Share This"] = "Teilen";
 $a->strings["share"] = "Teilen";
+$a->strings["Delivery Report"] = "Zustellungsbericht";
 $a->strings["%d comment"] = array(
 	0 => "%d Kommentar",
 	1 => "%d Kommentare",
@@ -837,7 +924,6 @@ $a->strings["to"] = "an";
 $a->strings["via"] = "via";
 $a->strings["Wall-to-Wall"] = "Wall-to-Wall";
 $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
-$a->strings["Delivery Report"] = "Zustellungsbericht";
 $a->strings["Save Bookmarks"] = "Favoriten speichern";
 $a->strings["Add to Calendar"] = "Zum Kalender hinzufügen";
 $a->strings["Mark all seen"] = "Alle als gelesen markieren";
@@ -847,174 +933,137 @@ $a->strings["This is you"] = "Das bist Du";
 $a->strings["Image"] = "Bild";
 $a->strings["Insert Link"] = "Link einfügen";
 $a->strings["Video"] = "Video";
-$a->strings["Permission denied"] = "Keine Berechtigung";
-$a->strings["(Unknown)"] = "(Unbekannt)";
-$a->strings["Visible to anybody on the internet."] = "Für jeden im Internet sichtbar.";
-$a->strings["Visible to you only."] = "Nur für Dich sichtbar.";
-$a->strings["Visible to anybody in this network."] = "Für jedes Mitglied der RedMatrix sichtbar.";
-$a->strings["Visible to anybody authenticated."] = "Für jeden sichtbar, der angemeldet ist.";
-$a->strings["Visible to anybody on %s."] = "Für jeden auf %s sichtbar.";
-$a->strings["Visible to all connections."] = "Für alle Verbindungen sichtbar.";
-$a->strings["Visible to approved connections."] = "Nur für akzeptierte Verbindungen sichtbar.";
-$a->strings["Visible to specific connections."] = "Sichtbar für bestimmte Verbindungen.";
-$a->strings["Item not found."] = "Element nicht gefunden.";
-$a->strings["Collection not found."] = "Sammlung nicht gefunden";
-$a->strings["Collection is empty."] = "Sammlung ist leer.";
-$a->strings["Collection: %s"] = "Sammlung: %s";
-$a->strings["Connection: %s"] = "Verbindung: %s";
-$a->strings["Connection not found."] = "Die Verbindung wurde nicht gefunden.";
-$a->strings["Apps"] = "Apps";
-$a->strings["System"] = "System";
-$a->strings["Create Personal App"] = "Persönliche App erstellen";
-$a->strings["Edit Personal App"] = "Persönliche App bearbeiten";
-$a->strings["Ignore/Hide"] = "Ignorieren/Verstecken";
-$a->strings["Suggestions"] = "Vorschläge";
-$a->strings["See more..."] = "Mehr anzeigen …";
-$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen.";
-$a->strings["Add New Connection"] = "Neue Verbindung hinzufügen";
-$a->strings["Enter the channel address"] = "Adresse des Kanals eingeben";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara";
-$a->strings["Notes"] = "Notizen";
-$a->strings["Remove term"] = "Eintrag löschen";
-$a->strings["Archives"] = "Archive";
-$a->strings["Me"] = "Ich";
-$a->strings["Family"] = "Familie";
-$a->strings["Acquaintances"] = "Bekannte";
-$a->strings["All"] = "Alle";
-$a->strings["Refresh"] = "Aktualisieren";
-$a->strings["Account settings"] = "Konto-Einstellungen";
-$a->strings["Channel settings"] = "Kanal-Einstellungen";
-$a->strings["Additional features"] = "Zusätzliche Funktionen";
-$a->strings["Feature/Addon settings"] = "Plugin-Einstellungen";
-$a->strings["Display settings"] = "Anzeige-Einstellungen";
-$a->strings["Connected apps"] = "Verbundene Apps";
-$a->strings["Export channel"] = "Kanal exportieren";
-$a->strings["Connection Default Permissions"] = "Standardzugriffsrechte für neue Verbindungen:";
-$a->strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen";
-$a->strings["Private Mail Menu"] = "Private Nachrichten";
-$a->strings["Check Mail"] = "Nachrichten abrufen";
-$a->strings["Combined View"] = "Kombinierte Anzeige";
-$a->strings["Inbox"] = "Eingang";
-$a->strings["Outbox"] = "Ausgang";
-$a->strings["New Message"] = "Neue Nachricht";
-$a->strings["Conversations"] = "Konversationen";
-$a->strings["Received Messages"] = "Erhaltene Nachrichten";
-$a->strings["Sent Messages"] = "Gesendete Nachrichten";
-$a->strings["No messages."] = "Keine Nachrichten.";
-$a->strings["Delete conversation"] = "Unterhaltung löschen";
-$a->strings["D, d M Y - g:i A"] = "D, d. M Y - G:i";
-$a->strings["Chat Rooms"] = "Chaträume";
-$a->strings["Bookmarked Chatrooms"] = "Gespeicherte Chatrooms";
-$a->strings["Suggested Chatrooms"] = "Chatraum-Vorschläge";
-$a->strings["photo/image"] = "Foto/Bild";
-$a->strings["Rate Me"] = "Bewerte mich";
-$a->strings["View Ratings"] = "Bewertungen ansehen";
-$a->strings["Public Hubs"] = "Öffentliche Hubs";
-$a->strings["Forums"] = "Foren";
-$a->strings["Tasks"] = "Aufgaben";
-$a->strings["Documentation"] = "Dokumentation";
-$a->strings["Project/Site Information"] = "Informationen über das Projekt und diesen Hub";
-$a->strings["For Members"] = "Für Mitglieder";
-$a->strings["For Administrators"] = "Für Administratoren";
-$a->strings["For Developers"] = "Für Entwickler";
-$a->strings["Site"] = "Seite";
-$a->strings["Accounts"] = "Konten";
-$a->strings["Channels"] = "Kanäle";
-$a->strings["Plugins"] = "Plug-Ins";
-$a->strings["Themes"] = "Themes";
-$a->strings["Inspect queue"] = "Warteschlange kontrollieren";
-$a->strings["Profile Config"] = "Profilkonfiguration";
-$a->strings["DB updates"] = "DB-Aktualisierungen";
-$a->strings["Logs"] = "Protokolle";
-$a->strings["Admin"] = "Administration";
-$a->strings["Plugin Features"] = "Plug-In Funktionen";
-$a->strings["User registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
-$a->strings["Invalid data packet"] = "Ungültiges Datenpaket";
-$a->strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
-$a->strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
-$a->strings["invalid target signature"] = "Ungültige Signatur des Ziels";
-$a->strings["Logout"] = "Abmelden";
-$a->strings["End this session"] = "Beende diese Sitzung";
-$a->strings["Home"] = "Home";
-$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
-$a->strings["Your profile page"] = "Deine Profilseite";
-$a->strings["Edit Profiles"] = "Profile bearbeiten";
-$a->strings["Manage/Edit profiles"] = "Profile verwalten";
-$a->strings["Edit your profile"] = "Profil bearbeiten";
-$a->strings["Your photos"] = "Deine Bilder";
-$a->strings["Your files"] = "Deine Dateien";
-$a->strings["Your chatrooms"] = "Deine Chaträume";
-$a->strings["Your bookmarks"] = "Deine Lesezeichen";
-$a->strings["Your webpages"] = "Deine Webseiten";
-$a->strings["Sign in"] = "Anmelden";
-$a->strings["%s - click to logout"] = "%s - Klick zum Abmelden";
-$a->strings["Remote authentication"] = "Ãœber Konto auf anderem Server einloggen";
-$a->strings["Click to authenticate to your home hub"] = "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren";
-$a->strings["Home Page"] = "Homepage";
-$a->strings["Register"] = "Registrieren";
-$a->strings["Create an account"] = "Erzeuge ein Konto";
-$a->strings["Help and documentation"] = "Hilfe und Dokumentation";
-$a->strings["Applications, utilities, links, games"] = "Anwendungen (Apps), Zubehör, Links, Spiele";
-$a->strings["Search site @name, #tag, ?docs, content"] = "Hub durchsuchen: @Name. #Schlagwort, ?Dokumentation, Inhalt";
-$a->strings["Channel Directory"] = "Kanal-Verzeichnis";
-$a->strings["Grid"] = "Grid";
-$a->strings["Your grid"] = "Dein Grid";
-$a->strings["Mark all grid notifications seen"] = "Alle Grid-Benachrichtigungen als angesehen markieren";
-$a->strings["Channel home"] = "Mein Kanal";
-$a->strings["Mark all channel notifications seen"] = "Markiere alle Kanal-Benachrichtigungen als angesehen";
-$a->strings["Connections"] = "Verbindungen";
-$a->strings["Notices"] = "Benachrichtigungen";
-$a->strings["Notifications"] = "Benachrichtigungen";
-$a->strings["See all notifications"] = "Alle Benachrichtigungen ansehen";
-$a->strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gesehen";
-$a->strings["Private mail"] = "Persönliche Mail";
-$a->strings["See all private messages"] = "Alle persönlichen Nachrichten ansehen";
-$a->strings["Mark all private messages seen"] = "Markiere alle persönlichen Nachrichten als gesehen";
-$a->strings["Event Calendar"] = "Terminkalender";
-$a->strings["See all events"] = "Alle Termine ansehen";
-$a->strings["Mark all events seen"] = "Markiere alle Termine als gesehen";
-$a->strings["Manage Your Channels"] = "Verwalte Deine Kanäle";
-$a->strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen";
-$a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
-$a->strings["@name, #tag, ?doc, content"] = "@Name, #Schlagwort, ?Dokumentation, Inhalt";
-$a->strings["Please wait..."] = "Bitte warten...";
-$a->strings["Some blurb about what to do when you're new here"] = "Ein Hinweis, was man tun kann, wenn man neu hier ist";
-$a->strings["Contact not found."] = "Kontakt nicht gefunden";
-$a->strings["Friend suggestion sent."] = "Freundschaftsempfehlung senden.";
-$a->strings["Suggest Friends"] = "Kontakte vorschlagen";
-$a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor";
-$a->strings["Public access denied."] = "Öffentlicher Zugang verweigert.";
-$a->strings["%d rating"] = array(
-	0 => "%d Bewertung",
-	1 => "%d Bewertungen",
-);
-$a->strings["Gender: "] = "Geschlecht:";
-$a->strings["Status: "] = "Status:";
-$a->strings["Homepage: "] = "Webseite:";
-$a->strings["Description:"] = "Beschreibung:";
-$a->strings["Public Forum:"] = "Öffentliches Forum:";
-$a->strings["Keywords: "] = "Schlüsselwörter:";
-$a->strings["Don't suggest"] = "Nicht vorschlagen";
-$a->strings["Common connections:"] = "Gemeinsame Verbindungen:";
-$a->strings["Global Directory"] = "Globales Verzeichnis";
-$a->strings["Local Directory"] = "Lokales Verzeichnis";
-$a->strings["Finding:"] = "Ergebnisse:";
-$a->strings["next page"] = "nächste Seite";
-$a->strings["previous page"] = "vorherige Seite";
-$a->strings["Sort options"] = "Sortieroptionen";
-$a->strings["Alphabetic"] = "alphabetisch";
-$a->strings["Reverse Alphabetic"] = "Entgegengesetzt alphabetisch";
-$a->strings["Newest to Oldest"] = "Neueste zuerst";
-$a->strings["Oldest to Newest"] = "Älteste zuerst";
-$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
-$a->strings["Bookmark added"] = "Lesezeichen hinzugefügt";
-$a->strings["My Bookmarks"] = "Meine Lesezeichen";
-$a->strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
+$a->strings["Site Admin"] = "Hub-Administration";
+$a->strings["Address Book"] = "Adressbuch";
+$a->strings["Mood"] = "Laune";
+$a->strings["Probe"] = "Testen";
+$a->strings["Suggest"] = "Empfehlen";
+$a->strings["Random Channel"] = "Zufälliger Kanal";
+$a->strings["Invite"] = "Einladen";
+$a->strings["Features"] = "Funktionen";
+$a->strings["Language"] = "Sprache";
+$a->strings["Post"] = "Beitrag";
+$a->strings["Profile Photo"] = "Profilfoto";
+$a->strings["Update"] = "Aktualisieren";
+$a->strings["Install"] = "Installieren";
+$a->strings["Purchase"] = "Kaufen";
+$a->strings["Can view my normal stream and posts"] = "Kann meine normalen Beiträge sehen";
+$a->strings["Can view my default channel profile"] = "Kann mein Standardprofil sehen";
+$a->strings["Can view my connections"] = "Kann meine Verbindungen sehen";
+$a->strings["Can view my file storage and photos"] = "Kann meine Datei- und Bilderordner sehen";
+$a->strings["Can view my webpages"] = "Kann meine Webseiten sehen";
+$a->strings["Can send me their channel stream and posts"] = "Kann mir die Beiträge aus seinem/ihrem Kanal schicken";
+$a->strings["Can post on my channel page (\"wall\")"] = "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen";
+$a->strings["Can comment on or like my posts"] = "Darf meine Beiträge kommentieren und mögen/nicht mögen";
+$a->strings["Can send me private mail messages"] = "Kann mir private Nachrichten schicken";
+$a->strings["Can like/dislike stuff"] = "Kann andere Elemente mögen/nicht mögen";
+$a->strings["Profiles and things other than posts/comments"] = "Profile und alles außer Beiträge und Kommentare";
+$a->strings["Can forward to all my channel contacts via post @mentions"] = "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten";
+$a->strings["Advanced - useful for creating group forum channels"] = "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen";
+$a->strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
+$a->strings["Can write to my file storage and photos"] = "Kann in meine Datei- und Bilderordner schreiben";
+$a->strings["Can edit my webpages"] = "Kann meine Webseiten bearbeiten";
+$a->strings["Can source my public posts in derived channels"] = "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden";
+$a->strings["Somewhat advanced - very useful in open communities"] = "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften";
+$a->strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
+$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust";
+$a->strings["Social Networking"] = "Soziales Netzwerk";
+$a->strings["Mostly Public"] = "Weitgehend öffentlich";
+$a->strings["Restricted"] = "Beschränkt";
+$a->strings["Private"] = "Privat";
+$a->strings["Community Forum"] = "Forum";
+$a->strings["Feed Republish"] = "Teilen von Feeds";
+$a->strings["Special Purpose"] = "Für besondere Zwecke";
+$a->strings["Celebrity/Soapbox"] = "Mitteilungs-Kanal (keine Kommentare)";
+$a->strings["Group Repository"] = "Gruppenarchiv";
+$a->strings["Custom/Expert Mode"] = "Benutzerdefiniert/Expertenmodus";
+$a->strings["Profile Photos"] = "Profilfotos";
+$a->strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
+$a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt";
+$a->strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
+$a->strings["An invitation is required."] = "Eine Einladung wird benötigt";
+$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht bestätigt werden";
+$a->strings["Please enter the required information."] = "Bitte gib die benötigten Informationen ein.";
+$a->strings["Failed to store account information."] = "Speichern der Account-Informationen fehlgeschlagen";
+$a->strings["Registration confirmation for %s"] = "Registrierungsbestätigung für %s";
+$a->strings["Registration request at %s"] = "Registrierungsanfrage auf %s";
+$a->strings["your registration password"] = "Dein Registrierungspasswort";
+$a->strings["Registration details for %s"] = "Registrierungsdetails für %s";
+$a->strings["Account approved."] = "Account bestätigt.";
+$a->strings["Registration revoked for %s"] = "Registrierung für %s widerrufen";
+$a->strings["Account verified. Please login."] = "Konto geprüft. Bitte melde Dich an!";
+$a->strings["Click here to upgrade."] = "Klicke hier, um das Upgrade durchzuführen.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Grenzen Ihres Abonnements.";
+$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar.";
+$a->strings["Permission Denied."] = "Zugriff verweigert.";
+$a->strings["File not found."] = "Datei nicht gefunden.";
+$a->strings["Edit file permissions"] = "Dateiberechtigungen bearbeiten";
+$a->strings["Set/edit permissions"] = "Berechtigungen setzen/ändern";
+$a->strings["Include all files and sub folders"] = "Alle Dateien und Unterverzeichnisse einbinden";
+$a->strings["Return to file list"] = "Zurück zur Dateiliste";
+$a->strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen";
+$a->strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken";
+$a->strings["Share this file"] = "Diese Datei freigeben";
+$a->strings["Show URL to this file"] = "URL zu dieser Datei anzeigen";
+$a->strings["Notify your contacts about this file"] = "Meine Kontakte über diese Datei benachrichtigen";
+$a->strings["Collection created."] = "Sammlung erstellt.";
+$a->strings["Could not create collection."] = "Sammlung kann nicht erstellt werden.";
+$a->strings["Collection updated."] = "Sammlung aktualisiert.";
+$a->strings["Create a collection of channels."] = "Erstelle eine Sammlung von Kanälen.";
+$a->strings["Collection Name: "] = "Name der Sammlung:";
+$a->strings["Members are visible to other channels"] = "Mitglieder sind sichtbar für andere Kanäle";
+$a->strings["Collection removed."] = "Sammlung gelöscht.";
+$a->strings["Unable to remove collection."] = "Löschen der Sammlung nicht möglich.";
+$a->strings["Collection Editor"] = "Sammlung-Editor";
+$a->strings["Members"] = "Mitglieder";
+$a->strings["All Connected Channels"] = "Alle verbundenen Kanäle";
+$a->strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus.";
+$a->strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden.";
+$a->strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
+$a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
+$a->strings["Duplicate post suppressed."] = "Doppelter Beitrag unterdrückt.";
+$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
+$a->strings["Unable to obtain post information from database."] = "Beitragsinformationen können nicht aus der Datenbank abgerufen werden.";
+$a->strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
+$a->strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
+$a->strings["No channel."] = "Kein Kanal.";
+$a->strings["Common connections"] = "Gemeinsame Verbindungen";
+$a->strings["No connections in common."] = "Keine gemeinsamen Verbindungen.";
+$a->strings["Continue"] = "Fortfahren";
+$a->strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung";
+$a->strings["Enable premium channel connection restrictions"] = "Einschränkungen für einen Premium-Kanal aktivieren";
+$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc.";
+$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig.";
+$a->strings["Potential connections will then see the following text before proceeding:"] = "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:";
+$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite.";
+$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)";
+$a->strings["Restricted or Premium Channel"] = "Eingeschränkter oder Premium-Kanal";
+$a->strings["Profile Match"] = "Profil-Ãœbereinstimmungen";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu.";
+$a->strings["is interested in:"] = "interessiert sich für:";
+$a->strings["No matches"] = "Keine Ãœbereinstimmungen";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
 $a->strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
-$a->strings["Invalid item."] = "Ungültiges Element.";
-$a->strings["Channel not found."] = "Kanal nicht gefunden.";
-$a->strings["Page not found."] = "Seite nicht gefunden.";
+$a->strings["Some blurb about what to do when you're new here"] = "Ein Hinweis, was man tun kann, wenn man neu hier ist";
+$a->strings["Away"] = "Abwesend";
+$a->strings["Online"] = "Online";
+$a->strings["Public Sites"] = "Öffentliche Server";
+$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung bei \$Projectname. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen anderen Servern ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den verlinkten Seiten <strong>könnten</strong> nähere Details dazu stehen.";
+$a->strings["Rate this hub"] = "Bewerte diesen Hub";
+$a->strings["Site URL"] = "Server-URL";
+$a->strings["Access Type"] = "Zugangstyp";
+$a->strings["Registration Policy"] = "Registrierungsrichtlinien";
+$a->strings["Project"] = "Projekt";
+$a->strings["View hub ratings"] = "Bewertungen dieses Hubs ansehen";
+$a->strings["Rate"] = "Bewerten";
+$a->strings["View ratings"] = "Bewertungen ansehen";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s verschlagwortet";
+$a->strings["Website:"] = "Webseite:";
+$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Kanal [%s] (auf diesem Server noch unbekannt)";
+$a->strings["Rating (this information is public)"] = "Bewertung (öffentlich sichtbar)";
+$a->strings["Optionally explain your rating (this information is public)"] = "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)";
+$a->strings["Block Name"] = "Block-Name";
+$a->strings["Block Title"] = "Titel des Blocks";
 $a->strings["First Name"] = "Vorname";
 $a->strings["Last Name"] = "Nachname";
 $a->strings["Nickname"] = "Spitzname";
@@ -1047,28 +1096,10 @@ $a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\
 $a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt vielleicht an %2\$ss %3\$s teil";
 $a->strings["Action completed."] = "Aktion durchgeführt.";
 $a->strings["Thank you."] = "Vielen Dank.";
-$a->strings["Export Channel"] = "Kanal exportieren";
-$a->strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält.";
-$a->strings["Export Content"] = "Kanal und Inhalte exportieren";
-$a->strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet.";
-$a->strings["Export your posts from a given year."] = "Exportiert die Beiträge des angegebenen Jahres.";
-$a->strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne.";
-$a->strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1\$s\">%2\$s</a>.";
-$a->strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1\$s\">%2\$s</a>.";
-$a->strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1\$s\">%2\$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst.";
-$a->strings["Away"] = "Abwesend";
-$a->strings["Online"] = "Online";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s verschlagwortet";
-$a->strings["No channel."] = "Kein Kanal.";
-$a->strings["Common connections"] = "Gemeinsame Verbindungen";
-$a->strings["No connections in common."] = "Keine gemeinsamen Verbindungen.";
-$a->strings["sent you a private message"] = "hat Dir eine private Nachricht geschickt";
-$a->strings["added your channel"] = "hat deinen Kanal hinzugefügt";
-$a->strings["posted an event"] = "hat einen Termin veröffentlicht";
-$a->strings["Documentation Search"] = "Suche in der Dokumentation";
-$a->strings["Help:"] = "Hilfe:";
-$a->strings["Not Found"] = "Nicht gefunden";
-$a->strings["\$Projectname Documentation"] = "\$Projectname-Dokumentation";
+$a->strings["Invalid item."] = "Ungültiges Element.";
+$a->strings["Channel not found."] = "Kanal nicht gefunden.";
+$a->strings["Page not found."] = "Seite nicht gefunden.";
+$a->strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
 $a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden.";
 $a->strings["Remove This Channel"] = "Diesen Kanal löschen";
 $a->strings["WARNING: "] = "WARNUNG: ";
@@ -1078,38 +1109,184 @@ $a->strings["Please enter your password for verification:"] = "Bitte gib zur Bes
 $a->strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk";
 $a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk";
 $a->strings["Remove Channel"] = "Kanal löschen";
-$a->strings["- select -"] = "– auswählen –";
-$a->strings["Menu not found."] = "Menü nicht gefunden";
-$a->strings["Unable to create element."] = "Element konnte nicht erstellt werden.";
-$a->strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren.";
-$a->strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen.";
-$a->strings["Not found."] = "Nicht gefunden.";
-$a->strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements";
-$a->strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
-$a->strings["Link Name"] = "Name des Links";
-$a->strings["Link or Submenu Target"] = "Ziel des Links oder Untermenüs";
-$a->strings["Enter URL of the link or select a menu name to create a submenu"] = "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen.";
-$a->strings["Use magic-auth if available"] = "Magic-Auth verwenden, falls verfügbar";
-$a->strings["Open link in new window"] = "Öffne Link in neuem Fenster";
-$a->strings["Order in list"] = "Reihenfolge in der Liste";
-$a->strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert";
-$a->strings["Submit and finish"] = "Absenden und fertigstellen";
-$a->strings["Submit and continue"] = "Absenden und fortfahren";
-$a->strings["Menu:"] = "Menü:";
-$a->strings["Link Target"] = "Ziel des Links";
-$a->strings["Edit menu"] = "Menü bearbeiten";
-$a->strings["Edit element"] = "Bestandteil bearbeiten";
-$a->strings["Drop element"] = "Bestandteil löschen";
-$a->strings["New element"] = "Neues Bestandteil";
-$a->strings["Edit this menu container"] = "Diesen Menü-Container bearbeiten";
-$a->strings["Add menu element"] = "Menüelement hinzufügen";
-$a->strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
-$a->strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
-$a->strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden.";
-$a->strings["Menu item deleted."] = "Menü-Bestandteil gelöscht.";
-$a->strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden.";
-$a->strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil";
-$a->strings["Link text"] = "Link Text";
+$a->strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden";
+$a->strings["Add a Channel"] = "Kanal hinzufügen";
+$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Ein Kanal ist Deine eigene Sammlung von zusammengehörigen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deines Hubs zulässt.";
+$a->strings["Channel Name"] = "Name des Kanals";
+$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ ";
+$a->strings["Choose a short nickname"] = "Wähle einen kurzen Spitznamen";
+$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst.";
+$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "Oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server";
+$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Wähle einen Kanaltyp (wie Soziales Netzwerk oder Forum) und Privatsphäre-Vorgaben, so dass wir die passenden Kanal-Zugriffsrechte für Dich setzen können";
+$a->strings["Channel Type"] = "Kanaltyp";
+$a->strings["Read more about roles"] = "Mehr Informationen über Rollen";
+$a->strings["No ratings"] = "Keine Bewertungen";
+$a->strings["Public access denied."] = "Öffentlicher Zugang verweigert.";
+$a->strings["Ratings"] = "Bewertungen";
+$a->strings["Rating: "] = "Bewertung: ";
+$a->strings["Website: "] = "Webseite: ";
+$a->strings["Description: "] = "Beschreibung: ";
+$a->strings["\$Projectname Server - Setup"] = "\$Projectname Server-Einrichtung";
+$a->strings["Could not connect to database."] = "Kann nicht mit der Datenbank verbinden.";
+$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS.";
+$a->strings["Could not create table."] = "Kann Tabelle nicht erstellen.";
+$a->strings["Your site database has been installed."] = "Die Datenbank Deines Hubs wurde installiert.";
+$a->strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren.";
+$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Lies die Datei \"install/INSTALL.txt\".";
+$a->strings["System check"] = "Systemprüfung";
+$a->strings["Next"] = "Nächste";
+$a->strings["Check again"] = "Bitte nochmal prüfen";
+$a->strings["Database connection"] = "Datenbank Verbindung";
+$a->strings["In order to install \$Projectname we need to know how to connect to your database."] = "Um \$Projectname zu installieren, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst.";
+$a->strings["Database Server Name"] = "Datenbank-Servername";
+$a->strings["Default is 127.0.0.1"] = "Standard ist 127.0.0.1";
+$a->strings["Database Port"] = "Datenbank-Port";
+$a->strings["Communication port number - use 0 for default"] = "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung";
+$a->strings["Database Login Name"] = "Datenbank-Benutzername";
+$a->strings["Database Login Password"] = "Datenbank-Kennwort";
+$a->strings["Database Name"] = "Datenbank-Name";
+$a->strings["Database Type"] = "Datenbanktyp";
+$a->strings["Site administrator email address"] = "E-Mail Adresse des Seiten-Administrators";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst.";
+$a->strings["Website URL"] = "Server-URL";
+$a->strings["Please use SSL (https) URL if available."] = "Nutze wenn möglich eine SSL-URL (https).";
+$a->strings["Please select a default timezone for your website"] = "Standard-Zeitzone für Deinen Server";
+$a->strings["Site settings"] = "Seiteneinstellungen";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen.";
+$a->strings["PHP executable path"] = "PHP Pfad zu ausführbarer Datei";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren.";
+$a->strings["Command line PHP"] = "PHP Befehlszeile";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert.";
+$a->strings["This is required for message delivery to work."] = "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "Die Maximalgröße für Uploads insgesamt liegt bei %s. Die Maximalgröße für eine Datei liegt bei %s. Es können maximal %d Dateien gleichzeitig hochgeladen werden.";
+$a->strings["You can adjust these settings in the servers php.ini."] = "Du kannst diese Einstellungen in der php.ini des Servers ändern.";
+$a->strings["PHP upload limits"] = "PHP-Hochladebeschränkungen";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen.";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung.";
+$a->strings["Generate encryption keys"] = "Verschlüsselungsschlüssel  generieren";
+$a->strings["libCurl PHP module"] = "libCurl-PHP-Modul";
+$a->strings["GD graphics PHP module"] = "GD-Grafik-PHP-Modul";
+$a->strings["OpenSSL PHP module"] = "OpenSSL-PHP-Modul";
+$a->strings["mysqli or postgres PHP module"] = "mysqli oder postgres PHP-Modul";
+$a->strings["mb_string PHP module"] = "mb_string-PHP-Modul";
+$a->strings["mcrypt PHP module"] = "mcrypt-PHP-Modul";
+$a->strings["xml PHP module"] = "xml-PHP-Modul";
+$a->strings["Apache mod_rewrite module"] = "Apache-mod_rewrite-Modul";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert.";
+$a->strings["proc_open"] = "proc_open";
+$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Fehler: Das mysqli oder postgres PHP-Modul ist erforderlich, aber keines von beiden ist installiert.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: xml PHP module required for DAV but not installed."] = "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Hubzilla-Installation speichern musst.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php ist beschreibbar";
+$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "\$Projectname verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."] = "Um diese kompilierten Vorlagen speichern zu können, braucht der Webserver Schreibzugriff auf das Verzeichnis %s unterhalb des \$Projectname-Installationsverzeichnisses.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat.";
+$a->strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält.";
+$a->strings["%s is writable"] = "%s ist beschreibbar";
+$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "\$Projectname benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Webserver benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses";
+$a->strings["store is writable"] = "store ist schreibbar";
+$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server.";
+$a->strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich.";
+$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können.";
+$a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer \$Projectname-Hubs (die mit korrekten Zertifikaten ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird).";
+$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen.";
+$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind.";
+$a->strings["SSL certificate validation"] = "SSL Zertifikatverifizierung";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:";
+$a->strings["Url rewrite is working"] = "Url rewrite funktioniert";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen.";
+$a->strings["Errors encountered creating database tables."] = "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten.";
+$a->strings["<h1>What next</h1>"] = "<h1>Was als Nächstes</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten.";
+$a->strings["Bookmark added"] = "Lesezeichen hinzugefügt";
+$a->strings["My Bookmarks"] = "Meine Lesezeichen";
+$a->strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
+$a->strings["This setting requires special processing and editing has been blocked."] = "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert.";
+$a->strings["Configuration Editor"] = "Konfigurationseditor";
+$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird.";
+$a->strings["Poke/Prod"] = "Anstupsen/Knuffen";
+$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
+$a->strings["Recipient"] = "Empfänger";
+$a->strings["Choose what you wish to do to recipient"] = "Wähle, was Du mit dem/r Empfänger/in tun willst";
+$a->strings["Make this post private"] = "Diesen Beitrag privat machen";
+$a->strings["Profile not found."] = "Profil nicht gefunden.";
+$a->strings["Profile deleted."] = "Profil gelöscht.";
+$a->strings["Profile-"] = "Profil-";
+$a->strings["New profile created."] = "Neues Profil erstellt.";
+$a->strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden.";
+$a->strings["Profile unavailable to export."] = "Dieses Profil kann nicht exportiert werden.";
+$a->strings["Profile Name is required."] = "Profil-Name erforderlich.";
+$a->strings["Marital Status"] = "Familienstand";
+$a->strings["Romantic Partner"] = "Romantische Partner";
+$a->strings["Likes"] = "Gefällt";
+$a->strings["Dislikes"] = "Gefällt nicht";
+$a->strings["Work/Employment"] = "Arbeit/Anstellung";
+$a->strings["Religion"] = "Religion";
+$a->strings["Political Views"] = "Politische Ansichten";
+$a->strings["Sexual Preference"] = "Sexuelle Orientierung";
+$a->strings["Homepage"] = "Webseite";
+$a->strings["Interests"] = "Hobbys/Interessen";
+$a->strings["Address"] = "Adresse";
+$a->strings["Profile updated."] = "Profil aktualisiert.";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?";
+$a->strings["Edit Profile Details"] = "Bearbeite Profil-Details";
+$a->strings["View this profile"] = "Dieses Profil ansehen";
+$a->strings["Change Profile Photo"] = "Profilfoto ändern";
+$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen übernehmen";
+$a->strings["Clone this profile"] = "Dieses Profil klonen";
+$a->strings["Delete this profile"] = "Dieses Profil löschen";
+$a->strings["Import profile from file"] = "Profil aus einer Datei importieren";
+$a->strings["Export profile to file"] = "Profil in eine Datei exportieren";
+$a->strings["Profile Name:"] = "Profilname:";
+$a->strings["Your Full Name:"] = "Dein voller Name:";
+$a->strings["Title/Description:"] = "Titel/Beschreibung:";
+$a->strings["Your Gender:"] = "Dein Geschlecht:";
+$a->strings["Birthday :"] = "Geburtstag:";
+$a->strings["Street Address:"] = "Straße und Hausnummer:";
+$a->strings["Locality/City:"] = "Wohnort:";
+$a->strings["Postal/Zip Code:"] = "Postleitzahl:";
+$a->strings["Country:"] = "Land:";
+$a->strings["Region/State:"] = "Region/Bundesstaat:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Beziehungsstatus:";
+$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Since [date]:"] = "Seit [Datum]:";
+$a->strings["Homepage URL:"] = "Homepage URL:";
+$a->strings["Religious Views:"] = "Religiöse Ansichten:";
+$a->strings["Keywords:"] = "Schlüsselwörter:";
+$a->strings["Example: fishing photography software"] = "Beispiel: Angeln Fotografie Software";
+$a->strings["Used in directory listings"] = "Wird in Verzeichnis-Auflistungen verwendet";
+$a->strings["Tell us about yourself..."] = "Erzähle uns ein wenig von Dir …";
+$a->strings["Hobbies/Interests"] = "Hobbys/Interessen";
+$a->strings["Contact information and Social Networks"] = "Kontaktinformation und soziale Netzwerke";
+$a->strings["My other channels"] = "Meine anderen Kanäle";
+$a->strings["Musical interests"] = "Musikalische Interessen";
+$a->strings["Books, literature"] = "Bücher, Literatur";
+$a->strings["Television"] = "Fernsehen";
+$a->strings["Film/dance/culture/entertainment"] = "Film/Tanz/Kultur/Unterhaltung";
+$a->strings["Love/romance"] = "Liebe/Romantik";
+$a->strings["Work/employment"] = "Arbeit/Anstellung";
+$a->strings["School/education"] = "Schule/Ausbildung";
+$a->strings["This is your default profile."] = "Das ist Dein Standardprofil.";
+$a->strings["Age: "] = "Alter:";
+$a->strings["Edit/Manage Profiles"] = "Profile bearbeiten/verwalten";
+$a->strings["Add profile things"] = "Sachen zum Profil hinzufügen";
+$a->strings["Include desirable objects in your profile"] = "Binde begehrenswerte Dinge in Dein Profil ein";
+$a->strings["Items tagged with: %s"] = "Beiträge mit Schlagwort: %s";
+$a->strings["Search results for: %s"] = "Suchergebnisse für: %s";
 $a->strings["Could not access contact record."] = "Konnte nicht auf den Kontakteintrag zugreifen.";
 $a->strings["Could not locate selected profile."] = "Gewähltes Profil nicht gefunden.";
 $a->strings["Connection updated."] = "Verbindung aktualisiert.";
@@ -1146,15 +1323,17 @@ $a->strings["Accept connection to allow communication"] = "Akzeptiere die Verbin
 $a->strings["Set Affinity"] = "Beziehung festlegen";
 $a->strings["Set Profile"] = "Profil festlegen";
 $a->strings["Set Affinity & Profile"] = "Beziehung und Profile festlegen";
+$a->strings["none"] = "Keine";
 $a->strings["Apply these permissions automatically"] = "Diese Berechtigungen automatisch anwenden";
-$a->strings["This connection's address is"] = "Die Adresse dieses Kontakts ist";
+$a->strings["This connection's primary address is"] = "Die Hauptadresse der Verbindung ist";
+$a->strings["Available locations:"] = "Verfügbare Standorte:";
 $a->strings["The permissions indicated on this page will be applied to all new connections."] = "Die auf dieser Seite angegebenen Berechtigungen werden auf alle neuen Verbindungen angewendet.";
 $a->strings["Slide to adjust your degree of friendship"] = "Verschieben, um den Grad der Freundschaft zu einzustellen";
 $a->strings["Slide to adjust your rating"] = "Verschieben, um Deine Bewertung einzustellen";
 $a->strings["Optionally explain your rating"] = "Optional kannst Du Deine Bewertung begründen";
 $a->strings["Custom Filter"] = "Benutzerdefinierter Filter";
 $a->strings["Only import posts with this text"] = "Nur Beiträge mit diesem Text importieren";
-$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "Einzelne Wörter pro Zeile, #Tags oder /Reguläre Ausdrücke/. lang=xx (z.B. lang=de) ermöglicht Filterung nach Sprache. Leer lassen, um alle Posts zu importieren.";
+$a->strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "Einzelne Wörter pro Zeile, #Tags oder /Reguläre Ausdrücke/. lang=xx (z.B. lang=de) ermöglicht Filterung nach Sprache. Leer lassen, um alle Beiträge zu importieren.";
 $a->strings["Do not import posts with this text"] = "Beiträge mit diesem Text nicht importieren";
 $a->strings["This information is public!"] = "Diese Information ist öffentlich!";
 $a->strings["Connection Pending Approval"] = "Verbindung wartet auf Bestätigung";
@@ -1170,70 +1349,9 @@ $a->strings["Individual Permissions"] = "Individuelle Zugriffsrechte";
 $a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals vererbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung und können hier nicht verändert werden.";
 $a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Einige Berechtigungen werden möglicherweise von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt. Diese haben eine höhere Priorität als die Einstellungen an der Verbindung. Werden geerbte Einstellungen hier geändert, hat dies keine Auswirkungen.";
 $a->strings["Last update:"] = "Letzte Aktualisierung:";
-$a->strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden";
-$a->strings["Hub not found."] = "Server nicht gefunden.";
-$a->strings["This setting requires special processing and editing has been blocked."] = "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert.";
-$a->strings["Configuration Editor"] = "Konfigurationseditor";
-$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird.";
-$a->strings["Public Sites"] = "Öffentliche Server";
-$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung bei \$Projectname. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen anderen Servern ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den verlinkten Seiten <strong>könnten</strong> nähere Details dazu stehen.";
-$a->strings["Rate this hub"] = "Bewerte diesen Hub";
-$a->strings["Site URL"] = "Server-URL";
-$a->strings["Access Type"] = "Zugangstyp";
-$a->strings["Registration Policy"] = "Registrierungsrichtlinien";
-$a->strings["Location"] = "Ort";
-$a->strings["View hub ratings"] = "Bewertungen dieses Hubs ansehen";
-$a->strings["Rate"] = "Bewerten";
-$a->strings["View ratings"] = "Bewertungen ansehen";
-$a->strings["Permission Denied."] = "Zugriff verweigert.";
-$a->strings["File not found."] = "Datei nicht gefunden.";
-$a->strings["Edit file permissions"] = "Dateiberechtigungen bearbeiten";
-$a->strings["Set/edit permissions"] = "Berechtigungen setzen/ändern";
-$a->strings["Include all files and sub folders"] = "Alle Dateien und Unterverzeichnisse einbinden";
-$a->strings["Return to file list"] = "Zurück zur Dateiliste";
-$a->strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen";
-$a->strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken";
-$a->strings["Share this file"] = "Diese Datei freigeben";
-$a->strings["Show URL to this file"] = "URL zu dieser Datei anzeigen";
-$a->strings["Notify your contacts about this file"] = "Meine Kontakte über diese Datei benachrichtigen";
-$a->strings["Layout Name"] = "Layout-Name";
-$a->strings["Layout Description (Optional)"] = "Layout-Beschreibung (optional)";
-$a->strings["Comanche page description language help"] = "Hilfe zur Comanche-Seitenbeschreibungssprache";
-$a->strings["Layout Description"] = "Layout-Beschreibung";
-$a->strings["Download PDL file"] = "PDL-Datei herunterladen";
-$a->strings["Poke/Prod"] = "Anstupsen/Knuffen";
-$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
-$a->strings["Recipient"] = "Empfänger";
-$a->strings["Choose what you wish to do to recipient"] = "Wähle, was Du mit dem/r Empfänger/in tun willst";
-$a->strings["Make this post private"] = "Diesen Beitrag privat machen";
-$a->strings["No such group"] = "Sammlung nicht gefunden";
-$a->strings["No such channel"] = "Kanal nicht gefunden";
-$a->strings["forum"] = "Forum";
-$a->strings["Search Results For:"] = "Suchergebnisse für:";
-$a->strings["Collection is empty"] = "Sammlung ist leer";
-$a->strings["Collection: "] = "Sammlung:";
-$a->strings["Invalid connection."] = "Ungültige Verbindung.";
-$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können.";
-$a->strings["Room not found"] = "Chatraum nicht gefunden";
-$a->strings["Leave Room"] = "Raum verlassen";
-$a->strings["Delete This Room"] = "Diesen Raum löschen";
-$a->strings["I am away right now"] = "Ich bin gerade nicht da";
-$a->strings["I am online"] = "Ich bin online";
-$a->strings["Bookmark this room"] = "Lesezeichen für diesen Raum setzen";
-$a->strings["New Chatroom"] = "Neuer Chatraum";
-$a->strings["Chatroom Name"] = "Name des Chatraums";
-$a->strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume";
-$a->strings["Items tagged with: %s"] = "Beiträge mit Schlagwort: %s";
-$a->strings["Search results for: %s"] = "Suchergebnisse für: %s";
-$a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
-$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
-$a->strings["Item not found"] = "Element nicht gefunden";
-$a->strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
-$a->strings["Delete item?"] = "Eintrag löschen?";
-$a->strings["Insert YouTube video"] = "YouTube-Video einfügen";
-$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg]-Video einfügen";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg]-Audio einfügen";
-$a->strings["Edit post"] = "Bearbeite Beitrag";
+$a->strings["network"] = "Netzwerk";
+$a->strings["RSS"] = "RSS";
+$a->strings["\$Projectname channel"] = "\$Projectname-Kanal";
 $a->strings["Invalid message"] = "Ungültige Beitrags-ID (mid)";
 $a->strings["no results"] = "keine Ergebnisse";
 $a->strings["Delivery report for %1\$s"] = "Zustellungsbericht für %1\$s";
@@ -1244,19 +1362,216 @@ $a->strings["accepted for delivery"] = "für Zustellung akzeptiert";
 $a->strings["updated"] = "aktualisiert";
 $a->strings["update ignored"] = "Aktualisierung ignoriert";
 $a->strings["permission denied"] = "Zugriff verweigert";
-$a->strings["Delete block?"] = "Block löschen?";
-$a->strings["Edit Block"] = "Block bearbeiten";
-$a->strings["\$Projectname"] = "\$Projectname";
-$a->strings["Welcome to %s"] = "Willkommen auf %s";
-$a->strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden.";
-$a->strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
-$a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
-$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
-$a->strings["Unable to obtain post information from database."] = "Beitragsinformationen können nicht aus der Datenbank abgerufen werden.";
-$a->strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
-$a->strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
+$a->strings["recipient not found"] = "Empfänger nicht gefunden.";
+$a->strings["mail recalled"] = "Mail widerrufen";
+$a->strings["duplicate mail received"] = "Doppelte Mail erhalten";
+$a->strings["mail delivered"] = "Mail zugestellt";
+$a->strings["Item not found"] = "Element nicht gefunden";
+$a->strings["Delete webpage?"] = "Webseite löschen?";
+$a->strings["Page link title"] = "Seitentitel-Link";
+$a->strings["Insert YouTube video"] = "YouTube-Video einfügen";
+$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg]-Video einfügen";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg]-Audio einfügen";
+$a->strings["Edit Webpage"] = "Webseite bearbeiten";
 $a->strings["Unable to find your hub."] = "Konnte Deinen Server nicht finden.";
 $a->strings["Post successful."] = "Veröffentlichung erfolgreich.";
+$a->strings["sent you a private message"] = "hat Dir eine private Nachricht geschickt";
+$a->strings["added your channel"] = "hat deinen Kanal hinzugefügt";
+$a->strings["posted an event"] = "hat einen Termin veröffentlicht";
+$a->strings["Authorize application connection"] = "Zugriff für die Anwendung autorisieren";
+$a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode in der Anwendung ein:";
+$a->strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?";
+$a->strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr.";
+$a->strings["System Notifications"] = "System-Benachrichtigungen";
+$a->strings["Select a bookmark folder"] = "Lesezeichenordner wählen";
+$a->strings["Save Bookmark"] = "Lesezeichen speichern";
+$a->strings["URL of bookmark"] = "URL des Lesezeichens";
+$a->strings["Description"] = "Beschreibung";
+$a->strings["Or enter new bookmark folder name"] = "Oder gib einen neuen Namen für den Lesezeichenordner ein";
+$a->strings["Contact not found."] = "Kontakt nicht gefunden";
+$a->strings["Friend suggestion sent."] = "Freundschaftsempfehlung senden.";
+$a->strings["Suggest Friends"] = "Kontakte vorschlagen";
+$a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor";
+$a->strings["Failed to create source. No channel selected."] = "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt.";
+$a->strings["Source created."] = "Quelle erstellt.";
+$a->strings["Source updated."] = "Quelle aktualisiert.";
+$a->strings["*"] = "*";
+$a->strings["Manage remote sources of content for your channel."] = "Externe Inhaltsquellen für Deinen Kanal verwalten.";
+$a->strings["New Source"] = "Neue Quelle";
+$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals.";
+$a->strings["Only import content with these words (one per line)"] = "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten";
+$a->strings["Leave blank to import all public content"] = "Leer lassen, um alle öffentlichen Beiträge zu importieren";
+$a->strings["Source not found."] = "Quelle nicht gefunden.";
+$a->strings["Edit Source"] = "Quelle bearbeiten";
+$a->strings["Delete Source"] = "Quelle löschen";
+$a->strings["Source removed"] = "Quelle gelöscht";
+$a->strings["Unable to remove source."] = "Konnte die Quelle nicht löschen.";
+$a->strings["Invalid request identifier."] = "Ungültiger Anfrage-Identifikator.";
+$a->strings["Discard"] = "Verwerfen";
+$a->strings["Tag removed"] = "Schlagwort entfernt";
+$a->strings["Remove Item Tag"] = "Schlagwort entfernen";
+$a->strings["Select a tag to remove: "] = "Schlagwort zum Entfernen auswählen:";
+$a->strings["Remove"] = "Entferne";
+$a->strings["%d rating"] = array(
+	0 => "%d Bewertung",
+	1 => "%d Bewertungen",
+);
+$a->strings["Gender: "] = "Geschlecht:";
+$a->strings["Status: "] = "Status:";
+$a->strings["Homepage: "] = "Webseite:";
+$a->strings["Description:"] = "Beschreibung:";
+$a->strings["Public Forum:"] = "Öffentliches Forum:";
+$a->strings["Keywords: "] = "Schlüsselwörter:";
+$a->strings["Don't suggest"] = "Nicht vorschlagen";
+$a->strings["Common connections:"] = "Gemeinsame Verbindungen:";
+$a->strings["Global Directory"] = "Globales Verzeichnis";
+$a->strings["Local Directory"] = "Lokales Verzeichnis";
+$a->strings["Finding:"] = "Ergebnisse:";
+$a->strings["next page"] = "nächste Seite";
+$a->strings["previous page"] = "vorherige Seite";
+$a->strings["Sort options"] = "Sortieroptionen";
+$a->strings["Alphabetic"] = "alphabetisch";
+$a->strings["Reverse Alphabetic"] = "Entgegengesetzt alphabetisch";
+$a->strings["Newest to Oldest"] = "Neueste zuerst";
+$a->strings["Oldest to Newest"] = "Älteste zuerst";
+$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
+$a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
+$a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails.";
+$a->strings["Site Member (%s)"] = "Nutzer (%s)";
+$a->strings["Password reset requested at %s"] = "Passwort-Rücksetzung auf %s angefordert";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen.";
+$a->strings["Password Reset"] = "Zurücksetzen des Kennworts";
+$a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie angefordert neu erstellt.";
+$a->strings["Your new password is"] = "Dein neues Passwort lautet";
+$a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere Dein neues Passwort – und dann";
+$a->strings["click here to login"] = "Klicke hier, um dich anzumelden";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden.";
+$a->strings["Your password has changed at %s"] = "Auf %s wurde Dein Passwort geändert";
+$a->strings["Forgot your Password?"] = "Kennwort vergessen?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail.";
+$a->strings["Email Address"] = "E-Mail Adresse";
+$a->strings["Reset"] = "Zurücksetzen";
+$a->strings["This site is not a directory server"] = "Diese Webseite ist kein Verzeichnisserver";
+$a->strings["%s element installed"] = "Element für %s installiert";
+$a->strings["%s element installation failed"] = "Installation des Elements %s fehlgeschlagen";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$ss %3\$s";
+$a->strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s folgt %2\$ss %3\$s nicht mehr";
+$a->strings["Your service plan only allows %d channels."] = "Dein Vertrag erlaubt nur %d Kanäle.";
+$a->strings["Nothing to import."] = "Nichts zu importieren.";
+$a->strings["Unable to download data from old server"] = "Daten können vom alten Server nicht heruntergeladen werden";
+$a->strings["Imported file is empty."] = "Die importierte Datei ist leer.";
+$a->strings["Warning: Database versions differ by %1\$d updates."] = "Achtung: Datenbankversionen unterscheiden sich um %1\$d Aktualisierungen.";
+$a->strings["No channel. Import failed."] = "Kein Kanal. Import fehlgeschlagen.";
+$a->strings["You must be logged in to use this feature."] = "Du musst angemeldet sein um diese Funktion zu nutzen.";
+$a->strings["Import Channel"] = "Kanal importieren";
+$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren.";
+$a->strings["File to Upload"] = "Hochzuladende Datei:";
+$a->strings["Or provide the old server/hub details"] = "Oder gib die Details Deines bisherigen \$Projectname-Hubs ein";
+$a->strings["Your old identity address (xyz@example.com)"] = "Bisherige Kanal-Adresse (xyz@example.com)";
+$a->strings["Your old login email address"] = "Deine alte Login-E-Mail-Adresse";
+$a->strings["Your old login password"] = "Dein altes Passwort";
+$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige \$Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein.";
+$a->strings["Make this hub my primary location"] = "Dieser $Pojectname-Hub ist mein primärer Hub.";
+$a->strings["Import existing posts if possible (experimental - limited by available memory"] = "Importiere bestehende Beiträge falls möglich (experimentell - begrenzt durch zur Verfügung stehenden Speicher";
+$a->strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen.";
+$a->strings["Total invitation limit exceeded."] = "Einladungslimit überschritten.";
+$a->strings["%s : Not a valid email address."] = "%s : Keine gültige Email Adresse.";
+$a->strings["Please join us on \$Projectname"] = "Schließe Dich uns auf \$Projectname an!";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines \$Projectname-Servers.";
+$a->strings["%s : Message delivery failed."] = "%s : Nachricht konnte nicht zugestellt werden.";
+$a->strings["%d message sent."] = array(
+	0 => "%d Nachricht gesendet.",
+	1 => "%d Nachrichten gesendet.",
+);
+$a->strings["You have no more invitations available"] = "Du hast keine weiteren verfügbare Einladungen";
+$a->strings["Send invitations"] = "Einladungen senden";
+$a->strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
+$a->strings["Your message:"] = "Deine Nachricht:";
+$a->strings["Please join my community on \$Projectname."] = "Schließe Dich uns auf \$Projectname an!";
+$a->strings["You will need to supply this invitation code: "] = "Gib folgenden Einladungs-Code ein:";
+$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registriere Dich auf einem beliebigen \$Projectname-Hub (sie sind alle miteinander verbunden)";
+$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Gib meine \$Projectname-Adresse im Suchfeld ein.";
+$a->strings["or visit "] = "oder besuche";
+$a->strings["3. Click [Connect]"] = "3. Klicke auf [Verbinden]";
+$a->strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen Fehler zurück: %1\$s";
+$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zurechtschneiden schlug fehl.";
+$a->strings["Image resize failed."] = "Bild-Anpassung fehlgeschlagen.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird.";
+$a->strings["Image upload failed."] = "Hochladen des Bilds fehlgeschlagen.";
+$a->strings["Unable to process image."] = "Kann Bild nicht verarbeiten.";
+$a->strings["female"] = "weiblich";
+$a->strings["%1\$s updated her %2\$s"] = "%1\$s hat ihr %2\$s aktualisiert";
+$a->strings["male"] = "männlich";
+$a->strings["%1\$s updated his %2\$s"] = "%1\$s hat sein %2\$s aktualisiert";
+$a->strings["%1\$s updated their %2\$s"] = "%1\$s hat sein/ihr %2\$s aktualisiert";
+$a->strings["profile photo"] = "Profilfoto";
+$a->strings["Photo not available."] = "Foto nicht verfügbar.";
+$a->strings["Upload File:"] = "Datei hochladen:";
+$a->strings["Select a profile:"] = "Wähle ein Profil:";
+$a->strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch";
+$a->strings["or"] = "oder";
+$a->strings["skip this step"] = "diesen Schritt überspringen";
+$a->strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben";
+$a->strings["Crop Image"] = "Bild zuschneiden";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu.";
+$a->strings["Done Editing"] = "Bearbeitung fertigstellen";
+$a->strings["Thing updated"] = "Sache aktualisiert";
+$a->strings["Object store: failed"] = "Speichern des Objekts fehlgeschlagen";
+$a->strings["Thing added"] = "Sache hinzugefügt";
+$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+$a->strings["Show Thing"] = "Sache anzeigen";
+$a->strings["item not found."] = "Eintrag nicht gefunden";
+$a->strings["Edit Thing"] = "Sache bearbeiten";
+$a->strings["Select a profile"] = "Wähle ein Profil";
+$a->strings["Post an activity"] = "Aktivitätsnachricht senden";
+$a->strings["Only sends to viewers of the applicable profile"] = "Nur an Betrachter des ausgewählten Profils senden";
+$a->strings["Name of thing e.g. something"] = "Name der Sache, z. B. irgendwas";
+$a->strings["URL of thing (optional)"] = "URL der Sache (optional)";
+$a->strings["URL for photo of thing (optional)"] = "URL eines Fotos der Sache (optional)";
+$a->strings["Add Thing to your Profile"] = "Die Sache Deinem Profil hinzufügen";
+$a->strings["This directory server requires an access token"] = "Dieser Verzeichnisserver benötigt einen Zugangstoken";
+$a->strings["Delete block?"] = "Block löschen?";
+$a->strings["Edit Block"] = "Block bearbeiten";
+$a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt.";
+$a->strings["Remove This Account"] = "Dieses Konto löschen";
+$a->strings["This account and all its channels will be completely removed from the network. "] = "Dieses Konto mit all seinen Kanälen wird vollständig aus dem Netzwerk gelöscht.";
+$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen";
+$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standardmäßig werden nur die Kanalklone auf diesem \$Projectname-Hub aus dem Netzwerk entfernt";
+$a->strings["Remove Account"] = "Konto entfernen";
+$a->strings["Import completed"] = "Import abgeschlossen";
+$a->strings["Import Items"] = "Beiträge importieren";
+$a->strings["Use this form to import existing posts and content from an export file."] = "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren.";
+$a->strings["No such group"] = "Sammlung nicht gefunden";
+$a->strings["No such channel"] = "Kanal nicht gefunden";
+$a->strings["forum"] = "Forum";
+$a->strings["Search Results For:"] = "Suchergebnisse für:";
+$a->strings["Collection is empty"] = "Sammlung ist leer";
+$a->strings["Collection: "] = "Sammlung:";
+$a->strings["Invalid connection."] = "Ungültige Verbindung.";
+$a->strings["Layout updated."] = "Layout aktualisiert.";
+$a->strings["Edit System Page Description"] = "Systemseitenbeschreibung bearbeiten";
+$a->strings["Layout not found."] = "Layout nicht gefunden.";
+$a->strings["Module Name:"] = "Modulname:";
+$a->strings["Layout Help"] = "Layout-Hilfe";
+$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
+$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen.";
+$a->strings["Passwords do not match."] = "Passwörter stimmen nicht überein.";
+$a->strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
+$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
+$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
+$a->strings["Registration on this site/hub is by approval only."] = "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator";
+$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registrierung auf einem anderen, angeschlossenen Server</a>";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal.";
+$a->strings["Terms of Service"] = "Nutzungsbedingungen";
+$a->strings["I accept the %s for this website"] = "Ich akzeptiere die %s für diese Webseite";
+$a->strings["I am over 13 years of age and accept the %s for this website"] = "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite";
+$a->strings["Registration"] = "Registrierung";
+$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
+$a->strings["Please enter your invitation code"] = "Bitte trage Deinen Einladungs-Code ein";
+$a->strings["Your email address"] = "Ihre E-Mail Adresse";
+$a->strings["Choose a password"] = "Passwort";
+$a->strings["Please re-enter your password"] = "Bitte gib Dein Passwort noch einmal ein";
 $a->strings["Theme settings updated."] = "Theme-Einstellungen aktualisiert.";
 $a->strings["# Accounts"] = "Anzahl der Konten";
 $a->strings["# blocked accounts"] = "Anzahl der blockierten Konten";
@@ -1282,7 +1597,6 @@ $a->strings["My site is not a public server"] = "Mein Server ist kein öffentlic
 $a->strings["My site has paid access only"] = "Mein Server erlaubt nur bezahlten Zugang";
 $a->strings["My site has free access only"] = "Mein Server erlaubt ausschließlich freien Zugang";
 $a->strings["My site offers free accounts with optional paid upgrades"] = "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades";
-$a->strings["Registration"] = "Registrierung";
 $a->strings["File upload"] = "Dateiupload";
 $a->strings["Policies"] = "Richtlinien";
 $a->strings["Site name"] = "Seitenname";
@@ -1320,10 +1634,12 @@ $a->strings["Verify Email Addresses"] = "E-Mail-Adressen überprüfen";
 $a->strings["Check to verify email addresses used in account registration (recommended)."] = "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen).";
 $a->strings["Force publish"] = "Veröffentlichung erzwingen";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen.";
-$a->strings["Disable discovery tab"] = "Den „Entdecken“-Reiter ausblenden";
-$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte angezeigt werden, die von anderen RedMatrix-Hubs geholt wurden.";
+$a->strings["Import Public Streams"] = "Öffentliche Beiträge importieren";
+$a->strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Öffentliche Beiträge von anderen Servern importieren und zur Verfügung stellen. Warnung: Diese Inhalte sind nicht moderiert.";
 $a->strings["login on Homepage"] = "Anmeldemaske auf der Homepage";
 $a->strings["Present a login box to visitors on the home page if no other content has been configured."] = "Zeigt Besuchern der Homepage eine Anmeldemaske, falls keine anderen Inhalte konfiguriert wurden.";
+$a->strings["Directory Server URL"] = "Verzeichnisserver-URL";
+$a->strings["Default directory server"] = "Standard-Verzeichnisserver";
 $a->strings["Proxy user"] = "Proxy Benutzer";
 $a->strings["Proxy URL"] = "Proxy URL";
 $a->strings["Network timeout"] = "Netzwerk-Timeout";
@@ -1407,7 +1723,6 @@ $a->strings["Uncensor"] = "Freigeben";
 $a->strings["Allow Code"] = "Code erlauben";
 $a->strings["Disallow Code"] = "Code sperren";
 $a->strings["UID"] = "UID";
-$a->strings["Address"] = "Adresse";
 $a->strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?";
 $a->strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?";
 $a->strings["Plugin %s disabled."] = "Plug-In %s deaktiviert.";
@@ -1425,7 +1740,7 @@ $a->strings["Log settings updated."] = "Protokoll-Einstellungen aktualisiert.";
 $a->strings["Clear"] = "Leeren";
 $a->strings["Debugging"] = "Debugging";
 $a->strings["Log file"] = "Protokolldatei";
-$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis.";
+$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Muss für den Webserver schreibbar sein. Relativ zum \$Projectname-Stammverzeichnis.";
 $a->strings["Log level"] = "Protokollstufe";
 $a->strings["New Profile Field"] = "Neues Profilfeld";
 $a->strings["Field nickname"] = "Kurzname für das Feld";
@@ -1437,322 +1752,10 @@ $a->strings["Help text"] = "Hilfetext";
 $a->strings["Additional info (optional)"] = "Zusätzliche Informationen (optional)";
 $a->strings["Field definition not found"] = "Feld-Definition nicht gefunden";
 $a->strings["Edit Profile Field"] = "Profilfeld bearbeiten";
-$a->strings["App installed."] = "App installiert.";
-$a->strings["Malformed app."] = "Fehlerhafte App.";
-$a->strings["Embed code"] = "Code einbetten";
-$a->strings["Edit App"] = "App bearbeiten";
-$a->strings["Create App"] = "App erstellen";
-$a->strings["Name of app"] = "Name der App";
-$a->strings["Location (URL) of app"] = "Ort (URL) der App";
-$a->strings["Description"] = "Beschreibung";
-$a->strings["Photo icon URL"] = "URL zum Icon";
-$a->strings["80 x 80 pixels - optional"] = "80 x 80 Pixel – optional";
-$a->strings["Version ID"] = "Versions-ID";
-$a->strings["Price of app"] = "Preis der App";
-$a->strings["Location (URL) to purchase app"] = "Ort (URL), um die App zu kaufen";
-$a->strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
-$a->strings["Unable to create menu."] = "Kann Menü nicht erstellen.";
-$a->strings["Menu Name"] = "Name des Menüs";
-$a->strings["Unique name (not visible on webpage) - required"] = "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich";
-$a->strings["Menu Title"] = "Menütitel";
-$a->strings["Visible on webpage - leave empty for no title"] = "Sichtbar auf der Webseite – für keinen Titel leer lassen";
-$a->strings["Allow Bookmarks"] = "Lesezeichen erlauben";
-$a->strings["Menu may be used to store saved bookmarks"] = "Im Menü können gespeicherte Lesezeichen abgelegt werden";
-$a->strings["Submit and proceed"] = "Absenden und fortfahren";
-$a->strings["Drop"] = "Löschen";
-$a->strings["Bookmarks allowed"] = "Lesezeichen erlaubt";
-$a->strings["Delete this menu"] = "Lösche dieses Menü";
-$a->strings["Edit menu contents"] = "Bearbeite Menü Inhalte";
-$a->strings["Edit this menu"] = "Dieses Menü bearbeiten";
-$a->strings["Menu could not be deleted."] = "Menü konnte nicht gelöscht werden.";
-$a->strings["Edit Menu"] = "Menü bearbeiten";
-$a->strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü hinzufügen oder entfernen";
-$a->strings["Menu name"] = "Menü Name";
-$a->strings["Must be unique, only seen by you"] = "Muss eindeutig sein, ist aber nur für Dich sichtbar";
-$a->strings["Menu title"] = "Menü Titel";
-$a->strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird";
-$a->strings["Allow bookmarks"] = "Erlaube Lesezeichen";
-$a->strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr.";
-$a->strings["System Notifications"] = "System-Benachrichtigungen";
-$a->strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-$a->strings["Add a Channel"] = "Kanal hinzufügen";
-$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Ein Kanal ist Deine eigene Sammlung von zusammengehörigen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deines Hubs zulässt.";
-$a->strings["Channel Name"] = "Name des Kanals";
-$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ ";
-$a->strings["Choose a short nickname"] = "Wähle einen kurzen Spitznamen";
-$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst.";
-$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "Oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server";
-$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Wähle einen Kanaltyp (wie Soziales Netzwerk oder Forum) und Privatsphäre-Vorgaben, so dass wir die passenden Kanal-Zugriffsrechte für Dich setzen können";
-$a->strings["Channel Type"] = "Kanaltyp";
-$a->strings["Read more about roles"] = "Mehr Informationen über Rollen";
-$a->strings["Invalid request identifier."] = "Ungültiger Anfrage-Identifikator.";
-$a->strings["Discard"] = "Verwerfen";
-$a->strings["Layout updated."] = "Layout aktualisiert.";
-$a->strings["Edit System Page Description"] = "Systemseitenbeschreibung bearbeiten";
-$a->strings["Layout not found."] = "Layout nicht gefunden.";
-$a->strings["Module Name:"] = "Modulname:";
-$a->strings["Layout Help"] = "Layout-Hilfe";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$ss %3\$s";
-$a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
-$a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails.";
-$a->strings["Site Member (%s)"] = "Nutzer (%s)";
-$a->strings["Password reset requested at %s"] = "Passwort-Rücksetzung auf %s angefordert";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen.";
-$a->strings["Password Reset"] = "Zurücksetzen des Kennworts";
-$a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie angefordert neu erstellt.";
-$a->strings["Your new password is"] = "Dein neues Passwort lautet";
-$a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere Dein neues Passwort – und dann";
-$a->strings["click here to login"] = "Klicke hier, um dich anzumelden";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden.";
-$a->strings["Your password has changed at %s"] = "Auf %s wurde Dein Passwort geändert";
-$a->strings["Forgot your Password?"] = "Kennwort vergessen?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail.";
-$a->strings["Email Address"] = "E-Mail Adresse";
-$a->strings["Reset"] = "Zurücksetzen";
-$a->strings["Page owner information could not be retrieved."] = "Informationen über den Besitzer der Seite konnten nicht gefunden werden.";
-$a->strings["Album not found."] = "Album nicht gefunden.";
-$a->strings["Delete Album"] = "Album löschen";
-$a->strings["Delete Photo"] = "Foto löschen";
-$a->strings["No photos selected"] = "Keine Fotos ausgewählt";
-$a->strings["Access to this item is restricted."] = "Der Zugriff auf dieses Foto ist eingeschränkt.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB von %2$.2f MB Foto-Speicher belegt.";
-$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB Foto-Speicher belegt.";
-$a->strings["Upload Photos"] = "Fotos hochladen";
-$a->strings["Enter an album name"] = "Namen für ein neues Album eingeben";
-$a->strings["or select an existing album (doubleclick)"] = "oder ein bereits vorhandenes auswählen (Doppelklick)";
-$a->strings["Create a status post for this upload"] = "Einen Statusbeitrag für diesen Upload erzeugen";
-$a->strings["Album name could not be decoded"] = "Albumname konnte nicht dekodiert werden";
-$a->strings["Contact Photos"] = "Kontakt-Bilder";
-$a->strings["Show Newest First"] = "Neueste zuerst anzeigen";
-$a->strings["Show Oldest First"] = "Älteste zuerst anzeigen";
-$a->strings["View Photo"] = "Foto ansehen";
-$a->strings["Edit Album"] = "Album bearbeiten";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden.";
-$a->strings["Photo not available"] = "Foto nicht verfügbar";
-$a->strings["Use as profile photo"] = "Als Profilfoto verwenden";
-$a->strings["Private Photo"] = "Privates Foto";
-$a->strings["Previous"] = "Voriges";
-$a->strings["View Full Size"] = "In voller Größe anzeigen";
-$a->strings["Next"] = "Nächste";
-$a->strings["Remove"] = "Entferne";
-$a->strings["Edit photo"] = "Foto bearbeiten";
-$a->strings["Rotate CW (right)"] = "Drehen im UZS (rechts)";
-$a->strings["Rotate CCW (left)"] = "Drehen gegen UZS (links)";
-$a->strings["Enter a new album name"] = "Gib einen Namen für ein neues Album ein";
-$a->strings["or select an existing one (doubleclick)"] = "oder wähle ein bereits vorhandenes aus (Doppelklick)";
-$a->strings["Caption"] = "Bildunterschrift";
-$a->strings["Add a Tag"] = "Schlagwort hinzufügen";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Beispiele: @ben, @Karl_Prester, @lieschen@example.com";
-$a->strings["Flag as adult in album view"] = "In der Albumansicht als nicht jugendfrei markieren";
-$a->strings["In This Photo:"] = "Auf diesem Foto:";
-$a->strings["Map"] = "Karte";
-$a->strings["View Album"] = "Album ansehen";
-$a->strings["Recent Photos"] = "Neueste Fotos";
-$a->strings["\$Projectname channel"] = "\$Projectname-Kanal";
-$a->strings["Website:"] = "Webseite:";
-$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Kanal [%s] (auf diesem Server noch unbekannt)";
-$a->strings["Rating (this information is public)"] = "Bewertung (öffentlich sichtbar)";
-$a->strings["Optionally explain your rating (this information is public)"] = "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)";
-$a->strings["Calendar entries imported."] = "Kalendereinträge wurden importiert.";
-$a->strings["No calendar entries found."] = "Keine Kalendereinträge gefunden.";
-$a->strings["Event can not end before it has started."] = "Termin-Ende liegt vor dem Beginn.";
-$a->strings["Unable to generate preview."] = "Vorschau konnte nicht erzeugt werden.";
-$a->strings["Event title and start time are required."] = "Titel und Startzeit des Termins sind erforderlich.";
-$a->strings["Event not found."] = "Termin nicht gefunden.";
-$a->strings["l, F j"] = "l, j. F";
-$a->strings["Edit event"] = "Termin bearbeiten";
-$a->strings["Delete event"] = "Termin löschen";
-$a->strings["calendar"] = "Kalender";
-$a->strings["Create New Event"] = "Neuen Termin erstellen";
-$a->strings["Export"] = "Exportieren";
-$a->strings["Import"] = "Import";
-$a->strings["Event removed"] = "Termin gelöscht";
-$a->strings["Failed to remove event"] = "Termin konnte nicht gelöscht werden";
-$a->strings["Event details"] = "Termin-Details";
-$a->strings["Starting date and Title are required."] = "Startdatum und Titel sind erforderlich.";
-$a->strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
-$a->strings["Event Starts:"] = "Termin beginnt:";
-$a->strings["Finish date/time is not known or not relevant"] = "Ende Datum/Zeit sind unbekannt oder unwichtig";
-$a->strings["Event Finishes:"] = "Termin endet:";
-$a->strings["Adjust for viewer timezone"] = "An die Zeitzone des Betrachters anpassen";
-$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien.";
-$a->strings["Title:"] = "Titel:";
-$a->strings["Share this event"] = "Den Termin teilen";
-$a->strings["%s element installed"] = "Element für %s installiert";
-$a->strings["%s element installation failed"] = "Installation des Elements %s fehlgeschlagen";
-$a->strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen Fehler zurück: %1\$s";
-$a->strings["Profile Match"] = "Profil-Ãœbereinstimmungen";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu.";
-$a->strings["is interested in:"] = "interessiert sich für:";
-$a->strings["No matches"] = "Keine Ãœbereinstimmungen";
-$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zurechtschneiden schlug fehl.";
-$a->strings["Image resize failed."] = "Bild-Anpassung fehlgeschlagen.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird.";
-$a->strings["Image upload failed."] = "Hochladen des Bilds fehlgeschlagen.";
-$a->strings["Unable to process image."] = "Kann Bild nicht verarbeiten.";
-$a->strings["female"] = "weiblich";
-$a->strings["%1\$s updated her %2\$s"] = "%1\$s hat ihr %2\$s aktualisiert";
-$a->strings["male"] = "männlich";
-$a->strings["%1\$s updated his %2\$s"] = "%1\$s hat sein %2\$s aktualisiert";
-$a->strings["%1\$s updated their %2\$s"] = "%1\$s hat sein/ihr %2\$s aktualisiert";
-$a->strings["profile photo"] = "Profilfoto";
-$a->strings["Photo not available."] = "Foto nicht verfügbar.";
-$a->strings["Upload File:"] = "Datei hochladen:";
-$a->strings["Select a profile:"] = "Wähle ein Profil:";
-$a->strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch";
-$a->strings["or"] = "oder";
-$a->strings["skip this step"] = "diesen Schritt überspringen";
-$a->strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben";
-$a->strings["Crop Image"] = "Bild zuschneiden";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu.";
-$a->strings["Done Editing"] = "Bearbeitung fertigstellen";
-$a->strings["Channel added."] = "Kanal hinzugefügt.";
-$a->strings["Tag removed"] = "Schlagwort entfernt";
-$a->strings["Remove Item Tag"] = "Schlagwort entfernen";
-$a->strings["Select a tag to remove: "] = "Schlagwort zum Entfernen auswählen:";
-$a->strings["No ratings"] = "Keine Bewertungen";
-$a->strings["Ratings"] = "Bewertungen";
-$a->strings["Rating: "] = "Bewertung: ";
-$a->strings["Website: "] = "Webseite: ";
-$a->strings["Description: "] = "Beschreibung: ";
-$a->strings["This site is not a directory server"] = "Diese Website ist kein Verzeichnis-Server";
-$a->strings["Unable to lookup recipient."] = "Konnte den Empfänger nicht finden.";
-$a->strings["Unable to communicate with requested channel."] = "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen.";
-$a->strings["Cannot verify requested channel."] = "Verifizierung des angeforderten Kanals fehlgeschlagen.";
-$a->strings["Selected channel has private message restrictions. Send failed."] = "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen.";
-$a->strings["Messages"] = "Nachrichten";
-$a->strings["Message deleted."] = "Nachricht gelöscht.";
-$a->strings["Message recalled."] = "Nachricht widerrufen.";
-$a->strings["Send Private Message"] = "Private Nachricht senden";
-$a->strings["To:"] = "An:";
-$a->strings["Subject:"] = "Betreff:";
-$a->strings["Your message:"] = "Deine Nachricht:";
-$a->strings["Send"] = "Absenden";
-$a->strings["Delete message"] = "Nachricht löschen";
-$a->strings["Recall message"] = "Nachricht widerrufen";
-$a->strings["Message has been recalled."] = "Die Nachricht wurde widerrufen.";
-$a->strings["Delete Conversation"] = "Unterhaltung löschen";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten.";
-$a->strings["Send Reply"] = "Antwort senden";
-$a->strings["Page Title"] = "Seitentitel";
-$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
-$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen.";
-$a->strings["Passwords do not match."] = "Passwörter stimmen nicht überein.";
-$a->strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
-$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
-$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
-$a->strings["Registration on this site/hub is by approval only."] = "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator";
-$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registrierung auf einem anderen, angeschlossenen Server</a>";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal.";
-$a->strings["Terms of Service"] = "Nutzungsbedingungen";
-$a->strings["I accept the %s for this website"] = "Ich akzeptiere die %s für diese Webseite";
-$a->strings["I am over 13 years of age and accept the %s for this website"] = "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite";
-$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
-$a->strings["Please enter your invitation code"] = "Bitte trage Deinen Einladungs-Code ein";
-$a->strings["Your email address"] = "Ihre E-Mail Adresse";
-$a->strings["Choose a password"] = "Passwort";
-$a->strings["Please re-enter your password"] = "Bitte gib Dein Passwort noch einmal ein";
-$a->strings["Block Name"] = "Block-Name";
-$a->strings["Block Title"] = "Titel des Blocks";
-$a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt.";
-$a->strings["Remove This Account"] = "Dieses Konto löschen";
-$a->strings["This account and all its channels will be completely removed from the network. "] = "Dieses Konto mit all seinen Kanälen wird vollständig aus dem Netzwerk gelöscht.";
-$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen";
-$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standardmäßig werden nur die Kanalklone auf diesem RedMatrix-Hub aus dem Netzwerk entfernt";
-$a->strings["Remove Account"] = "Konto entfernen";
-$a->strings["No service class restrictions found."] = "Keine Dienstklassenbeschränkungen gefunden.";
-$a->strings["Item not available."] = "Element nicht verfügbar.";
-$a->strings["Failed to create source. No channel selected."] = "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt.";
-$a->strings["Source created."] = "Quelle erstellt.";
-$a->strings["Source updated."] = "Quelle aktualisiert.";
-$a->strings["*"] = "*";
-$a->strings["Manage remote sources of content for your channel."] = "Externe Inhaltsquellen für Deinen Kanal verwalten.";
-$a->strings["New Source"] = "Neue Quelle";
-$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals.";
-$a->strings["Only import content with these words (one per line)"] = "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten";
-$a->strings["Leave blank to import all public content"] = "Leer lassen, um alle öffentlichen Beiträge zu importieren";
-$a->strings["Source not found."] = "Quelle nicht gefunden.";
-$a->strings["Edit Source"] = "Quelle bearbeiten";
-$a->strings["Delete Source"] = "Quelle löschen";
-$a->strings["Source removed"] = "Quelle gelöscht";
-$a->strings["Unable to remove source."] = "Konnte die Quelle nicht löschen.";
-$a->strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar.";
-$a->strings["Visible to:"] = "Sichtbar für:";
-$a->strings["network"] = "Netzwerk";
-$a->strings["RSS"] = "RSS";
-$a->strings["Please login."] = "Bitte melde dich an.";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal.";
-$a->strings["The error message was:"] = "Die Fehlermeldung war:";
-$a->strings["Authentication failed."] = "Authentifizierung fehlgeschlagen.";
-$a->strings["Remote Authentication"] = "Entfernte Authentifizierung";
-$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z. B. channel@example.com)";
-$a->strings["Authenticate"] = "Authentifizieren";
-$a->strings["This directory server requires an access token"] = "Dieser Verzeichnis-Server benötigt ein Zugangstoken";
-$a->strings["Version %s"] = "Version %s";
-$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
-$a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
-$a->strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Dieser Hub ist Teil von \$Projectname – ein globales, kooperatives Netzwerk aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen.";
-$a->strings["Tag: "] = "Schlagwort: ";
-$a->strings["Last background fetch: "] = "Letzter Hintergrundabruf:";
-$a->strings["Current load average: "] = "Aktuelles Load Average:";
-$a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
-$a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about \$Projectname."] = "Bitte besuche <a href=\"https://redmatrix.me\">redmatrix.me</a>, um mehr über \$Projectname zu erfahren.";
-$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
-$a->strings["\$projectname issues"] = "\$projectname-Bugtracker";
-$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com";
-$a->strings["Site Administrators"] = "Administratoren";
-$a->strings["Your service plan only allows %d channels."] = "Dein Vertrag erlaubt nur %d Kanäle.";
-$a->strings["Nothing to import."] = "Nichts zu importieren.";
-$a->strings["Unable to download data from old server"] = "Daten können vom alten Server nicht heruntergeladen werden";
-$a->strings["Imported file is empty."] = "Die importierte Datei ist leer.";
-$a->strings["Warning: Database versions differ by %1\$d updates."] = "Achtung: Datenbankversionen unterscheiden sich um %1\$d Aktualisierungen.";
-$a->strings["No channel. Import failed."] = "Kein Kanal. Import fehlgeschlagen.";
-$a->strings["You must be logged in to use this feature."] = "Du musst angemeldet sein um diese Funktion zu nutzen.";
-$a->strings["Import Channel"] = "Kanal importieren";
-$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren.";
-$a->strings["File to Upload"] = "Hochzuladende Datei:";
-$a->strings["Or provide the old server/hub details"] = "Oder gib die Details Deines bisherigen Red-Servers ein";
-$a->strings["Your old identity address (xyz@example.com)"] = "Bisherige Kanal-Adresse (xyz@example.com)";
-$a->strings["Your old login email address"] = "Deine alte Login-E-Mail-Adresse";
-$a->strings["Your old login password"] = "Dein altes Passwort";
-$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige Red-Server diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein.";
-$a->strings["Make this hub my primary location"] = "Dieser Red-Server ist mein primärer Server.";
-$a->strings["Import existing posts if possible (experimental - limited by available memory"] = "Importiere bestehende Beiträge falls möglich (experimentell - begrenzt durch zur Verfügung stehenden Speicher";
-$a->strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen.";
-$a->strings["Thing updated"] = "Sache aktualisiert";
-$a->strings["Object store: failed"] = "Speichern des Objekts fehlgeschlagen";
-$a->strings["Thing added"] = "Sache hinzugefügt";
-$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-$a->strings["Show Thing"] = "Sache anzeigen";
-$a->strings["item not found."] = "Eintrag nicht gefunden";
-$a->strings["Edit Thing"] = "Sache bearbeiten";
-$a->strings["Select a profile"] = "Wähle ein Profil";
-$a->strings["Post an activity"] = "Aktivitätsnachricht senden";
-$a->strings["Only sends to viewers of the applicable profile"] = "Nur an Betrachter des ausgewählten Profils senden";
-$a->strings["Name of thing e.g. something"] = "Name der Sache, z. B. irgendwas";
-$a->strings["URL of thing (optional)"] = "URL der Sache (optional)";
-$a->strings["URL for photo of thing (optional)"] = "URL eines Fotos der Sache (optional)";
-$a->strings["Add Thing to your Profile"] = "Die Sache Deinem Profil hinzufügen";
-$a->strings["Total invitation limit exceeded."] = "Einladungslimit überschritten.";
-$a->strings["%s : Not a valid email address."] = "%s : Keine gültige Email Adresse.";
-$a->strings["Please join us on \$Projectname"] = "Schließe Dich uns auf \$Projectname an!";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines Red-Servers.";
-$a->strings["%s : Message delivery failed."] = "%s : Nachricht konnte nicht zugestellt werden.";
-$a->strings["%d message sent."] = array(
-	0 => "%d Nachricht gesendet.",
-	1 => "%d Nachrichten gesendet.",
-);
-$a->strings["You have no more invitations available"] = "Du hast keine weiteren verfügbare Einladungen";
-$a->strings["Send invitations"] = "Einladungen senden";
-$a->strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
-$a->strings["Please join my community on \$Projectname."] = "Schließe Dich uns auf \$Projectname an!";
-$a->strings["You will need to supply this invitation code: "] = "Gib folgenden Einladungs-Code ein:";
-$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registriere Dich auf einem beliebigen \$Projectname-Hub (sie sind alle miteinander verbunden)";
-$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Gib meine \$Projectname-Adresse im Suchfeld ein.";
-$a->strings["or visit "] = "oder besuche";
-$a->strings["3. Click [Connect]"] = "3. Klicke auf [Verbinden]";
-$a->strings["[Embedded content - reload page to view]"] = "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]";
-$a->strings["Source of Item"] = "Quelle des Elements";
+$a->strings["Delete layout?"] = "Layout löschen?";
+$a->strings["Layout Description (Optional)"] = "Layout-Beschreibung (optional)";
+$a->strings["Layout Name"] = "Layout-Name";
+$a->strings["Edit Layout"] = "Layout bearbeiten";
 $a->strings["Name is required"] = "Name ist erforderlich";
 $a->strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
 $a->strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
@@ -1816,7 +1819,7 @@ $a->strings["Only those you specifically allow"] = "Nur die, denen Du es explizi
 $a->strings["Approved connections"] = "Angenommene Verbindungen";
 $a->strings["Any connections"] = "Beliebige Verbindungen";
 $a->strings["Anybody on this website"] = "Jeder auf dieser Website";
-$a->strings["Anybody in this network"] = "Alle Red-Nutzer";
+$a->strings["Anybody in this network"] = "Alle \$Projectname-Mitglieder";
 $a->strings["Anybody authenticated"] = "Jeder authentifizierte";
 $a->strings["Anybody on the internet"] = "Jeder im Internet";
 $a->strings["Publish your default profile in the network directory"] = "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen";
@@ -1847,6 +1850,7 @@ $a->strings["0 or blank prevents expiration"] = "0 oder kein Inhalt verhindern d
 $a->strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:";
 $a->strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern";
 $a->strings["Default Post Permissions"] = "Standardeinstellungen für Beitrags-Zugriffsrechte";
+$a->strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
 $a->strings["Channel permissions category:"] = "Zugriffsrechte-Kategorie des Kanals:";
 $a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:";
 $a->strings["Useful to reduce spamming"] = "Nützlich, um Spam zu verringern";
@@ -1886,24 +1890,123 @@ $a->strings["Change the behaviour of this account for special situations"] = "Ä
 $a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = "Aktiviere den Expertenmodus (unter <a href=\"settings/features\">Settings > Zusätzliche Funktionen</a>), um hier Einstellungen vorzunehmen!";
 $a->strings["Miscellaneous Settings"] = "Sonstige Einstellungen";
 $a->strings["Default photo upload folder"] = "Voreingestellter Ordner für hochgeladene Fotos";
+$a->strings["%Y - current year, %m -  current month"] = "%Y - aktuelles Jahr, %m -  aktueller Monat";
 $a->strings["Default file upload folder"] = "Voreingestellter Ordner für hochgeladene Dateien";
 $a->strings["Personal menu to display in your channel pages"] = "Eigenes Menü zur Anzeige auf den Seiten deines Kanals";
 $a->strings["Remove this channel."] = "Diesen Kanal löschen";
+$a->strings["Firefox Share \$Projectname provider"] = "\$Projectname-Provider für Firefox Share";
+$a->strings["Start calendar week on monday"] = "Montag als erster Tag der Kalenderwoche";
+$a->strings["Page Title"] = "Seitentitel";
+$a->strings["App installed."] = "App installiert.";
+$a->strings["Malformed app."] = "Fehlerhafte App.";
+$a->strings["Embed code"] = "Code einbetten";
+$a->strings["Edit App"] = "App bearbeiten";
+$a->strings["Create App"] = "App erstellen";
+$a->strings["Name of app"] = "Name der App";
+$a->strings["Location (URL) of app"] = "Ort (URL) der App";
+$a->strings["Photo icon URL"] = "URL zum Icon";
+$a->strings["80 x 80 pixels - optional"] = "80 x 80 Pixel – optional";
+$a->strings["Version ID"] = "Versions-ID";
+$a->strings["Price of app"] = "Preis der App";
+$a->strings["Location (URL) to purchase app"] = "Ort (URL), um die App zu kaufen";
+$a->strings["- select -"] = "– auswählen –";
+$a->strings["Comanche page description language help"] = "Hilfe zur Comanche-Seitenbeschreibungssprache";
+$a->strings["Layout Description"] = "Layout-Beschreibung";
+$a->strings["Download PDL file"] = "PDL-Datei herunterladen";
+$a->strings["Location not found."] = "Klon nicht gefunden.";
+$a->strings["Location lookup failed."] = "Nachschlagen des Kanal-Ortes fehlgeschlagen";
+$a->strings["Please select another location to become primary before removing the primary location."] = "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst.";
+$a->strings["Syncing locations"] = "Synchronisiere Klone";
+$a->strings["No locations found."] = "Keine Klon-Adressen gefunden.";
+$a->strings["Manage Channel Locations"] = "Klon-Adressen verwalten";
+$a->strings["Location (address)"] = "URL (Adresse)";
+$a->strings["Primary Location"] = "Primärer Klon";
+$a->strings["Drop location"] = "Klon löschen";
+$a->strings["Sync now"] = "Jetzt synchronisieren";
+$a->strings["Please wait several minutes between consecutive operations."] = "Bitte warte mehrere Minuten zwischen dem Ausführen zweier Operationen!";
+$a->strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub einloggst und den Kanal dort löschst.";
+$a->strings["Use this form to drop the location if the hub is no longer operating."] = "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt.";
+$a->strings["\$Projectname"] = "\$Projectname";
+$a->strings["Welcome to %s"] = "Willkommen auf %s";
+$a->strings["Please login."] = "Bitte melde dich an.";
 $a->strings["Xchan Lookup"] = "Xchan-Suche";
 $a->strings["Lookup xchan beginning with (or webbie): "] = "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:";
-$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet.";
-$a->strings["Create a new channel"] = "Neuen Kanal anlegen";
-$a->strings["Current Channel"] = "Aktueller Kanal";
-$a->strings["Switch to one of your channels by selecting it."] = "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst.";
-$a->strings["Default Channel"] = "Standard Kanal";
-$a->strings["Make Default"] = "Zum Standard machen";
-$a->strings["%d new messages"] = "%d neue Nachrichten";
-$a->strings["%d new introductions"] = "%d neue Vorstellungen";
-$a->strings["Delegated Channels"] = "Delegierte Kanäle";
-$a->strings["Authorize application connection"] = "Zugriff für die Anwendung autorisieren";
-$a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode in der Anwendung ein:";
-$a->strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?";
+$a->strings["Not found."] = "Nicht gefunden.";
+$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können.";
+$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
+$a->strings["Item not available."] = "Element nicht verfügbar.";
+$a->strings["Page owner information could not be retrieved."] = "Informationen über den Besitzer der Seite konnten nicht gefunden werden.";
+$a->strings["Album not found."] = "Album nicht gefunden.";
+$a->strings["Delete Album"] = "Album löschen";
+$a->strings["Delete Photo"] = "Foto löschen";
+$a->strings["No photos selected"] = "Keine Fotos ausgewählt";
+$a->strings["Access to this item is restricted."] = "Der Zugriff auf dieses Foto ist eingeschränkt.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB von %2$.2f MB Foto-Speicher belegt.";
+$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB Foto-Speicher belegt.";
+$a->strings["Upload Photos"] = "Fotos hochladen";
+$a->strings["Enter an album name"] = "Namen für ein neues Album eingeben";
+$a->strings["or select an existing album (doubleclick)"] = "oder ein bereits vorhandenes auswählen (Doppelklick)";
+$a->strings["Create a status post for this upload"] = "Einen Statusbeitrag für diesen Upload erzeugen";
+$a->strings["Caption (optional):"] = "Beschriftung (optional):";
+$a->strings["Description (optional):"] = "Beschreibung (optional):";
+$a->strings["Album name could not be decoded"] = "Albumname konnte nicht dekodiert werden";
+$a->strings["Contact Photos"] = "Kontakt-Bilder";
+$a->strings["Show Newest First"] = "Neueste zuerst anzeigen";
+$a->strings["Show Oldest First"] = "Älteste zuerst anzeigen";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden.";
+$a->strings["Photo not available"] = "Foto nicht verfügbar";
+$a->strings["Use as profile photo"] = "Als Profilfoto verwenden";
+$a->strings["Private Photo"] = "Privates Foto";
+$a->strings["Previous"] = "Voriges";
+$a->strings["View Full Size"] = "In voller Größe anzeigen";
+$a->strings["Edit photo"] = "Foto bearbeiten";
+$a->strings["Rotate CW (right)"] = "Drehen im UZS (rechts)";
+$a->strings["Rotate CCW (left)"] = "Drehen gegen UZS (links)";
+$a->strings["Enter a new album name"] = "Gib einen Namen für ein neues Album ein";
+$a->strings["or select an existing one (doubleclick)"] = "oder wähle ein bereits vorhandenes aus (Doppelklick)";
+$a->strings["Caption"] = "Bildunterschrift";
+$a->strings["Add a Tag"] = "Schlagwort hinzufügen";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Beispiele: @ben, @Karl_Prester, @lieschen@example.com";
+$a->strings["Flag as adult in album view"] = "In der Albumansicht als nicht jugendfrei markieren";
+$a->strings["In This Photo:"] = "Auf diesem Foto:";
+$a->strings["Map"] = "Karte";
+$a->strings["View Album"] = "Album ansehen";
+$a->strings["Recent Photos"] = "Neueste Fotos";
+$a->strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar.";
+$a->strings["Visible to:"] = "Sichtbar für:";
+$a->strings["Export Channel"] = "Kanal exportieren";
+$a->strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält.";
+$a->strings["Export Content"] = "Kanal und Inhalte exportieren";
+$a->strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet.";
+$a->strings["Export your posts from a given year."] = "Exportiert die Beiträge des angegebenen Jahres.";
+$a->strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne.";
+$a->strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1\$s\">%2\$s</a>.";
+$a->strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1\$s\">%2\$s</a>.";
+$a->strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1\$s\">%2\$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst.";
+$a->strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
+$a->strings["Delete item?"] = "Eintrag löschen?";
+$a->strings["Edit post"] = "Bearbeite Beitrag";
+$a->strings["Channel added."] = "Kanal hinzugefügt.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal.";
+$a->strings["The error message was:"] = "Die Fehlermeldung war:";
+$a->strings["Authentication failed."] = "Authentifizierung fehlgeschlagen.";
+$a->strings["Remote Authentication"] = "Entfernte Authentifizierung";
+$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z. B. channel@example.com)";
+$a->strings["Authenticate"] = "Authentifizieren";
+$a->strings["Room not found"] = "Chatraum nicht gefunden";
+$a->strings["Leave Room"] = "Raum verlassen";
+$a->strings["Delete This Room"] = "Diesen Raum löschen";
+$a->strings["I am away right now"] = "Ich bin gerade nicht da";
+$a->strings["I am online"] = "Ich bin online";
+$a->strings["Bookmark this room"] = "Lesezeichen für diesen Raum setzen";
+$a->strings["New Chatroom"] = "Neuer Chatraum";
+$a->strings["Chatroom Name"] = "Name des Chatraums";
+$a->strings["Expiration of chats (minutes)"] = "Verfall von Chats (Minuten)";
+$a->strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume";
+$a->strings["Source of Item"] = "Quelle des Elements";
+$a->strings["Share content from Firefox to \$Projectname"] = "Inhalte von Firefox nach \$Projectname teilen";
+$a->strings["Activate the Firefox \$Projectname provider"] = "Aktiviert den \$Projectname-Provider für firefox";
+$a->strings["Hub not found."] = "Server nicht gefunden.";
 $a->strings["Blocked"] = "Blockiert";
 $a->strings["Ignored"] = "Ignoriert";
 $a->strings["Hidden"] = "Versteckt";
@@ -1923,205 +2026,147 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
 $a->strings["Edit connection"] = "Verbindung bearbeiten";
 $a->strings["Search your connections"] = "Verbindungen durchsuchen";
 $a->strings["Finding: "] = "Ergebnisse:";
-$a->strings["Delete layout?"] = "Layout löschen?";
-$a->strings["Edit Layout"] = "Layout bearbeiten";
-$a->strings["Delete webpage?"] = "Webseite löschen?";
-$a->strings["Page link title"] = "Seitentitel-Link";
-$a->strings["Edit Webpage"] = "Webseite bearbeiten";
-$a->strings["Collection created."] = "Sammlung erstellt.";
-$a->strings["Could not create collection."] = "Sammlung kann nicht erstellt werden.";
-$a->strings["Collection updated."] = "Sammlung aktualisiert.";
-$a->strings["Create a collection of channels."] = "Erstelle eine Sammlung von Kanälen.";
-$a->strings["Collection Name: "] = "Name der Sammlung:";
-$a->strings["Members are visible to other channels"] = "Mitglieder sind sichtbar für andere Kanäle";
-$a->strings["Collection removed."] = "Sammlung gelöscht.";
-$a->strings["Unable to remove collection."] = "Löschen der Sammlung nicht möglich.";
-$a->strings["Collection Editor"] = "Sammlung-Editor";
-$a->strings["Members"] = "Mitglieder";
-$a->strings["All Connected Channels"] = "Alle verbundenen Kanäle";
-$a->strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus.";
-$a->strings["Continue"] = "Fortfahren";
-$a->strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung";
-$a->strings["Enable premium channel connection restrictions"] = "Einschränkungen für einen Premium-Kanal aktivieren";
-$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc.";
-$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig.";
-$a->strings["Potential connections will then see the following text before proceeding:"] = "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:";
-$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite.";
-$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)";
-$a->strings["Restricted or Premium Channel"] = "Eingeschränkter oder Premium-Kanal";
-$a->strings["No connections."] = "Keine Verbindungen.";
-$a->strings["Visit %s's profile [%s]"] = "%ss Profil [%s] besuchen";
-$a->strings["Location not found."] = "Klon nicht gefunden.";
-$a->strings["Location lookup failed."] = "Nachschlagen des Kanal-Ortes fehlgeschlagen";
-$a->strings["Please select another location to become primary before removing the primary location."] = "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst.";
-$a->strings["No locations found."] = "Keine Klon-Adressen gefunden.";
-$a->strings["Manage Channel Locations"] = "Klon-Adressen verwalten";
-$a->strings["Location (address)"] = "URL (Adresse)";
-$a->strings["Primary Location"] = "Primärer Klon";
-$a->strings["Drop location"] = "Klon löschen";
-$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut.";
-$a->strings["\$Projectname Server - Setup"] = "\$Projectname Server-Einrichtung";
-$a->strings["Could not connect to database."] = "Kann nicht mit der Datenbank verbinden.";
-$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS.";
-$a->strings["Could not create table."] = "Kann Tabelle nicht erstellen.";
-$a->strings["Your site database has been installed."] = "Die Datenbank Deines Hubs wurde installiert.";
-$a->strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren.";
-$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Lies die Datei \"install/INSTALL.txt\".";
-$a->strings["System check"] = "Systemprüfung";
-$a->strings["Check again"] = "Bitte nochmal prüfen";
-$a->strings["Database connection"] = "Datenbank Verbindung";
-$a->strings["In order to install \$Projectname we need to know how to connect to your database."] = "Um \$Projectname zu installieren, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst.";
-$a->strings["Database Server Name"] = "Datenbank-Servername";
-$a->strings["Default is localhost"] = "Standard ist localhost";
-$a->strings["Database Port"] = "Datenbank-Port";
-$a->strings["Communication port number - use 0 for default"] = "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung";
-$a->strings["Database Login Name"] = "Datenbank-Benutzername";
-$a->strings["Database Login Password"] = "Datenbank-Kennwort";
-$a->strings["Database Name"] = "Datenbank-Name";
-$a->strings["Database Type"] = "Datenbanktyp";
-$a->strings["Site administrator email address"] = "E-Mail Adresse des Seiten-Administrators";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst.";
-$a->strings["Website URL"] = "Server-URL";
-$a->strings["Please use SSL (https) URL if available."] = "Nutze wenn möglich eine SSL-URL (https).";
-$a->strings["Please select a default timezone for your website"] = "Standard-Zeitzone für Deinen Server";
-$a->strings["Site settings"] = "Seiteneinstellungen";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden.";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen.";
-$a->strings["PHP executable path"] = "PHP Pfad zu ausführbarer Datei";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren.";
-$a->strings["Command line PHP"] = "PHP Befehlszeile";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert.";
-$a->strings["This is required for message delivery to work."] = "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "Die Maximalgröße für Uploads insgesamt liegt bei %s. Die Maximalgröße für eine Datei liegt bei %s. Es können maximal %d Dateien gleichzeitig hochgeladen werden.";
-$a->strings["You can adjust these settings in the servers php.ini."] = "Du kannst diese Einstellungen in der php.ini des Servers ändern.";
-$a->strings["PHP upload limits"] = "PHP-Hochladebeschränkungen";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen.";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung.";
-$a->strings["Generate encryption keys"] = "Verschlüsselungsschlüssel  generieren";
-$a->strings["libCurl PHP module"] = "libCurl-PHP-Modul";
-$a->strings["GD graphics PHP module"] = "GD-Grafik-PHP-Modul";
-$a->strings["OpenSSL PHP module"] = "OpenSSL-PHP-Modul";
-$a->strings["mysqli or postgres PHP module"] = "mysqli oder postgres PHP-Modul";
-$a->strings["mb_string PHP module"] = "mb_string-PHP-Modul";
-$a->strings["mcrypt PHP module"] = "mcrypt-PHP-Modul";
-$a->strings["xml PHP module"] = "xml-PHP-Modul";
-$a->strings["Apache mod_rewrite module"] = "Apache-mod_rewrite-Modul";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert.";
-$a->strings["proc_open"] = "proc_open";
-$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert.";
-$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Fehler: Das mysqli oder postgres PHP-Modul ist erforderlich, aber keines von beiden ist installiert.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert.";
-$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert.";
-$a->strings["Error: xml PHP module required for DAV but not installed."] = "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Red-Installation speichern musst.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt.";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php ist beschreibbar";
-$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."] = "Um diese kompilierten Vorlagen speichern zu können, braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Red-Installationsverzeichnisses.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat.";
-$a->strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält.";
-$a->strings["%s is writable"] = "%s ist beschreibbar";
-$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses";
-$a->strings["store is writable"] = "store ist schreibbar";
-$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server.";
-$a->strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "Wenn Du via HTTPS auf Deinen Server zugreifen möchtest, also Verbindungen über den Port 443 möglich sein sollen, ist ein SSL-Zertifikat einer Zertifizierungsstelle (CA) notwendig, das von den Browsern ohne Sicherheitsabfrage akzeptiert wird. Die Verwendung eines selbst signierten Zertifikates ist nicht möglich.";
-$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Diese Einschränkung wurde eingebaut, weil Deine öffentlichen Beiträge zum Beispiel Verweise auf Bilder auf Deinem eigenen Hub enthalten können.";
-$a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "Wenn Dein Zertifikat nicht von jedem Browser akzeptiert wird, erhalten die Mitglieder anderer Red-Server (die mit korrekten Zertifikaten ausgestattet sind) Sicherheits-Warnmeldungen, obwohl sie gar nicht direkt auf Deinem Server unterwegs sind (zum Beispiel, wenn ein Bild aus einem Deiner Beiträge angezeigt wird).";
-$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen.";
-$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind.";
-$a->strings["SSL certificate validation"] = "SSL Zertifikatverifizierung";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:";
-$a->strings["Url rewrite is working"] = "Url rewrite funktioniert";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen.";
-$a->strings["Errors encountered creating database tables."] = "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten.";
-$a->strings["<h1>What next</h1>"] = "<h1>Was als Nächstes</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten.";
-$a->strings["Files: shared with me"] = "Dateien, die mit mir geteilt wurden";
-$a->strings["NEW"] = "NEU";
-$a->strings["Remove all files"] = "Alle Dateien löschen";
-$a->strings["Remove this file"] = "Diese Datei löschen";
+$a->strings["Documentation Search"] = "Suche in der Dokumentation";
+$a->strings["Help:"] = "Hilfe:";
+$a->strings["Not Found"] = "Nicht gefunden";
+$a->strings["\$Projectname Documentation"] = "\$Projectname-Dokumentation";
+$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet.";
+$a->strings["Create a new channel"] = "Neuen Kanal anlegen";
+$a->strings["Current Channel"] = "Aktueller Kanal";
+$a->strings["Switch to one of your channels by selecting it."] = "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst.";
+$a->strings["Default Channel"] = "Standard Kanal";
+$a->strings["Make Default"] = "Zum Standard machen";
+$a->strings["%d new messages"] = "%d neue Nachrichten";
+$a->strings["%d new introductions"] = "%d neue Vorstellungen";
+$a->strings["Delegated Channels"] = "Delegierte Kanäle";
+$a->strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
+$a->strings["Unable to create menu."] = "Kann Menü nicht erstellen.";
+$a->strings["Menu Name"] = "Name des Menüs";
+$a->strings["Unique name (not visible on webpage) - required"] = "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich";
+$a->strings["Menu Title"] = "Menütitel";
+$a->strings["Visible on webpage - leave empty for no title"] = "Sichtbar auf der Webseite – für keinen Titel leer lassen";
+$a->strings["Allow Bookmarks"] = "Lesezeichen erlauben";
+$a->strings["Menu may be used to store saved bookmarks"] = "Im Menü können gespeicherte Lesezeichen abgelegt werden";
+$a->strings["Submit and proceed"] = "Absenden und fortfahren";
+$a->strings["Drop"] = "Löschen";
+$a->strings["Bookmarks allowed"] = "Lesezeichen erlaubt";
+$a->strings["Delete this menu"] = "Lösche dieses Menü";
+$a->strings["Edit menu contents"] = "Bearbeite Menü Inhalte";
+$a->strings["Edit this menu"] = "Dieses Menü bearbeiten";
+$a->strings["Menu could not be deleted."] = "Menü konnte nicht gelöscht werden.";
+$a->strings["Menu not found."] = "Menü nicht gefunden";
+$a->strings["Edit Menu"] = "Menü bearbeiten";
+$a->strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü hinzufügen oder entfernen";
+$a->strings["Menu name"] = "Menü Name";
+$a->strings["Must be unique, only seen by you"] = "Muss eindeutig sein, ist aber nur für Dich sichtbar";
+$a->strings["Menu title"] = "Menü Titel";
+$a->strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird";
+$a->strings["Allow bookmarks"] = "Erlaube Lesezeichen";
+$a->strings["Unable to lookup recipient."] = "Konnte den Empfänger nicht finden.";
+$a->strings["Unable to communicate with requested channel."] = "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen.";
+$a->strings["Cannot verify requested channel."] = "Verifizierung des angeforderten Kanals fehlgeschlagen.";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen.";
+$a->strings["Messages"] = "Nachrichten";
+$a->strings["Message recalled."] = "Nachricht widerrufen.";
+$a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
+$a->strings["Requested channel is not in this network"] = "Angeforderter Kanal ist nicht in diesem Netzwerk.";
+$a->strings["Send Private Message"] = "Private Nachricht senden";
+$a->strings["To:"] = "An:";
+$a->strings["Subject:"] = "Betreff:";
+$a->strings["Send"] = "Absenden";
+$a->strings["Delete message"] = "Nachricht löschen";
+$a->strings["Delivery report"] = "Zustellungsbericht";
+$a->strings["Recall message"] = "Nachricht widerrufen";
+$a->strings["Message has been recalled."] = "Die Nachricht wurde widerrufen.";
+$a->strings["Delete Conversation"] = "Unterhaltung löschen";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten.";
+$a->strings["Send Reply"] = "Antwort senden";
+$a->strings["Your message for %s (%s):"] = "Deine Nachricht für %s (%s):";
+$a->strings["No service class restrictions found."] = "Keine Dienstklassenbeschränkungen gefunden.";
+$a->strings["Version %s"] = "Version %s";
+$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
+$a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
+$a->strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Dieser Hub ist Teil von \$Projectname – ein globales, kooperatives Netzwerk aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen.";
+$a->strings["Tag: "] = "Schlagwort: ";
+$a->strings["Last background fetch: "] = "Letzter Hintergrundabruf:";
+$a->strings["Current load average: "] = "Aktuelles Load Average:";
+$a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
+$a->strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Bitte besuchen Sie <a href=\"http://hubzilla.org\">hubzilla.org</a>, um mehr über \$Projectname zu erfahren.";
+$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
+$a->strings["\$projectname issues"] = "\$projectname-Bugtracker";
+$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com";
+$a->strings["Site Administrators"] = "Administratoren";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal.";
-$a->strings["Profile not found."] = "Profil nicht gefunden.";
-$a->strings["Profile deleted."] = "Profil gelöscht.";
-$a->strings["Profile-"] = "Profil-";
-$a->strings["New profile created."] = "Neues Profil erstellt.";
-$a->strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden.";
-$a->strings["Profile unavailable to export."] = "Dieses Profil kann nicht exportiert werden.";
-$a->strings["Profile Name is required."] = "Profil-Name erforderlich.";
-$a->strings["Marital Status"] = "Familienstand";
-$a->strings["Romantic Partner"] = "Romantische Partner";
-$a->strings["Likes"] = "Gefällt";
-$a->strings["Dislikes"] = "Gefällt nicht";
-$a->strings["Work/Employment"] = "Arbeit/Anstellung";
-$a->strings["Religion"] = "Religion";
-$a->strings["Political Views"] = "Politische Ansichten";
-$a->strings["Sexual Preference"] = "Sexuelle Orientierung";
-$a->strings["Homepage"] = "Webseite";
-$a->strings["Interests"] = "Hobbys/Interessen";
-$a->strings["Profile updated."] = "Profil aktualisiert.";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?";
-$a->strings["Edit Profile Details"] = "Bearbeite Profil-Details";
-$a->strings["View this profile"] = "Dieses Profil ansehen";
-$a->strings["Change Profile Photo"] = "Profilfoto ändern";
-$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen übernehmen";
-$a->strings["Clone this profile"] = "Dieses Profil klonen";
-$a->strings["Delete this profile"] = "Dieses Profil löschen";
-$a->strings["Import profile from file"] = "Profil aus einer Datei importieren";
-$a->strings["Export profile to file"] = "Profil in eine Datei exportieren";
-$a->strings["Profile Name:"] = "Profilname:";
-$a->strings["Your Full Name:"] = "Dein voller Name:";
-$a->strings["Title/Description:"] = "Titel/Beschreibung:";
-$a->strings["Your Gender:"] = "Dein Geschlecht:";
-$a->strings["Birthday :"] = "Geburtstag:";
-$a->strings["Street Address:"] = "Straße und Hausnummer:";
-$a->strings["Locality/City:"] = "Wohnort:";
-$a->strings["Postal/Zip Code:"] = "Postleitzahl:";
-$a->strings["Country:"] = "Land:";
-$a->strings["Region/State:"] = "Region/Bundesstaat:";
-$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Beziehungsstatus:";
-$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
-$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
-$a->strings["Since [date]:"] = "Seit [Datum]:";
-$a->strings["Homepage URL:"] = "Homepage URL:";
-$a->strings["Religious Views:"] = "Religiöse Ansichten:";
-$a->strings["Keywords:"] = "Schlüsselwörter:";
-$a->strings["Example: fishing photography software"] = "Beispiel: Angeln Fotografie Software";
-$a->strings["Used in directory listings"] = "Wird in Verzeichnis-Auflistungen verwendet";
-$a->strings["Tell us about yourself..."] = "Erzähle uns ein wenig von Dir …";
-$a->strings["Hobbies/Interests"] = "Hobbys/Interessen";
-$a->strings["Contact information and Social Networks"] = "Kontaktinformation und soziale Netzwerke";
-$a->strings["My other channels"] = "Meine anderen Kanäle";
-$a->strings["Musical interests"] = "Musikalische Interessen";
-$a->strings["Books, literature"] = "Bücher, Literatur";
-$a->strings["Television"] = "Fernsehen";
-$a->strings["Film/dance/culture/entertainment"] = "Film/Tanz/Kultur/Unterhaltung";
-$a->strings["Love/romance"] = "Liebe/Romantik";
-$a->strings["Work/employment"] = "Arbeit/Anstellung";
-$a->strings["School/education"] = "Schule/Ausbildung";
-$a->strings["This is your default profile."] = "Das ist Dein Standardprofil.";
-$a->strings["Age: "] = "Alter:";
-$a->strings["Edit/Manage Profiles"] = "Profile bearbeiten/verwalten";
-$a->strings["Add profile things"] = "Sachen zum Profil hinzufügen";
-$a->strings["Include desirable objects in your profile"] = "Binde begehrenswerte Dinge in Dein Profil ein";
+$a->strings["Calendar entries imported."] = "Kalendereinträge wurden importiert.";
+$a->strings["No calendar entries found."] = "Keine Kalendereinträge gefunden.";
+$a->strings["Event can not end before it has started."] = "Termin-Ende liegt vor dem Beginn.";
+$a->strings["Unable to generate preview."] = "Vorschau konnte nicht erzeugt werden.";
+$a->strings["Event title and start time are required."] = "Titel und Startzeit des Termins sind erforderlich.";
+$a->strings["Event not found."] = "Termin nicht gefunden.";
+$a->strings["Edit event titel"] = "Termintitel bearbeiten";
+$a->strings["Event titel"] = "Termintitel";
+$a->strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
+$a->strings["Edit Category"] = "Kategorie bearbeiten";
+$a->strings["Category"] = "Kategorie";
+$a->strings["Edit start date and time"] = "Startdatum und -zeit bearbeiten";
+$a->strings["Start date and time"] = "Startdatum und -zeit";
+$a->strings["Finish date and time are not known or not relevant"] = "Enddatum und -zeit sind unbekannt oder irrelevant";
+$a->strings["Edit finish date and time"] = "Enddatum und -zeit bearbeiten";
+$a->strings["Finish date and time"] = "Enddatum und -zeit";
+$a->strings["Adjust for viewer timezone"] = "An die Zeitzone des Betrachters anpassen";
+$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien.";
+$a->strings["Edit Description"] = "Beschreibung bearbeiten";
+$a->strings["Edit Location"] = "Ort bearbeiten";
+$a->strings["Share this event"] = "Den Termin teilen";
+$a->strings["Advanced Options"] = "Weitere Optionen";
+$a->strings["l, F j"] = "l, j. F";
+$a->strings["Edit event"] = "Termin bearbeiten";
+$a->strings["Delete event"] = "Termin löschen";
+$a->strings["calendar"] = "Kalender";
+$a->strings["Edit Event"] = "Termin bearbeiten";
+$a->strings["Create Event"] = "Termin anlegen";
+$a->strings["Today"] = "Heute";
+$a->strings["Event removed"] = "Termin gelöscht";
+$a->strings["Failed to remove event"] = "Termin konnte nicht gelöscht werden";
 $a->strings["Invalid profile identifier."] = "Ungültiger Profil-Identifikator";
 $a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits-Editor";
 $a->strings["Click on a contact to add or remove."] = "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen.";
 $a->strings["Visible To"] = "Sichtbar für";
-$a->strings["Select a bookmark folder"] = "Lesezeichenordner wählen";
-$a->strings["Save Bookmark"] = "Lesezeichen speichern";
-$a->strings["URL of bookmark"] = "URL des Lesezeichens";
-$a->strings["Or enter new bookmark folder name"] = "Oder gib einen neuen Namen für den Lesezeichenordner ein";
-$a->strings["Import completed"] = "Import abgeschlossen";
-$a->strings["Import Items"] = "Beiträge importieren";
-$a->strings["Use this form to import existing posts and content from an export file."] = "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren.";
+$a->strings["Unable to create element."] = "Element konnte nicht erstellt werden.";
+$a->strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren.";
+$a->strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen.";
+$a->strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements";
+$a->strings["Link Name"] = "Name des Links";
+$a->strings["Link or Submenu Target"] = "Ziel des Links oder Untermenüs";
+$a->strings["Enter URL of the link or select a menu name to create a submenu"] = "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen.";
+$a->strings["Use magic-auth if available"] = "Magic-Auth verwenden, falls verfügbar";
+$a->strings["Open link in new window"] = "Öffne Link in neuem Fenster";
+$a->strings["Order in list"] = "Reihenfolge in der Liste";
+$a->strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert";
+$a->strings["Submit and finish"] = "Absenden und fertigstellen";
+$a->strings["Submit and continue"] = "Absenden und fortfahren";
+$a->strings["Menu:"] = "Menü:";
+$a->strings["Link Target"] = "Ziel des Links";
+$a->strings["Edit menu"] = "Menü bearbeiten";
+$a->strings["Edit element"] = "Bestandteil bearbeiten";
+$a->strings["Drop element"] = "Bestandteil löschen";
+$a->strings["New element"] = "Neues Bestandteil";
+$a->strings["Edit this menu container"] = "Diesen Menü-Container bearbeiten";
+$a->strings["Add menu element"] = "Menüelement hinzufügen";
+$a->strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
+$a->strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
+$a->strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden.";
+$a->strings["Menu item deleted."] = "Menü-Bestandteil gelöscht.";
+$a->strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden.";
+$a->strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil";
+$a->strings["Link text"] = "Link Text";
+$a->strings["Who likes me?"] = "Wer mag mich?";
+$a->strings["Files: shared with me"] = "Dateien, die mit mir geteilt wurden";
+$a->strings["NEW"] = "NEU";
+$a->strings["Remove all files"] = "Alle Dateien löschen";
+$a->strings["Remove this file"] = "Diese Datei löschen";
+$a->strings["No connections."] = "Keine Verbindungen.";
+$a->strings["Visit %s's profile [%s]"] = "%ss Profil [%s] besuchen";
 $a->strings["Focus (Hubzilla default)"] = "Focus (Voreinstellung für Hubzilla)";
 $a->strings["Theme settings"] = "Theme-Einstellungen";
 $a->strings["Select scheme"] = "Schema wählen";
@@ -2167,3 +2212,4 @@ $a->strings["Website SSL certificate is not valid. Please correct."] = "Das SSL-
 $a->strings["[hubzilla] Website SSL error for %s"] = "[hubzilla] Website-SSL-Fehler für %s";
 $a->strings["Cron/Scheduled tasks not running."] = "Cron-Aufgaben laufen nicht.";
 $a->strings["[hubzilla] Cron tasks not running on %s"] = "[hubzilla] Cron-Aufgaben für %s laufen nicht";
+$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut.";
diff --git a/view/en/update_fail_eml.tpl b/view/en/update_fail_eml.tpl
index 61f44b1e6..86bb61aaa 100644
--- a/view/en/update_fail_eml.tpl
+++ b/view/en/update_fail_eml.tpl
@@ -4,7 +4,7 @@ I'm the web server at {{$sitename}};
 The Hubzilla developers released update {{$update}} recently, 

 but when I tried to install it, something went terribly wrong.  

 This needs to be fixed soon and it requires human intervention. 

-Please contact a Red developer if you can not figure out how to 

+Please contact a project developer if you can not figure out how to 

 fix it on your own. My database might be invalid. 

 

 The error message is '{{$error}}'.   

diff --git a/view/es b/view/es
new file mode 120000
index 000000000..55914a5c4
--- /dev/null
+++ b/view/es
@@ -0,0 +1 @@
+es-es/
\ No newline at end of file
diff --git a/view/es/hmessages.po b/view/es-es/hmessages.po
index 88ad2bf09..824ae5e49 100644
--- a/view/es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -4,26 +4,26 @@
 # 
 # Translators:
 # Alfonso <admin@alfonsomh.eu>, 2015
+# JACOB MALDONADO <axetransit@gmail.com>, 2015
 # jeroenpraat <jeroenpraat@xs4all.nl>, 2015
-# Manuel Jiménez Friaza <mjfriaza@openmailbox.org>, 2015
-# Rafael, 2015
+# Manuel Jiménez Friaza <mjfriaza@openmailbox.org>, 2015-2016
 # Rafael, 2015
 # tony baldwin <tonybaldwin@gmx.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-27 00:03-0800\n"
-"PO-Revision-Date: 2015-11-28 17:04+0000\n"
+"POT-Creation-Date: 2016-01-01 00:03-0800\n"
+"PO-Revision-Date: 2016-01-02 11:55+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n"
+"Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
+"Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../include/Contact.php:101 ../../include/identity.php:953
+#: ../../include/Contact.php:101 ../../include/identity.php:947
 #: ../../include/widgets.php:137 ../../include/widgets.php:175
 #: ../../include/conversation.php:953 ../../mod/match.php:64
 #: ../../mod/directory.php:318 ../../mod/suggest.php:52
@@ -59,17 +59,17 @@ msgstr "Especificador de sala no válido."
 msgid "Room not found."
 msgstr "Sala no encontrada."
 
-#: ../../include/chat.php:133 ../../include/items.php:4396
-#: ../../include/attach.php:140 ../../include/attach.php:188
-#: ../../include/attach.php:251 ../../include/attach.php:265
-#: ../../include/attach.php:272 ../../include/attach.php:337
-#: ../../include/attach.php:351 ../../include/attach.php:358
-#: ../../include/attach.php:436 ../../include/attach.php:884
-#: ../../include/attach.php:955 ../../include/attach.php:1107
-#: ../../include/photos.php:29 ../../mod/filestorage.php:18
+#: ../../include/chat.php:133 ../../include/items.php:4405
+#: ../../include/photos.php:29 ../../include/attach.php:140
+#: ../../include/attach.php:188 ../../include/attach.php:251
+#: ../../include/attach.php:265 ../../include/attach.php:272
+#: ../../include/attach.php:337 ../../include/attach.php:351
+#: ../../include/attach.php:358 ../../include/attach.php:436
+#: ../../include/attach.php:888 ../../include/attach.php:959
+#: ../../include/attach.php:1111 ../../mod/filestorage.php:18
 #: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/group.php:9 ../../mod/item.php:205
-#: ../../mod/item.php:213 ../../mod/item.php:1049 ../../mod/common.php:35
+#: ../../mod/filestorage.php:115 ../../mod/group.php:9 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:1050 ../../mod/common.php:35
 #: ../../mod/achievements.php:30 ../../mod/rate.php:111
 #: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/id.php:71
 #: ../../mod/like.php:177 ../../mod/page.php:31 ../../mod/page.php:86
@@ -82,20 +82,20 @@ msgstr "Sala no encontrada."
 #: ../../mod/editwebpage.php:125 ../../mod/profile.php:64
 #: ../../mod/profile.php:72 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/fsuggest.php:78 ../../mod/sources.php:66
-#: ../../mod/notifications.php:66 ../../mod/photos.php:70
-#: ../../mod/profile_photo.php:341 ../../mod/profile_photo.php:354
-#: ../../mod/thing.php:271 ../../mod/thing.php:291 ../../mod/thing.php:328
-#: ../../mod/editblock.php:65 ../../mod/network.php:12
-#: ../../mod/pdledit.php:21 ../../mod/register.php:72
+#: ../../mod/notifications.php:66 ../../mod/invite.php:13
+#: ../../mod/invite.php:87 ../../mod/profile_photo.php:341
+#: ../../mod/profile_photo.php:354 ../../mod/thing.php:271
+#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/editblock.php:65
+#: ../../mod/network.php:12 ../../mod/pdledit.php:21 ../../mod/register.php:72
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
 #: ../../mod/settings.php:568 ../../mod/webpages.php:69
 #: ../../mod/appman.php:66 ../../mod/layouts.php:69 ../../mod/layouts.php:76
-#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/mail.php:118
-#: ../../mod/regmod.php:17 ../../mod/channel.php:100 ../../mod/channel.php:214
-#: ../../mod/channel.php:254 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../mod/editpost.php:13 ../../mod/chat.php:94 ../../mod/chat.php:99
-#: ../../mod/viewsrc.php:14 ../../mod/authtest.php:13
-#: ../../mod/connections.php:29 ../../mod/manage.php:6 ../../mod/menu.php:74
+#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/regmod.php:17
+#: ../../mod/channel.php:100 ../../mod/channel.php:214
+#: ../../mod/channel.php:254 ../../mod/photos.php:70 ../../mod/editpost.php:13
+#: ../../mod/chat.php:94 ../../mod/chat.php:99 ../../mod/viewsrc.php:14
+#: ../../mod/authtest.php:13 ../../mod/connections.php:29
+#: ../../mod/manage.php:6 ../../mod/menu.php:74 ../../mod/mail.php:126
 #: ../../mod/service_limits.php:7 ../../mod/suggest.php:26
 #: ../../mod/events.php:260 ../../mod/message.php:16 ../../mod/block.php:22
 #: ../../mod/block.php:72 ../../mod/mitem.php:111 ../../mod/sharedwithme.php:7
@@ -125,15 +125,390 @@ msgstr "La clonación del canal no ha salido bien. La importación ha fallado."
 msgid "Cloned channel not found. Import failed."
 msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
 
+#: ../../include/text.php:394
+msgid "prev"
+msgstr "anterior"
+
+#: ../../include/text.php:396
+msgid "first"
+msgstr "primera"
+
+#: ../../include/text.php:425
+msgid "last"
+msgstr "última"
+
+#: ../../include/text.php:428
+msgid "next"
+msgstr "próxima"
+
+#: ../../include/text.php:438
+msgid "older"
+msgstr "más antiguas"
+
+#: ../../include/text.php:440
+msgid "newer"
+msgstr "más recientes"
+
+#: ../../include/text.php:803
+msgid "No connections"
+msgstr "Sin conexiones"
+
+#: ../../include/text.php:815
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d Conexión"
+msgstr[1] "%d Conexiones"
+
+#: ../../include/text.php:828 ../../mod/viewconnections.php:101
+msgid "View Connections"
+msgstr "Ver conexiones"
+
+#: ../../include/text.php:885 ../../include/text.php:897
+#: ../../include/nav.php:159 ../../include/apps.php:147
+#: ../../mod/search.php:40
+msgid "Search"
+msgstr "Buscar"
+
+#: ../../include/text.php:886 ../../include/text.php:898
+#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:100 ../../mod/admin.php:1454 ../../mod/admin.php:1474
+#: ../../mod/filer.php:49
+msgid "Save"
+msgstr "Guardar"
+
+#: ../../include/text.php:972
+msgid "poke"
+msgstr "un toque"
+
+#: ../../include/text.php:972 ../../include/conversation.php:243
+msgid "poked"
+msgstr "ha dado un toque a"
+
+#: ../../include/text.php:973
+msgid "ping"
+msgstr "un \"ping\""
+
+#: ../../include/text.php:973
+msgid "pinged"
+msgstr "ha enviado un \"ping\" a"
+
+#: ../../include/text.php:974
+msgid "prod"
+msgstr "una incitación "
+
+#: ../../include/text.php:974
+msgid "prodded"
+msgstr "ha incitado a "
+
+#: ../../include/text.php:975
+msgid "slap"
+msgstr "una bofetada "
+
+#: ../../include/text.php:975
+msgid "slapped"
+msgstr "ha abofeteado a "
+
+#: ../../include/text.php:976
+msgid "finger"
+msgstr "un \"finger\" "
+
+#: ../../include/text.php:976
+msgid "fingered"
+msgstr "envió un \"finger\" a"
+
+#: ../../include/text.php:977
+msgid "rebuff"
+msgstr "un reproche"
+
+#: ../../include/text.php:977
+msgid "rebuffed"
+msgstr "ha hecho un reproche a "
+
+#: ../../include/text.php:987
+msgid "happy"
+msgstr "feliz "
+
+#: ../../include/text.php:988
+msgid "sad"
+msgstr "triste "
+
+#: ../../include/text.php:989
+msgid "mellow"
+msgstr "tranquilo/a"
+
+#: ../../include/text.php:990
+msgid "tired"
+msgstr "cansado/a "
+
+#: ../../include/text.php:991
+msgid "perky"
+msgstr "vivaz"
+
+#: ../../include/text.php:992
+msgid "angry"
+msgstr "enfadado/a"
+
+#: ../../include/text.php:993
+msgid "stupefied"
+msgstr "asombrado"
+
+#: ../../include/text.php:994
+msgid "puzzled"
+msgstr "perplejo/a"
+
+#: ../../include/text.php:995
+msgid "interested"
+msgstr "interesado/a"
+
+#: ../../include/text.php:996
+msgid "bitter"
+msgstr "amargado/a"
+
+#: ../../include/text.php:997
+msgid "cheerful"
+msgstr "alegre"
+
+#: ../../include/text.php:998
+msgid "alive"
+msgstr "animado/a"
+
+#: ../../include/text.php:999
+msgid "annoyed"
+msgstr "molesto/a"
+
+#: ../../include/text.php:1000
+msgid "anxious"
+msgstr "ansioso/a"
+
+#: ../../include/text.php:1001
+msgid "cranky"
+msgstr "de mal humor"
+
+#: ../../include/text.php:1002
+msgid "disturbed"
+msgstr "perturbado/a"
+
+#: ../../include/text.php:1003
+msgid "frustrated"
+msgstr "frustrado/a"
+
+#: ../../include/text.php:1004
+msgid "depressed"
+msgstr "deprimido/a"
+
+#: ../../include/text.php:1005
+msgid "motivated"
+msgstr "motivado/a"
+
+#: ../../include/text.php:1006
+msgid "relaxed"
+msgstr "relajado/a"
+
+#: ../../include/text.php:1007
+msgid "surprised"
+msgstr "sorprendido/a"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "lunes"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "martes"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "miércoles"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "jueves"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "viernes"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "sábado"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "domingo"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:45
+msgid "January"
+msgstr "enero"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:46
+msgid "February"
+msgstr "febrero"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:47
+msgid "March"
+msgstr "marzo"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:48
+msgid "April"
+msgstr "abril"
+
+#: ../../include/text.php:1183
+msgid "May"
+msgstr "mayo"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:50
+msgid "June"
+msgstr "junio"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:51
+msgid "July"
+msgstr "julio"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:52
+msgid "August"
+msgstr "agosto"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:53
+msgid "September"
+msgstr "septiembre"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:54
+msgid "October"
+msgstr "octubre"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:55
+msgid "November"
+msgstr "noviembre"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:56
+msgid "December"
+msgstr "diciembre"
+
+#: ../../include/text.php:1260 ../../include/text.php:1264
+msgid "Unknown Attachment"
+msgstr "Adjunto no reconocido"
+
+#: ../../include/text.php:1266 ../../include/RedDAV/RedBrowser.php:237
+#: ../../mod/sharedwithme.php:97
+msgid "Size"
+msgstr "Tamaño"
+
+#: ../../include/text.php:1266
+msgid "unknown"
+msgstr "desconocido"
+
+#: ../../include/text.php:1302
+msgid "remove category"
+msgstr "eliminar categoría"
+
+#: ../../include/text.php:1379
+msgid "remove from file"
+msgstr "eliminar del fichero"
+
+#: ../../include/text.php:1410 ../../include/event.php:22
+#: ../../include/bb2diaspora.php:465
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d de F, Y \\@ G:i"
+
+#: ../../include/text.php:1414 ../../include/event.php:30
+#: ../../include/bb2diaspora.php:471
+msgid "Starts:"
+msgstr "Comienza:"
+
+#: ../../include/text.php:1418 ../../include/event.php:40
+#: ../../include/bb2diaspora.php:479
+msgid "Finishes:"
+msgstr "Finaliza:"
+
+#: ../../include/text.php:1425 ../../include/event.php:52
+#: ../../include/identity.php:998 ../../include/bb2diaspora.php:487
+#: ../../mod/directory.php:304
+msgid "Location:"
+msgstr "Ubicación:"
+
+#: ../../include/text.php:1521 ../../include/text.php:1532
+msgid "Click to open/close"
+msgstr "Pulsar para abrir/cerrar"
+
+#: ../../include/text.php:1716 ../../mod/events.php:623
+msgid "Link to Source"
+msgstr "Enlazar con la entrada en su ubicación original"
+
+#: ../../include/text.php:1737 ../../include/text.php:1809
+msgid "default"
+msgstr "por defecto"
+
+#: ../../include/text.php:1745
+msgid "Page layout"
+msgstr "Formato de la página"
+
+#: ../../include/text.php:1745
+msgid "You can create your own with the layouts tool"
+msgstr "Puede crear su propio formato gráfico con las herramientas de diseño"
+
+#: ../../include/text.php:1787
+msgid "Page content type"
+msgstr "Tipo de contenido de página"
+
+#: ../../include/text.php:1821
+msgid "Select an alternate language"
+msgstr "Seleccionar un idioma alternativo"
+
+#: ../../include/text.php:1940 ../../include/conversation.php:120
+#: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
+msgid "photo"
+msgstr "foto"
+
+#: ../../include/text.php:1943 ../../include/event.php:904
+#: ../../include/conversation.php:123 ../../mod/tagger.php:47
+#: ../../mod/like.php:363 ../../mod/events.php:249
+msgid "event"
+msgstr "evento"
+
+#: ../../include/text.php:1946 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:83
+msgid "status"
+msgstr "el mensaje de estado"
+
+#: ../../include/text.php:1948 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr "el comentario"
+
+#: ../../include/text.php:1953
+msgid "activity"
+msgstr "actividad"
+
+#: ../../include/text.php:2248
+msgid "Design Tools"
+msgstr "Herramientas de diseño"
+
+#: ../../include/text.php:2251 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr "Bloques"
+
+#: ../../include/text.php:2252 ../../mod/menu.php:103
+msgid "Menus"
+msgstr "Menús"
+
+#: ../../include/text.php:2253 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr "Formato gráfico"
+
+#: ../../include/text.php:2254
+msgid "Pages"
+msgstr "Páginas"
+
+#: ../../include/text.php:2606 ../../include/RedDAV/RedBrowser.php:131
+msgid "Collection"
+msgstr "Colección"
+
 #: ../../include/RedDAV/RedBrowser.php:107
 #: ../../include/RedDAV/RedBrowser.php:239
 msgid "parent"
 msgstr "padre"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2582
-msgid "Collection"
-msgstr "Colección"
-
 #: ../../include/RedDAV/RedBrowser.php:134
 msgid "Principal"
 msgstr "Principal"
@@ -154,16 +529,16 @@ msgstr "Programar bandeja de entrada"
 msgid "Schedule Outbox"
 msgstr "Programar bandeja de salida"
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1317
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1330
 #: ../../include/conversation.php:1027 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../mod/photos.php:759
-#: ../../mod/photos.php:1198
+#: ../../include/apps.php:415 ../../mod/photos.php:754
+#: ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr "Desconocido"
 
 #: ../../include/RedDAV/RedBrowser.php:226 ../../include/conversation.php:1629
 #: ../../include/nav.php:93 ../../include/apps.php:135
-#: ../../mod/fbrowser.php:114
+#: ../../mod/fbrowser.php:109
 msgid "Files"
 msgstr "Ficheros"
 
@@ -183,13 +558,13 @@ msgid "Create"
 msgstr "Crear"
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1329
-#: ../../mod/photos.php:784 ../../mod/photos.php:1317
-#: ../../mod/profile_photo.php:453
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1343
+#: ../../mod/profile_photo.php:453 ../../mod/photos.php:781
+#: ../../mod/photos.php:1316
 msgid "Upload"
 msgstr "Subir"
 
-#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:974
+#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:986
 #: ../../mod/settings.php:588 ../../mod/settings.php:614
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
@@ -199,11 +574,6 @@ msgstr "Nombre"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../include/RedDAV/RedBrowser.php:237 ../../include/text.php:1248
-#: ../../mod/sharedwithme.php:97
-msgid "Size"
-msgstr "Tamaño"
-
 #: ../../include/RedDAV/RedBrowser.php:238 ../../mod/sharedwithme.php:98
 msgid "Last Modified"
 msgstr "Última modificación"
@@ -224,10 +594,10 @@ msgstr "Editar"
 #: ../../include/RedDAV/RedBrowser.php:241 ../../include/conversation.php:657
 #: ../../include/ItemObject.php:120 ../../include/apps.php:260
 #: ../../mod/group.php:173 ../../mod/blocks.php:155 ../../mod/connedit.php:551
-#: ../../mod/editwebpage.php:223 ../../mod/photos.php:1129
-#: ../../mod/thing.php:258 ../../mod/editblock.php:181 ../../mod/admin.php:809
-#: ../../mod/admin.php:968 ../../mod/editlayout.php:179
-#: ../../mod/settings.php:649 ../../mod/webpages.php:183
+#: ../../mod/editwebpage.php:223 ../../mod/thing.php:258
+#: ../../mod/editblock.php:181 ../../mod/admin.php:821 ../../mod/admin.php:980
+#: ../../mod/editlayout.php:179 ../../mod/settings.php:649
+#: ../../mod/webpages.php:183 ../../mod/photos.php:1126
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -258,7 +628,7 @@ msgid "Delete this item?"
 msgstr "¿Borrar este elemento?"
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:696
-#: ../../mod/photos.php:1047 ../../mod/photos.php:1165
+#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
 msgid "Comment"
 msgstr "Comentar"
 
@@ -324,24 +694,25 @@ msgid "Describe (optional)"
 msgstr "Describir (opcional)"
 
 #: ../../include/js_strings.php:22 ../../include/widgets.php:676
-#: ../../include/ItemObject.php:697 ../../mod/filestorage.php:156
-#: ../../mod/group.php:81 ../../mod/connect.php:93 ../../mod/rate.php:168
-#: ../../mod/mood.php:135 ../../mod/setup.php:331 ../../mod/setup.php:371
-#: ../../mod/pconfig.php:108 ../../mod/poke.php:171 ../../mod/profiles.php:675
+#: ../../include/widgets.php:688 ../../include/ItemObject.php:697
+#: ../../mod/filestorage.php:156 ../../mod/group.php:81
+#: ../../mod/connect.php:93 ../../mod/rate.php:168 ../../mod/mood.php:135
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/pconfig.php:108
+#: ../../mod/poke.php:171 ../../mod/profiles.php:675
 #: ../../mod/connedit.php:715 ../../mod/fsuggest.php:108
 #: ../../mod/sources.php:104 ../../mod/sources.php:138
-#: ../../mod/import.php:527 ../../mod/photos.php:637 ../../mod/photos.php:1008
-#: ../../mod/photos.php:1048 ../../mod/photos.php:1166 ../../mod/thing.php:313
+#: ../../mod/import.php:527 ../../mod/invite.php:142 ../../mod/thing.php:313
 #: ../../mod/thing.php:359 ../../mod/import_items.php:122
-#: ../../mod/pdledit.php:58 ../../mod/admin.php:435 ../../mod/admin.php:802
-#: ../../mod/admin.php:966 ../../mod/admin.php:1103 ../../mod/admin.php:1297
-#: ../../mod/admin.php:1382 ../../mod/settings.php:586
+#: ../../mod/pdledit.php:58 ../../mod/admin.php:447 ../../mod/admin.php:814
+#: ../../mod/admin.php:978 ../../mod/admin.php:1115 ../../mod/admin.php:1309
+#: ../../mod/admin.php:1394 ../../mod/settings.php:586
 #: ../../mod/settings.php:698 ../../mod/settings.php:726
 #: ../../mod/settings.php:749 ../../mod/settings.php:834
 #: ../../mod/settings.php:1023 ../../mod/appman.php:99 ../../mod/locs.php:116
-#: ../../mod/mail.php:371 ../../mod/xchan.php:11 ../../mod/invite.php:142
-#: ../../mod/chat.php:184 ../../mod/chat.php:213 ../../mod/events.php:476
-#: ../../mod/events.php:673 ../../mod/mitem.php:231
+#: ../../mod/xchan.php:11 ../../mod/photos.php:637 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1045 ../../mod/photos.php:1163 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/mail.php:380 ../../mod/events.php:461
+#: ../../mod/events.php:658 ../../mod/mitem.php:231
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Enviar"
@@ -355,7 +726,7 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr "Cambios no guardados. ¿Está seguro de que desea abandonar la página?"
 
 #: ../../include/js_strings.php:25 ../../mod/pubsites.php:28
-#: ../../mod/profiles.php:464 ../../mod/events.php:467
+#: ../../mod/profiles.php:464 ../../mod/events.php:452
 msgid "Location"
 msgstr "Ubicación"
 
@@ -432,55 +803,11 @@ msgstr " "
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1165
-msgid "January"
-msgstr "enero"
-
-#: ../../include/js_strings.php:46 ../../include/text.php:1165
-msgid "February"
-msgstr "febrero"
-
-#: ../../include/js_strings.php:47 ../../include/text.php:1165
-msgid "March"
-msgstr "marzo"
-
-#: ../../include/js_strings.php:48 ../../include/text.php:1165
-msgid "April"
-msgstr "abril"
-
 #: ../../include/js_strings.php:49
 msgctxt "long"
 msgid "May"
 msgstr "mayo"
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1165
-msgid "June"
-msgstr "junio"
-
-#: ../../include/js_strings.php:51 ../../include/text.php:1165
-msgid "July"
-msgstr "julio"
-
-#: ../../include/js_strings.php:52 ../../include/text.php:1165
-msgid "August"
-msgstr "agosto"
-
-#: ../../include/js_strings.php:53 ../../include/text.php:1165
-msgid "September"
-msgstr "septiembre"
-
-#: ../../include/js_strings.php:54 ../../include/text.php:1165
-msgid "October"
-msgstr "octubre"
-
-#: ../../include/js_strings.php:55 ../../include/text.php:1165
-msgid "November"
-msgstr "noviembre"
-
-#: ../../include/js_strings.php:56 ../../include/text.php:1165
-msgid "December"
-msgstr "diciembre"
-
 #: ../../include/js_strings.php:57
 msgid "Jan"
 msgstr "ene"
@@ -530,34 +857,6 @@ msgstr "nov"
 msgid "Dec"
 msgstr "dic"
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1161
-msgid "Sunday"
-msgstr "domingo"
-
-#: ../../include/js_strings.php:70 ../../include/text.php:1161
-msgid "Monday"
-msgstr "lunes"
-
-#: ../../include/js_strings.php:71 ../../include/text.php:1161
-msgid "Tuesday"
-msgstr "martes"
-
-#: ../../include/js_strings.php:72 ../../include/text.php:1161
-msgid "Wednesday"
-msgstr "miércoles"
-
-#: ../../include/js_strings.php:73 ../../include/text.php:1161
-msgid "Thursday"
-msgstr "jueves"
-
-#: ../../include/js_strings.php:74 ../../include/text.php:1161
-msgid "Friday"
-msgstr "viernes"
-
-#: ../../include/js_strings.php:75 ../../include/text.php:1161
-msgid "Saturday"
-msgstr "sábado"
-
 #: ../../include/js_strings.php:76
 msgid "Sun"
 msgstr "dom"
@@ -619,7 +918,7 @@ msgstr "No se ha encontrado el nombre de usuario en el fichero importado."
 msgid "Import completed."
 msgstr "Importación completada."
 
-#: ../../include/comanche.php:34 ../../mod/admin.php:351
+#: ../../include/comanche.php:34 ../../mod/admin.php:356
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -630,148 +929,75 @@ msgstr "Predeterminado"
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../../include/items.php:1128 ../../include/items.php:1174
+#: ../../include/items.php:1130 ../../include/items.php:1176
 msgid "(Unknown)"
 msgstr "(Desconocido)"
 
-#: ../../include/items.php:1371
+#: ../../include/items.php:1373
 msgid "Visible to anybody on the internet."
 msgstr "Visible para cualquiera en internet."
 
-#: ../../include/items.php:1373
+#: ../../include/items.php:1375
 msgid "Visible to you only."
 msgstr "Visible sólo para usted."
 
-#: ../../include/items.php:1375
+#: ../../include/items.php:1377
 msgid "Visible to anybody in this network."
 msgstr "Visible para cualquiera en esta red."
 
-#: ../../include/items.php:1377
+#: ../../include/items.php:1379
 msgid "Visible to anybody authenticated."
 msgstr "Visible para cualquiera que haya sido autenticado."
 
-#: ../../include/items.php:1379
+#: ../../include/items.php:1381
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Visible para cualquiera en %s."
 
-#: ../../include/items.php:1381
+#: ../../include/items.php:1383
 msgid "Visible to all connections."
 msgstr "Visible para todas las conexiones."
 
-#: ../../include/items.php:1383
+#: ../../include/items.php:1385
 msgid "Visible to approved connections."
 msgstr "Visible para las conexiones permitidas."
 
-#: ../../include/items.php:1385
+#: ../../include/items.php:1387
 msgid "Visible to specific connections."
 msgstr "Visible para conexiones específicas."
 
-#: ../../include/items.php:4317 ../../mod/filestorage.php:27
-#: ../../mod/thing.php:86 ../../mod/admin.php:127 ../../mod/admin.php:1005
-#: ../../mod/admin.php:1210 ../../mod/display.php:36 ../../mod/viewsrc.php:20
+#: ../../include/items.php:4326 ../../mod/filestorage.php:27
+#: ../../mod/display.php:36 ../../mod/thing.php:86 ../../mod/admin.php:129
+#: ../../mod/admin.php:1017 ../../mod/admin.php:1222 ../../mod/viewsrc.php:20
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
-#: ../../include/items.php:4826 ../../mod/group.php:38 ../../mod/group.php:137
+#: ../../include/items.php:4838 ../../mod/group.php:38 ../../mod/group.php:137
 msgid "Collection not found."
 msgstr "Colección no encontrada."
 
-#: ../../include/items.php:4842
+#: ../../include/items.php:4854
 msgid "Collection is empty."
 msgstr "La colección está vacía."
 
-#: ../../include/items.php:4849
+#: ../../include/items.php:4861
 #, php-format
 msgid "Collection: %s"
 msgstr "Colección: %s"
 
-#: ../../include/items.php:4859 ../../mod/connedit.php:683
+#: ../../include/items.php:4871 ../../mod/connedit.php:683
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
 
-#: ../../include/items.php:4861
+#: ../../include/items.php:4873
 msgid "Connection not found."
 msgstr "Conexión no encontrada"
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "No se ha especificado ningún destinatario."
-
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[sin asunto]"
-
-#: ../../include/message.php:43
-msgid "Unable to determine sender."
-msgstr "No ha sido posible determinar el remitente. "
-
-#: ../../include/message.php:218
-msgid "Stored post could not be verified."
-msgstr "No se han podido verificar las entradas guardadas."
-
-#: ../../include/network.php:630
-msgid "view full size"
-msgstr "Ver en el tamaño original"
-
-#: ../../include/network.php:1608 ../../include/enotify.php:57
-msgid "$Projectname Notification"
-msgstr "Notificación de $Projectname"
-
-#: ../../include/network.php:1609 ../../include/enotify.php:58
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/network.php:1611 ../../include/enotify.php:60
-msgid "Thank You,"
-msgstr "Gracias,"
-
-#: ../../include/network.php:1613 ../../include/enotify.php:62
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Administrador"
-
-#: ../../include/network.php:1655 ../../include/account.php:316
-#: ../../include/account.php:343 ../../include/account.php:403
-msgid "Administrator"
-msgstr "Administrador"
-
-#: ../../include/network.php:1669
-msgid "No Subject"
-msgstr "Sin asunto"
-
-#: ../../include/event.php:22 ../../include/bb2diaspora.php:471
-#: ../../include/text.php:1392
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d de F, Y \\@ G:i"
-
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:477
-#: ../../include/text.php:1396
-msgid "Starts:"
-msgstr "Comienza:"
-
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:485
-#: ../../include/text.php:1400
-msgid "Finishes:"
-msgstr "Finaliza:"
-
-#: ../../include/event.php:52 ../../include/identity.php:1004
-#: ../../include/bb2diaspora.php:493 ../../include/text.php:1407
-#: ../../mod/directory.php:304
-msgid "Location:"
-msgstr "Ubicación:"
-
 #: ../../include/event.php:768
 msgid "This event has been added to your calendar."
 msgstr "Este evento ha sido añadido a su calendario."
 
-#: ../../include/event.php:904 ../../include/conversation.php:123
-#: ../../include/text.php:1919 ../../mod/tagger.php:47 ../../mod/like.php:363
-#: ../../mod/events.php:249
-msgid "event"
-msgstr "evento"
-
 #: ../../include/event.php:967
 msgid "Not specified"
 msgstr "Sin especificar"
@@ -836,7 +1062,7 @@ msgstr "Perfil principal"
 #: ../../mod/settings.php:343 ../../mod/settings.php:346
 #: ../../mod/settings.php:357
 msgid "Friends"
-msgstr "Amigos"
+msgstr "Amigos/as"
 
 #: ../../include/identity.php:770
 msgid "Requested channel is not available."
@@ -851,206 +1077,206 @@ msgstr "El canal solicitado no está disponible."
 msgid "Requested profile is not available."
 msgstr "El perfil solicitado no está disponible."
 
-#: ../../include/identity.php:966 ../../mod/profiles.php:782
+#: ../../include/identity.php:960 ../../mod/profiles.php:782
 msgid "Change profile photo"
 msgstr "Cambiar la foto del perfil"
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:966
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:966
 msgid "Manage/edit profiles"
 msgstr "Administrar/editar perfiles"
 
-#: ../../include/identity.php:973 ../../mod/profiles.php:783
+#: ../../include/identity.php:967 ../../mod/profiles.php:783
 msgid "Create New Profile"
 msgstr "Crear un nuevo perfil"
 
-#: ../../include/identity.php:976 ../../include/nav.php:90
+#: ../../include/identity.php:970 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr "Editar el perfil"
 
-#: ../../include/identity.php:988 ../../mod/profiles.php:794
+#: ../../include/identity.php:982 ../../mod/profiles.php:794
 msgid "Profile Image"
 msgstr "Imagen del perfil"
 
-#: ../../include/identity.php:991
+#: ../../include/identity.php:985
 msgid "visible to everybody"
 msgstr "visible para cualquiera"
 
-#: ../../include/identity.php:992 ../../mod/profiles.php:677
+#: ../../include/identity.php:986 ../../mod/profiles.php:677
 #: ../../mod/profiles.php:798
 msgid "Edit visibility"
 msgstr "Editar visibilidad"
 
-#: ../../include/identity.php:1008 ../../include/identity.php:1248
+#: ../../include/identity.php:1002 ../../include/identity.php:1242
 msgid "Gender:"
 msgstr "Género:"
 
-#: ../../include/identity.php:1009 ../../include/identity.php:1292
+#: ../../include/identity.php:1003 ../../include/identity.php:1286
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../../include/identity.php:1010 ../../include/identity.php:1303
+#: ../../include/identity.php:1004 ../../include/identity.php:1297
 msgid "Homepage:"
 msgstr "Página personal:"
 
-#: ../../include/identity.php:1011
+#: ../../include/identity.php:1005
 msgid "Online Now"
 msgstr "Ahora en línea"
 
-#: ../../include/identity.php:1095 ../../include/identity.php:1173
+#: ../../include/identity.php:1089 ../../include/identity.php:1167
 #: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../include/identity.php:1096 ../../include/identity.php:1174
+#: ../../include/identity.php:1090 ../../include/identity.php:1168
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:1141 ../../include/identity.php:1213
+#: ../../include/identity.php:1135 ../../include/identity.php:1207
 #: ../../mod/ping.php:341
 msgid "[today]"
 msgstr "[hoy]"
 
-#: ../../include/identity.php:1152
+#: ../../include/identity.php:1146
 msgid "Birthday Reminders"
 msgstr "Recordatorios de cumpleaños"
 
-#: ../../include/identity.php:1153
+#: ../../include/identity.php:1147
 msgid "Birthdays this week:"
 msgstr "Cumpleaños de esta semana:"
 
-#: ../../include/identity.php:1206
+#: ../../include/identity.php:1200
 msgid "[No description]"
 msgstr "[Sin descripción]"
 
-#: ../../include/identity.php:1224
+#: ../../include/identity.php:1218
 msgid "Event Reminders"
 msgstr "Recordatorios de eventos"
 
-#: ../../include/identity.php:1225
+#: ../../include/identity.php:1219
 msgid "Events this week:"
 msgstr "Eventos de esta semana:"
 
-#: ../../include/identity.php:1238 ../../include/identity.php:1355
+#: ../../include/identity.php:1232 ../../include/identity.php:1349
 #: ../../include/apps.php:138 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../../include/identity.php:1246 ../../mod/settings.php:1029
+#: ../../include/identity.php:1240 ../../mod/settings.php:1029
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: ../../include/identity.php:1253
+#: ../../include/identity.php:1247
 msgid "Like this channel"
 msgstr "Me gusta este canal"
 
-#: ../../include/identity.php:1264 ../../include/taxonomy.php:414
+#: ../../include/identity.php:1258 ../../include/taxonomy.php:414
 #: ../../include/conversation.php:1721 ../../include/ItemObject.php:179
-#: ../../mod/photos.php:1086
+#: ../../mod/photos.php:1083
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Me gusta"
 msgstr[1] "Me gusta"
 
-#: ../../include/identity.php:1277
+#: ../../include/identity.php:1271
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/identity.php:1278
+#: ../../include/identity.php:1272
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/identity.php:1285
+#: ../../include/identity.php:1279
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../../include/identity.php:1289 ../../mod/directory.php:299
+#: ../../include/identity.php:1283 ../../mod/directory.php:299
 msgid "Age:"
 msgstr "Edad:"
 
-#: ../../include/identity.php:1298
+#: ../../include/identity.php:1292
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "por %1$d %2$s"
 
-#: ../../include/identity.php:1301 ../../mod/profiles.php:699
+#: ../../include/identity.php:1295 ../../mod/profiles.php:699
 msgid "Sexual Preference:"
 msgstr "Orientación sexual:"
 
-#: ../../include/identity.php:1305 ../../mod/profiles.php:701
+#: ../../include/identity.php:1299 ../../mod/profiles.php:701
 #: ../../mod/directory.php:315
 msgid "Hometown:"
 msgstr "Ciudad de origen:"
 
-#: ../../include/identity.php:1307
+#: ../../include/identity.php:1301
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: ../../include/identity.php:1309 ../../mod/profiles.php:702
+#: ../../include/identity.php:1303 ../../mod/profiles.php:702
 msgid "Political Views:"
 msgstr "Posición política:"
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1305
 msgid "Religion:"
 msgstr "Religión:"
 
-#: ../../include/identity.php:1313 ../../mod/directory.php:317
+#: ../../include/identity.php:1307 ../../mod/directory.php:317
 msgid "About:"
 msgstr "Sobre mí:"
 
-#: ../../include/identity.php:1315
+#: ../../include/identity.php:1309
 msgid "Hobbies/Interests:"
 msgstr "Aficciones/Intereses:"
 
-#: ../../include/identity.php:1317 ../../mod/profiles.php:705
+#: ../../include/identity.php:1311 ../../mod/profiles.php:705
 msgid "Likes:"
 msgstr "Me gusta:"
 
-#: ../../include/identity.php:1319 ../../mod/profiles.php:706
+#: ../../include/identity.php:1313 ../../mod/profiles.php:706
 msgid "Dislikes:"
 msgstr "No me gusta:"
 
-#: ../../include/identity.php:1321
+#: ../../include/identity.php:1315
 msgid "Contact information and Social Networks:"
 msgstr "Información de contacto y redes sociales:"
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1317
 msgid "My other channels:"
 msgstr "Mis otros canales:"
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1319
 msgid "Musical interests:"
 msgstr "Intereses musicales:"
 
-#: ../../include/identity.php:1327
+#: ../../include/identity.php:1321
 msgid "Books, literature:"
 msgstr "Libros, literatura:"
 
-#: ../../include/identity.php:1329
+#: ../../include/identity.php:1323
 msgid "Television:"
 msgstr "Televisión:"
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1325
 msgid "Film/dance/culture/entertainment:"
 msgstr "Cine/danza/cultura/entretenimiento:"
 
-#: ../../include/identity.php:1333
+#: ../../include/identity.php:1327
 msgid "Love/Romance:"
 msgstr "Vida sentimental/amorosa:"
 
-#: ../../include/identity.php:1335
+#: ../../include/identity.php:1329
 msgid "Work/employment:"
 msgstr "Trabajo:"
 
-#: ../../include/identity.php:1337
+#: ../../include/identity.php:1331
 msgid "School/education:"
 msgstr "Estudios:"
 
-#: ../../include/identity.php:1357
+#: ../../include/identity.php:1351
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
@@ -1089,7 +1315,7 @@ msgstr "me gusta"
 
 #: ../../include/taxonomy.php:328
 msgid "likes"
-msgstr "le gusta"
+msgstr "gusta de"
 
 #: ../../include/taxonomy.php:329 ../../include/ItemObject.php:255
 msgid "dislike"
@@ -1097,32 +1323,67 @@ msgstr "no me gusta"
 
 #: ../../include/taxonomy.php:329
 msgid "dislikes"
-msgstr "no le gusta"
+msgstr "no gusta de"
+
+#: ../../include/photos.php:112
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "La imagen excede el límite de %lu bytes del sitio"
+
+#: ../../include/photos.php:119
+msgid "Image file is empty."
+msgstr "El fichero de imagen está vacío. "
+
+#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
+msgid "Unable to process image"
+msgstr "No ha sido posible procesar la imagen"
+
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr "La foto no ha podido ser guardada."
+
+#: ../../include/photos.php:297
+msgid "a new photo"
+msgstr "una nueva foto"
 
-#: ../../include/acl_selectors.php:240
+#: ../../include/photos.php:301
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s ha publicado %2$s en %3$s"
+
+#: ../../include/photos.php:506 ../../include/conversation.php:1625
+msgid "Photo Albums"
+msgstr "�lbumes de fotos"
+
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Subir nuevas fotos"
+
+#: ../../include/acl_selectors.php:218
 msgid "Visible to your default audience"
 msgstr "Visible para su público predeterminado."
 
-#: ../../include/acl_selectors.php:241
+#: ../../include/acl_selectors.php:243
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../../include/acl_selectors.php:242
+#: ../../include/acl_selectors.php:244
 msgid "Don't show"
 msgstr "No mostrar"
 
-#: ../../include/acl_selectors.php:247
+#: ../../include/acl_selectors.php:249
 msgid "Other networks and post services"
-msgstr "Otras redes y servicios de correo"
+msgstr "Otras redes y servicios de publicación"
 
-#: ../../include/acl_selectors.php:249 ../../mod/filestorage.php:147
-#: ../../mod/photos.php:631 ../../mod/photos.php:1001 ../../mod/thing.php:310
-#: ../../mod/thing.php:356 ../../mod/chat.php:211
+#: ../../include/acl_selectors.php:251 ../../mod/filestorage.php:147
+#: ../../mod/thing.php:310 ../../mod/thing.php:356 ../../mod/photos.php:631
+#: ../../mod/photos.php:998 ../../mod/chat.php:211
 msgid "Permissions"
 msgstr "Permisos"
 
-#: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:384
-#: ../../mod/photos.php:1218
+#: ../../include/acl_selectors.php:252 ../../include/ItemObject.php:384
+#: ../../mod/photos.php:1215
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1137,7 +1398,7 @@ msgstr "perfil público"
 #: ../../include/activities.php:59
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s cambió %2$s a &ldquo;%3$s&rdquo;"
+msgstr "%1$s ha cambiado %2$s a &ldquo;%3$s&rdquo;"
 
 #: ../../include/activities.php:60
 #, php-format
@@ -1157,68 +1418,60 @@ msgstr "Elemento no encontrado."
 msgid "No source file."
 msgstr "Ningún fichero de origen"
 
-#: ../../include/attach.php:514
+#: ../../include/attach.php:518
 msgid "Cannot locate file to replace"
 msgstr "No se puede localizar el fichero que va a ser sustituido."
 
-#: ../../include/attach.php:532
+#: ../../include/attach.php:536
 msgid "Cannot locate file to revise/update"
 msgstr "No se puede localizar el fichero para revisar/actualizar"
 
-#: ../../include/attach.php:667
+#: ../../include/attach.php:671
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "El fichero supera el limite de tamaño de %d"
 
-#: ../../include/attach.php:681
+#: ../../include/attach.php:685
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos."
 
-#: ../../include/attach.php:837
+#: ../../include/attach.php:841
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado."
 
-#: ../../include/attach.php:850
+#: ../../include/attach.php:854
 msgid "Stored file could not be verified. Upload failed."
 msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado."
 
-#: ../../include/attach.php:898 ../../include/attach.php:914
+#: ../../include/attach.php:902 ../../include/attach.php:918
 msgid "Path not available."
 msgstr "Ruta no disponible."
 
-#: ../../include/attach.php:960 ../../include/attach.php:1112
+#: ../../include/attach.php:964 ../../include/attach.php:1116
 msgid "Empty pathname"
 msgstr "Ruta vacía"
 
-#: ../../include/attach.php:986
+#: ../../include/attach.php:990
 msgid "duplicate filename or path"
 msgstr "Nombre duplicado de ruta o fichero"
 
-#: ../../include/attach.php:1008
+#: ../../include/attach.php:1012
 msgid "Path not found."
 msgstr "Ruta no encontrada"
 
-#: ../../include/attach.php:1066
+#: ../../include/attach.php:1070
 msgid "mkdir failed."
 msgstr "mkdir ha fallado."
 
-#: ../../include/attach.php:1070
+#: ../../include/attach.php:1074
 msgid "database storage failed."
 msgstr "el almacenamiento en la base de datos ha fallado."
 
-#: ../../include/attach.php:1118
+#: ../../include/attach.php:1122
 msgid "Empty path"
 msgstr "Ruta vacía"
 
-#: ../../include/bb2diaspora.php:382
-msgid "Attachments:"
-msgstr "Ficheros adjuntos:"
-
-#: ../../include/bb2diaspora.php:473
-msgid "$Projectname event notification:"
-msgstr "Notificación de eventos de $Projectname:"
-
 #: ../../include/notify.php:20
 msgid "created a new post"
 msgstr "ha creado una nueva entrada"
@@ -1282,12 +1535,6 @@ msgstr "Ejemplo: paco@ejemplo.com, http://ejemplo.com/paco"
 msgid "Notes"
 msgstr "Notas"
 
-#: ../../include/widgets.php:192 ../../include/text.php:868
-#: ../../include/text.php:880 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100
-#: ../../mod/admin.php:1442 ../../mod/admin.php:1462 ../../mod/filer.php:49
-msgid "Save"
-msgstr "Guardar"
-
 #: ../../include/widgets.php:266
 msgid "Remove term"
 msgstr "Eliminar término"
@@ -1329,7 +1576,7 @@ msgstr "Conocidos/as"
 #: ../../include/widgets.php:432 ../../mod/connedit.php:575
 #: ../../mod/connections.php:88 ../../mod/connections.php:103
 msgid "All"
-msgstr "Todas"
+msgstr "Todos/as"
 
 #: ../../include/widgets.php:451
 msgid "Refresh"
@@ -1345,11 +1592,11 @@ msgstr "Configuración del canal"
 
 #: ../../include/widgets.php:497
 msgid "Additional features"
-msgstr "Características adicionales"
+msgstr "Funcionalidades"
 
 #: ../../include/widgets.php:503
 msgid "Feature/Addon settings"
-msgstr "Configuración de características o complementos"
+msgstr "Complementos"
 
 #: ../../include/widgets.php:509
 msgid "Display settings"
@@ -1377,8 +1624,8 @@ msgid "Channel Sources"
 msgstr "Orígenes de los contenidos del canal"
 
 #: ../../include/widgets.php:554 ../../include/nav.php:202
-#: ../../include/apps.php:134 ../../mod/admin.php:1064
-#: ../../mod/admin.php:1264
+#: ../../include/apps.php:134 ../../mod/admin.php:1076
+#: ../../mod/admin.php:1276
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -1438,130 +1685,150 @@ msgstr "Eventos de la semana"
 msgid "Month View"
 msgstr "Eventos del mes"
 
-#: ../../include/widgets.php:674 ../../mod/events.php:669
+#: ../../include/widgets.php:674 ../../mod/events.php:654
 msgid "Export"
 msgstr "Exportar"
 
-#: ../../include/widgets.php:675 ../../mod/events.php:672
+#: ../../include/widgets.php:675 ../../mod/events.php:657
 msgid "Import"
 msgstr "Importar"
 
-#: ../../include/widgets.php:749
+#: ../../include/widgets.php:685
+msgid "Events Tools"
+msgstr "Gestión de eventos"
+
+#: ../../include/widgets.php:686
+msgid "Export Calendar"
+msgstr "Exportar el calendario"
+
+#: ../../include/widgets.php:687
+msgid "Import Calendar"
+msgstr "Importar un calendario"
+
+#: ../../include/widgets.php:761
 msgid "Chat Rooms"
 msgstr "Salas de chat"
 
-#: ../../include/widgets.php:769
+#: ../../include/widgets.php:781
 msgid "Bookmarked Chatrooms"
 msgstr "Salas de chat preferidas"
 
-#: ../../include/widgets.php:789
+#: ../../include/widgets.php:801
 msgid "Suggested Chatrooms"
 msgstr "Salas de chat sugeridas"
 
-#: ../../include/widgets.php:916 ../../include/widgets.php:974
+#: ../../include/widgets.php:928 ../../include/widgets.php:986
 msgid "photo/image"
 msgstr "foto/imagen"
 
-#: ../../include/widgets.php:1069 ../../include/widgets.php:1071
+#: ../../include/widgets.php:1081 ../../include/widgets.php:1083
 msgid "Rate Me"
 msgstr "Valorar este canal"
 
-#: ../../include/widgets.php:1075
+#: ../../include/widgets.php:1087
 msgid "View Ratings"
 msgstr "Mostrar las valoraciones"
 
-#: ../../include/widgets.php:1086
+#: ../../include/widgets.php:1098
 msgid "Public Hubs"
 msgstr "Servidores públicos"
 
-#: ../../include/widgets.php:1134
+#: ../../include/widgets.php:1146
 msgid "Forums"
 msgstr "Foros"
 
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1175
 msgid "Tasks"
 msgstr "Tareas"
 
-#: ../../include/widgets.php:1170
+#: ../../include/widgets.php:1184
 msgid "Documentation"
 msgstr "Documentación"
 
-#: ../../include/widgets.php:1172
+#: ../../include/widgets.php:1186
 msgid "Project/Site Information"
 msgstr "Información sobre el proyecto o sitio"
 
-#: ../../include/widgets.php:1173
+#: ../../include/widgets.php:1187
 msgid "For Members"
 msgstr "Para los usuarios"
 
-#: ../../include/widgets.php:1174
+#: ../../include/widgets.php:1188
 msgid "For Administrators"
 msgstr "Para los administradores"
 
-#: ../../include/widgets.php:1175
+#: ../../include/widgets.php:1189
 msgid "For Developers"
 msgstr "Para los desarrolladores"
 
-#: ../../include/widgets.php:1200 ../../mod/admin.php:434
+#: ../../include/widgets.php:1214 ../../mod/admin.php:446
 msgid "Site"
 msgstr "Sitio"
 
-#: ../../include/widgets.php:1201
+#: ../../include/widgets.php:1215
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../../include/widgets.php:1202 ../../mod/admin.php:965
+#: ../../include/widgets.php:1216 ../../mod/admin.php:977
 msgid "Channels"
 msgstr "Canales"
 
-#: ../../include/widgets.php:1203 ../../mod/admin.php:1062
-#: ../../mod/admin.php:1102
+#: ../../include/widgets.php:1217 ../../mod/admin.php:1074
+#: ../../mod/admin.php:1114
 msgid "Plugins"
 msgstr "Extensiones"
 
-#: ../../include/widgets.php:1204 ../../mod/admin.php:1262
-#: ../../mod/admin.php:1296
+#: ../../include/widgets.php:1218 ../../mod/admin.php:1274
+#: ../../mod/admin.php:1308
 msgid "Themes"
 msgstr "Temas"
 
-#: ../../include/widgets.php:1205
+#: ../../include/widgets.php:1219
 msgid "Inspect queue"
 msgstr "Examinar la cola"
 
-#: ../../include/widgets.php:1206
+#: ../../include/widgets.php:1220
 msgid "Profile Config"
 msgstr "Ajustes del perfil"
 
-#: ../../include/widgets.php:1207
+#: ../../include/widgets.php:1221
 msgid "DB updates"
 msgstr "Actualizaciones de la base de datos"
 
-#: ../../include/widgets.php:1225 ../../include/widgets.php:1231
-#: ../../mod/admin.php:1381
+#: ../../include/widgets.php:1239 ../../include/widgets.php:1245
+#: ../../mod/admin.php:1393
 msgid "Logs"
 msgstr "Informes"
 
-#: ../../include/widgets.php:1229 ../../include/nav.php:210
+#: ../../include/widgets.php:1243 ../../include/nav.php:210
 msgid "Admin"
 msgstr "Administrador"
 
-#: ../../include/widgets.php:1230
+#: ../../include/widgets.php:1244
 msgid "Plugin Features"
-msgstr "Ajustes de la extensión"
+msgstr "Extensiones"
 
-#: ../../include/widgets.php:1232
+#: ../../include/widgets.php:1246
 msgid "User registrations waiting for confirmation"
 msgstr "Registros de usuarios pendientes de confirmación"
 
-#: ../../include/widgets.php:1311 ../../mod/photos.php:753
-#: ../../mod/photos.php:1286
+#: ../../include/widgets.php:1324 ../../mod/photos.php:748
+#: ../../mod/photos.php:1283
 msgid "View Photo"
 msgstr "Ver foto"
 
-#: ../../include/widgets.php:1327 ../../mod/photos.php:782
+#: ../../include/widgets.php:1341 ../../mod/photos.php:779
 msgid "Edit Album"
 msgstr "Editar álbum"
 
+#: ../../include/bb2diaspora.php:376
+msgid "Attachments:"
+msgstr "Ficheros adjuntos:"
+
+#: ../../include/bb2diaspora.php:467
+msgid "$Projectname event notification:"
+msgstr "Notificación de eventos de $Projectname:"
+
 #: ../../include/bookmarks.php:35
 #, php-format
 msgid "%1$s's bookmarks"
@@ -1569,7 +1836,7 @@ msgstr "Marcadores de %1$s"
 
 #: ../../include/features.php:38
 msgid "General Features"
-msgstr "Características generales"
+msgstr "Funcionalidades básicas"
 
 #: ../../include/features.php:40
 msgid "Content Expiration"
@@ -1655,7 +1922,7 @@ msgstr "Les permite configurar restricciones y normas de uso a aquellos que cone
 
 #: ../../include/features.php:55
 msgid "Post Composition Features"
-msgstr "Características de composición de entradas"
+msgstr "Opciones para la redacción de entradas"
 
 #: ../../include/features.php:57
 msgid "Use Markdown"
@@ -1673,7 +1940,7 @@ msgstr "Fotos de gran tamaño"
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
-msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (6400px)"
+msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)"
 
 #: ../../include/features.php:59
 msgid "Automatically import channel content from other channels or feeds"
@@ -1690,7 +1957,7 @@ msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave
 
 #: ../../include/features.php:61
 msgid "Enable Voting Tools"
-msgstr "Activar herramientas de votación"
+msgstr "Permitir entradas con votación"
 
 #: ../../include/features.php:61
 msgid "Provide a class of post which others can vote on"
@@ -1760,7 +2027,7 @@ msgstr "Herramienta de afinidad"
 
 #: ../../include/features.php:75
 msgid "Filter stream activity by depth of relationships"
-msgstr "Filtrar la actividad del flujo por profundidad de relaciones"
+msgstr "Filtrar el contenido según la profundidad de las relaciones"
 
 #: ../../include/features.php:76
 msgid "Connection Filtering"
@@ -1780,7 +2047,7 @@ msgstr "Mostrar sugerencias de canales"
 
 #: ../../include/features.php:82
 msgid "Post/Comment Tools"
-msgstr "Herramientas de entradas/comentarios"
+msgstr "Gestión de entradas y comentarios"
 
 #: ../../include/features.php:83
 msgid "Tagging"
@@ -2078,11 +2345,11 @@ msgid "YYYY-MM-DD or MM-DD"
 msgstr "AAAA-MM-DD o MM-DD"
 
 #: ../../include/datetime.php:236 ../../mod/appman.php:91
-#: ../../mod/appman.php:92 ../../mod/events.php:452 ../../mod/events.php:457
+#: ../../mod/appman.php:92 ../../mod/events.php:437 ../../mod/events.php:442
 msgid "Required"
 msgstr "Obligatorio"
 
-#: ../../include/datetime.php:263 ../../boot.php:2289
+#: ../../include/datetime.php:263 ../../boot.php:2291
 msgid "never"
 msgstr "nunca"
 
@@ -2162,28 +2429,13 @@ msgstr "Cumpleaños de %1$s"
 msgid "Happy Birthday %1$s"
 msgstr "Feliz cumpleaños %1$s"
 
-#: ../../include/api.php:1302
+#: ../../include/api.php:1336
 msgid "Public Timeline"
 msgstr "Cronología pública"
 
-#: ../../include/conversation.php:120 ../../include/text.php:1916
-#: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
-msgid "photo"
-msgstr "foto"
-
 #: ../../include/conversation.php:126 ../../mod/like.php:113
 msgid "channel"
-msgstr "canal"
-
-#: ../../include/conversation.php:148 ../../include/text.php:1922
-#: ../../mod/like.php:361 ../../mod/subthread.php:83
-msgid "status"
-msgstr "el mensaje de estado"
-
-#: ../../include/conversation.php:150 ../../include/text.php:1924
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr "comentario"
+msgstr "el canal"
 
 #: ../../include/conversation.php:164 ../../mod/like.php:410
 #, php-format
@@ -2205,52 +2457,48 @@ msgstr "%1$s ahora está conectado/a con %2$s"
 msgid "%1$s poked %2$s"
 msgstr "%1$s ha dado un toque a %2$s"
 
-#: ../../include/conversation.php:243 ../../include/text.php:954
-msgid "poked"
-msgstr "ha recibido un toque"
-
 #: ../../include/conversation.php:260 ../../mod/mood.php:63
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s está %2$s"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1063
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1063
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Agree"
 msgstr "De acuerdo"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Disagree"
 msgstr "En desacuerdo"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Abstain"
 msgstr "Abstención"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Attending"
 msgstr "Participaré"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Not attending"
 msgstr "No participaré"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Might attend"
 msgstr "Quizá participe"
@@ -2305,8 +2553,8 @@ msgstr "Mostrar en su contexto"
 
 #: ../../include/conversation.php:740 ../../include/conversation.php:1227
 #: ../../include/ItemObject.php:389 ../../mod/editwebpage.php:190
-#: ../../mod/photos.php:1029 ../../mod/editblock.php:150
-#: ../../mod/editlayout.php:148 ../../mod/editpost.php:129
+#: ../../mod/editblock.php:150 ../../mod/editlayout.php:148
+#: ../../mod/photos.php:1026 ../../mod/editpost.php:129
 msgid "Please wait"
 msgstr "Espere por favor"
 
@@ -2324,7 +2572,7 @@ msgstr "Eliminar elementos seleccionados"
 
 #: ../../include/conversation.php:946
 msgid "View Source"
-msgstr "Ver la fuente original de la entrada"
+msgstr "Ver la fuente original de la publicación"
 
 #: ../../include/conversation.php:947
 msgid "Follow Thread"
@@ -2336,7 +2584,7 @@ msgstr "Dejar de seguir este hilo"
 
 #: ../../include/conversation.php:949
 msgid "View Status"
-msgstr "Ver el estado actual"
+msgstr "Ver mi estado actual"
 
 #: ../../include/conversation.php:950 ../../include/nav.php:86
 #: ../../mod/connedit.php:498
@@ -2349,7 +2597,7 @@ msgstr "Ver fotos"
 
 #: ../../include/conversation.php:952
 msgid "Activity/Posts"
-msgstr "Actividad y entradas"
+msgstr "Actividad y publicaciones"
 
 #: ../../include/conversation.php:954
 msgid "Edit Connection"
@@ -2412,8 +2660,8 @@ msgstr "a %s no le gusta esto."
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Visible para <strong>cualquiera</strong>"
 
-#: ../../include/conversation.php:1155 ../../mod/mail.php:194
-#: ../../mod/mail.php:308
+#: ../../include/conversation.php:1155 ../../mod/mail.php:202
+#: ../../mod/mail.php:316
 msgid "Please enter a link URL:"
 msgstr "Por favor, introduzca la dirección del enlace:"
 
@@ -2437,22 +2685,22 @@ msgstr "Guardar en carpeta:"
 msgid "Where are you right now?"
 msgstr "¿Donde está ahora?"
 
-#: ../../include/conversation.php:1161 ../../mod/mail.php:195
-#: ../../mod/mail.php:309 ../../mod/editpost.php:56
+#: ../../include/conversation.php:1161 ../../mod/editpost.php:56
+#: ../../mod/mail.php:203 ../../mod/mail.php:317
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Caduca YYYY-MM-DD HH:MM"
 
 #: ../../include/conversation.php:1169 ../../include/page_widgets.php:40
 #: ../../include/ItemObject.php:706 ../../mod/editwebpage.php:212
-#: ../../mod/photos.php:1049 ../../mod/editblock.php:171
-#: ../../mod/webpages.php:188 ../../mod/editpost.php:149
-#: ../../mod/events.php:473
+#: ../../mod/editblock.php:171 ../../mod/webpages.php:188
+#: ../../mod/photos.php:1046 ../../mod/editpost.php:149
+#: ../../mod/events.php:458
 msgid "Preview"
 msgstr "Previsualizar"
 
 #: ../../include/conversation.php:1192 ../../mod/blocks.php:154
-#: ../../mod/photos.php:1028 ../../mod/webpages.php:182
-#: ../../mod/layouts.php:184
+#: ../../mod/webpages.php:182 ../../mod/layouts.php:184
+#: ../../mod/photos.php:1025
 msgid "Share"
 msgstr "Compartir"
 
@@ -2506,7 +2754,7 @@ msgstr "subir foto"
 
 #: ../../include/conversation.php:1206 ../../mod/editwebpage.php:183
 #: ../../mod/editblock.php:143 ../../mod/editlayout.php:141
-#: ../../mod/mail.php:240 ../../mod/mail.php:369 ../../mod/editpost.php:119
+#: ../../mod/editpost.php:119 ../../mod/mail.php:248 ../../mod/mail.php:378
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
@@ -2516,7 +2764,7 @@ msgstr "adjuntar fichero"
 
 #: ../../include/conversation.php:1208 ../../mod/editwebpage.php:184
 #: ../../mod/editblock.php:144 ../../mod/editlayout.php:142
-#: ../../mod/mail.php:241 ../../mod/mail.php:370 ../../mod/editpost.php:120
+#: ../../mod/editpost.php:120 ../../mod/mail.php:249 ../../mod/mail.php:379
 msgid "Insert web link"
 msgstr "Insertar enlace web"
 
@@ -2577,7 +2825,7 @@ msgstr "Categorías (opcional, lista separada por comas)"
 
 #: ../../include/conversation.php:1228 ../../mod/editwebpage.php:191
 #: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
-#: ../../mod/editpost.php:130 ../../mod/events.php:474
+#: ../../mod/editpost.php:130 ../../mod/events.php:459
 msgid "Permission settings"
 msgstr "Configuración de permisos"
 
@@ -2599,7 +2847,7 @@ msgstr "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com"
 
 #: ../../include/conversation.php:1252 ../../mod/editwebpage.php:217
 #: ../../mod/editblock.php:176 ../../mod/editlayout.php:173
-#: ../../mod/mail.php:245 ../../mod/mail.php:374 ../../mod/editpost.php:155
+#: ../../mod/editpost.php:155 ../../mod/mail.php:253 ../../mod/mail.php:383
 msgid "Set expiration date"
 msgstr "Configurar fecha de caducidad"
 
@@ -2608,7 +2856,7 @@ msgid "Set publish date"
 msgstr "Establecer la fecha de publicación"
 
 #: ../../include/conversation.php:1257 ../../include/ItemObject.php:709
-#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:157
+#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385
 msgid "Encrypt text"
 msgstr "Cifrar texto"
 
@@ -2616,8 +2864,8 @@ msgstr "Cifrar texto"
 msgid "OK"
 msgstr "OK"
 
-#: ../../include/conversation.php:1260 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../include/conversation.php:1260 ../../mod/fbrowser.php:77
+#: ../../mod/fbrowser.php:112 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
 #: ../../mod/settings.php:587 ../../mod/settings.php:613
 #: ../../mod/editpost.php:160
 msgid "Cancel"
@@ -2629,7 +2877,7 @@ msgstr "Descubrir"
 
 #: ../../include/conversation.php:1506
 msgid "Imported public streams"
-msgstr "Flujos públicos importados"
+msgstr "Contenidos públicos importados"
 
 #: ../../include/conversation.php:1511
 msgid "Commented Order"
@@ -2658,7 +2906,7 @@ msgstr "Nuevas"
 
 #: ../../include/conversation.php:1538
 msgid "Activity Stream - by date"
-msgstr "Flujo de actividad - por fecha"
+msgstr "Contenido - por fecha"
 
 #: ../../include/conversation.php:1544
 msgid "Starred"
@@ -2676,7 +2924,7 @@ msgstr "Correo basura"
 msgid "Posts flagged as SPAM"
 msgstr "Publicaciones marcadas como basura"
 
-#: ../../include/conversation.php:1601 ../../mod/admin.php:973
+#: ../../include/conversation.php:1601 ../../mod/admin.php:985
 msgid "Channel"
 msgstr "Canal"
 
@@ -2697,10 +2945,6 @@ msgstr "Detalles del perfil"
 msgid "Photos"
 msgstr "Fotos"
 
-#: ../../include/conversation.php:1625 ../../include/photos.php:483
-msgid "Photo Albums"
-msgstr "�lbumes de fotos"
-
 #: ../../include/conversation.php:1632
 msgid "Files and Storage"
 msgstr "Ficheros y repositorio"
@@ -2728,13 +2972,13 @@ msgid "Manage Webpages"
 msgstr "Administrar páginas web"
 
 #: ../../include/conversation.php:1697 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1082
-#: ../../mod/photos.php:1094
+#: ../../include/ItemObject.php:187 ../../mod/photos.php:1079
+#: ../../mod/photos.php:1091
 msgid "View all"
 msgstr "Ver todo"
 
 #: ../../include/conversation.php:1724 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1091
+#: ../../mod/photos.php:1088
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -2832,8 +3076,8 @@ msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:79 ../../mod/id.php:15
-#: ../../mod/id.php:16 ../../mod/admin.php:805 ../../mod/admin.php:814
-#: ../../boot.php:1488
+#: ../../mod/id.php:16 ../../mod/admin.php:817 ../../mod/admin.php:826
+#: ../../boot.php:1490
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -2861,23 +3105,6 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/zot.php:685
-msgid "Invalid data packet"
-msgstr "Paquete de datos no válido"
-
-#: ../../include/zot.php:701
-msgid "Unable to verify channel signature"
-msgstr "No ha sido posible de verificar la firma del canal"
-
-#: ../../include/zot.php:2265
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "No ha sido posible de verificar la firma del sitio para %s"
-
-#: ../../include/zot.php:3592
-msgid "invalid target signature"
-msgstr "La firma recibida no es válida"
-
 #: ../../include/bbcode.php:123 ../../include/bbcode.php:794
 #: ../../include/bbcode.php:797 ../../include/bbcode.php:802
 #: ../../include/bbcode.php:805 ../../include/bbcode.php:808
@@ -2939,7 +3166,7 @@ msgstr "$1 spoiler"
 
 #: ../../include/bbcode.php:782
 msgid "$1 wrote:"
-msgstr "$1 escribió"
+msgstr "$1 escribió:"
 
 #: ../../include/contact_widgets.php:14
 #, php-format
@@ -2948,7 +3175,7 @@ msgid_plural "%d invitations available"
 msgstr[0] "%d invitación pendiente"
 msgstr[1] "%d invitaciones disponibles"
 
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:439
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:451
 msgid "Advanced"
 msgstr "Avanzado"
 
@@ -3001,46 +3228,22 @@ msgstr[1] "%d conexiones en común"
 msgid "show more"
 msgstr "mostrar más"
 
-#: ../../include/dir_fns.php:139
-msgid "Directory Options"
-msgstr "Opciones del directorio"
-
-#: ../../include/dir_fns.php:141
-msgid "Safe Mode"
-msgstr "Modo seguro"
-
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:106
-#: ../../mod/photos.php:626 ../../mod/admin.php:410 ../../mod/settings.php:577
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:462
-#: ../../mod/events.php:463 ../../mod/events.php:472 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490
-msgid "No"
-msgstr "No"
+#: ../../include/enotify.php:57 ../../include/network.php:1608
+msgid "$Projectname Notification"
+msgstr "Notificación de $Projectname"
 
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/api.php:105 ../../mod/photos.php:626 ../../mod/admin.php:412
-#: ../../mod/settings.php:577 ../../mod/menu.php:96 ../../mod/menu.php:153
-#: ../../mod/events.php:462 ../../mod/events.php:463 ../../mod/events.php:472
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490
-msgid "Yes"
-msgstr "Sí"
+#: ../../include/enotify.php:58 ../../include/network.php:1609
+msgid "$projectname"
+msgstr "$projectname"
 
-#: ../../include/dir_fns.php:142
-msgid "Public Forums Only"
-msgstr "Solo foros públicos"
+#: ../../include/enotify.php:60 ../../include/network.php:1611
+msgid "Thank You,"
+msgstr "Gracias,"
 
-#: ../../include/dir_fns.php:143
-msgid "This Website Only"
-msgstr "Solo este sitio web"
+#: ../../include/enotify.php:62 ../../include/network.php:1613
+#, php-format
+msgid "%s Administrator"
+msgstr "%s Administrador"
 
 #: ../../include/enotify.php:96
 #, php-format
@@ -3060,7 +3263,7 @@ msgstr "%1$s, %2$s le ha enviado un nuevo mensaje privado en %3$s."
 #: ../../include/enotify.php:103
 #, php-format
 msgid "%1$s sent you %2$s."
-msgstr "%1$s le envió %2$s."
+msgstr "%1$s le ha enviado %2$s."
 
 #: ../../include/enotify.php:103
 msgid "a private message"
@@ -3106,17 +3309,17 @@ msgstr "Para ver o comentar la conversación, visite %s"
 #: ../../include/enotify.php:198
 #, php-format
 msgid "[Hubzilla:Notify] %s posted to your profile wall"
-msgstr "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil"
+msgstr "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")"
 
 #: ../../include/enotify.php:200
 #, php-format
 msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s publicó en su página del perfil en %3$s"
+msgstr "%1$s, %2$s ha publicado en su página del perfil en %3$s"
 
 #: ../../include/enotify.php:202
 #, php-format
 msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s publicó en [zrl=%3$s]su página del perfil[/zrl]"
+msgstr "%1$s, %2$s ha publicado en [zrl=%3$s]su página del perfil[/zrl]"
 
 #: ../../include/enotify.php:226
 #, php-format
@@ -3126,7 +3329,7 @@ msgstr "[Hubzilla:Aviso] %s le ha etiquetado"
 #: ../../include/enotify.php:227
 #, php-format
 msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s le etiquetó en %3$s"
+msgstr "%1$s, %2$s le ha etiquetado en %3$s"
 
 #: ../../include/enotify.php:228
 #, php-format
@@ -3141,12 +3344,12 @@ msgstr "[Hubzilla:Aviso] %1$s le ha dado un toque"
 #: ../../include/enotify.php:241
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s le dio un toque en %3$s"
+msgstr "%1$s, %2$s le ha dado un toque en %3$s"
 
 #: ../../include/enotify.php:242
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]le dio un toque[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]le ha dado un toque[/zrl]."
 
 #: ../../include/enotify.php:258
 #, php-format
@@ -3161,7 +3364,7 @@ msgstr "%1$s, %2$s ha etiquetado su publicación en %3$s"
 #: ../../include/enotify.php:260
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s etiquetó [zrl=%3$s]su publicación[/zrl]"
+msgstr "%1$s, %2$s ha etiquetado [zrl=%3$s]su publicación[/zrl]"
 
 #: ../../include/enotify.php:272
 msgid "[Hubzilla:Notify] Introduction received"
@@ -3237,19 +3440,19 @@ msgstr "Respuesta incompleta del canal."
 msgid "Channel was deleted and no longer exists."
 msgstr "El canal ha sido eliminado y ya no existe."
 
-#: ../../include/follow.php:152 ../../include/follow.php:180
+#: ../../include/follow.php:153 ../../include/follow.php:183
 msgid "Protocol disabled."
 msgstr "Protocolo deshabilitado."
 
-#: ../../include/follow.php:170
+#: ../../include/follow.php:173
 msgid "Channel discovery failed."
 msgstr "El intento de acceder al canal ha fallado."
 
-#: ../../include/follow.php:196
+#: ../../include/follow.php:199
 msgid "local account not found."
 msgstr "No se ha encontrado la cuenta local."
 
-#: ../../include/follow.php:220
+#: ../../include/follow.php:224
 msgid "Cannot connect to yourself."
 msgstr "No puede conectarse consigo mismo."
 
@@ -3261,7 +3464,23 @@ msgstr "Contenido incorporado"
 msgid "Embedding disabled"
 msgstr "Incrustación deshabilitada"
 
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1485
+#: ../../include/message.php:19
+msgid "No recipient provided."
+msgstr "No se ha especificado ningún destinatario."
+
+#: ../../include/message.php:24
+msgid "[no subject]"
+msgstr "[sin asunto]"
+
+#: ../../include/message.php:44
+msgid "Unable to determine sender."
+msgstr "No ha sido posible determinar el remitente. "
+
+#: ../../include/message.php:219
+msgid "Stored post could not be verified."
+msgstr "No se han podido verificar las publicaciones guardadas."
+
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1487
 msgid "Logout"
 msgstr "Finalizar sesión"
 
@@ -3275,7 +3494,7 @@ msgstr "Inicio"
 
 #: ../../include/nav.php:85
 msgid "Your posts and conversations"
-msgstr "Sus entradas y conversaciones"
+msgstr "Sus publicaciones y conversaciones"
 
 #: ../../include/nav.php:86
 msgid "Your profile page"
@@ -3317,7 +3536,7 @@ msgstr "Sus marcadores"
 msgid "Your webpages"
 msgstr "Sus páginas web"
 
-#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1486
+#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1488
 msgid "Login"
 msgstr "Iniciar sesión"
 
@@ -3342,7 +3561,7 @@ msgstr "Pulsar para identificarse en su servidor de inicio"
 msgid "Home Page"
 msgstr "Página de inicio"
 
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1462
+#: ../../include/nav.php:149 ../../mod/register.php:226 ../../boot.php:1470
 msgid "Register"
 msgstr "Registrarse"
 
@@ -3351,7 +3570,7 @@ msgid "Create an account"
 msgstr "Crear una cuenta"
 
 #: ../../include/nav.php:154 ../../include/apps.php:142
-#: ../../mod/layouts.php:176 ../../mod/help.php:202 ../../mod/help.php:207
+#: ../../mod/layouts.php:176 ../../mod/help.php:204 ../../mod/help.php:209
 msgid "Help"
 msgstr "Ayuda"
 
@@ -3363,12 +3582,6 @@ msgstr "Ayuda y documentación"
 msgid "Applications, utilities, links, games"
 msgstr "Aplicaciones, utilidades, enlaces, juegos"
 
-#: ../../include/nav.php:159 ../../include/text.php:867
-#: ../../include/text.php:879 ../../include/apps.php:147
-#: ../../mod/search.php:40
-msgid "Search"
-msgstr "Buscar"
-
 #: ../../include/nav.php:159
 msgid "Search site @name, #tag, ?docs, content"
 msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido"
@@ -3488,244 +3701,46 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado"
 
-#: ../../include/text.php:394
-msgid "prev"
-msgstr "anterior"
-
-#: ../../include/text.php:396
-msgid "first"
-msgstr "primera"
-
-#: ../../include/text.php:425
-msgid "last"
-msgstr "última"
-
-#: ../../include/text.php:428
-msgid "next"
-msgstr "próxima"
-
-#: ../../include/text.php:438
-msgid "older"
-msgstr "más antiguas"
-
-#: ../../include/text.php:440
-msgid "newer"
-msgstr "más recientes"
-
-#: ../../include/text.php:785
-msgid "No connections"
-msgstr "Sin conexiones"
-
-#: ../../include/text.php:797
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d Conexión"
-msgstr[1] "%d Conexiones"
-
-#: ../../include/text.php:810 ../../mod/viewconnections.php:101
-msgid "View Connections"
-msgstr "Ver conexiones"
-
-#: ../../include/text.php:954
-msgid "poke"
-msgstr "un toque"
-
-#: ../../include/text.php:955
-msgid "ping"
-msgstr "un \"ping\""
-
-#: ../../include/text.php:955
-msgid "pinged"
-msgstr "avisado/a"
-
-#: ../../include/text.php:956
-msgid "prod"
-msgstr "una incitación"
-
-#: ../../include/text.php:956
-msgid "prodded"
-msgstr "ha recibido una incitación"
-
-#: ../../include/text.php:957
-msgid "slap"
-msgstr "una bofetada"
-
-#: ../../include/text.php:957
-msgid "slapped"
-msgstr "ha recibido una bofetada"
-
-#: ../../include/text.php:958
-msgid "finger"
-msgstr "un \"finger\""
-
-#: ../../include/text.php:958
-msgid "fingered"
-msgstr "ha recibido un \"finger\""
-
-#: ../../include/text.php:959
-msgid "rebuff"
-msgstr "un rechazo"
-
-#: ../../include/text.php:959
-msgid "rebuffed"
-msgstr "ha sido rechazado/a"
-
-#: ../../include/text.php:969
-msgid "happy"
-msgstr "feliz"
-
-#: ../../include/text.php:970
-msgid "sad"
-msgstr "triste"
-
-#: ../../include/text.php:971
-msgid "mellow"
-msgstr "amable"
-
-#: ../../include/text.php:972
-msgid "tired"
-msgstr "cansado/a"
-
-#: ../../include/text.php:973
-msgid "perky"
-msgstr "fresco/a"
-
-#: ../../include/text.php:974
-msgid "angry"
-msgstr "enfadado/a"
-
-#: ../../include/text.php:975
-msgid "stupified"
-msgstr "estupefacto/a"
-
-#: ../../include/text.php:976
-msgid "puzzled"
-msgstr "perplejo/a"
-
-#: ../../include/text.php:977
-msgid "interested"
-msgstr "interesado/a"
-
-#: ../../include/text.php:978
-msgid "bitter"
-msgstr "amargado/a"
-
-#: ../../include/text.php:979
-msgid "cheerful"
-msgstr "alegre"
-
-#: ../../include/text.php:980
-msgid "alive"
-msgstr "vivo/a"
-
-#: ../../include/text.php:981
-msgid "annoyed"
-msgstr "molesto/a"
-
-#: ../../include/text.php:982
-msgid "anxious"
-msgstr "ansioso/a"
-
-#: ../../include/text.php:983
-msgid "cranky"
-msgstr "de mal humor"
-
-#: ../../include/text.php:984
-msgid "disturbed"
-msgstr "perturbado/a"
-
-#: ../../include/text.php:985
-msgid "frustrated"
-msgstr "frustrado/a"
-
-#: ../../include/text.php:986
-msgid "depressed"
-msgstr "deprimido/a"
-
-#: ../../include/text.php:987
-msgid "motivated"
-msgstr "motivado/a"
-
-#: ../../include/text.php:988
-msgid "relaxed"
-msgstr "relajado/a"
-
-#: ../../include/text.php:989
-msgid "surprised"
-msgstr "sorprendido/a"
-
-#: ../../include/text.php:1165
-msgid "May"
-msgstr "mayo"
-
-#: ../../include/text.php:1242 ../../include/text.php:1246
-msgid "Unknown Attachment"
-msgstr "Adjunto no reconocido"
-
-#: ../../include/text.php:1248
-msgid "unknown"
-msgstr "desconocido"
-
-#: ../../include/text.php:1284
-msgid "remove category"
-msgstr "eliminar categoría"
-
-#: ../../include/text.php:1361
-msgid "remove from file"
-msgstr "eliminar del fichero"
-
-#: ../../include/text.php:1507 ../../include/text.php:1518
-msgid "Click to open/close"
-msgstr "Pulsar para abrir/cerrar"
-
-#: ../../include/text.php:1692 ../../mod/events.php:638
-msgid "Link to Source"
-msgstr "Enlazar con la entrada en su ubicación original"
-
-#: ../../include/text.php:1713 ../../include/text.php:1785
-msgid "default"
-msgstr "por defecto"
-
-#: ../../include/text.php:1721
-msgid "Page layout"
-msgstr "Formato de la página"
-
-#: ../../include/text.php:1721
-msgid "You can create your own with the layouts tool"
-msgstr "Puede crear su propio formato gráfico con las herramientas de diseño"
-
-#: ../../include/text.php:1763
-msgid "Page content type"
-msgstr "Tipo de contenido de página"
-
-#: ../../include/text.php:1797
-msgid "Select an alternate language"
-msgstr "Seleccionar un idioma alternativo"
-
-#: ../../include/text.php:1929
-msgid "activity"
-msgstr "actividad"
+#: ../../include/dir_fns.php:139
+msgid "Directory Options"
+msgstr "Opciones del directorio"
 
-#: ../../include/text.php:2224
-msgid "Design Tools"
-msgstr "Herramientas de diseño"
+#: ../../include/dir_fns.php:141
+msgid "Safe Mode"
+msgstr "Modo seguro"
 
-#: ../../include/text.php:2227 ../../mod/blocks.php:147
-msgid "Blocks"
-msgstr "Bloques"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:102
+#: ../../mod/admin.php:415 ../../mod/settings.php:577 ../../mod/photos.php:626
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:447
+#: ../../mod/events.php:448 ../../mod/events.php:457 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1492
+msgid "No"
+msgstr "No"
 
-#: ../../include/text.php:2228 ../../mod/menu.php:103
-msgid "Menus"
-msgstr "Menús"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/api.php:101 ../../mod/admin.php:417 ../../mod/settings.php:577
+#: ../../mod/photos.php:626 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1492
+msgid "Yes"
+msgstr "Sí"
 
-#: ../../include/text.php:2229 ../../mod/layouts.php:174
-msgid "Layouts"
-msgstr "Formato gráfico"
+#: ../../include/dir_fns.php:142
+msgid "Public Forums Only"
+msgstr "Solo foros públicos"
 
-#: ../../include/text.php:2230
-msgid "Pages"
-msgstr "Páginas"
+#: ../../include/dir_fns.php:143
+msgid "This Website Only"
+msgstr "Solo este sitio web"
 
 #: ../../include/group.php:26
 msgid ""
@@ -3738,7 +3753,7 @@ msgstr "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posi
 msgid "Add new connections to this collection (privacy group)"
 msgstr "Añadir nuevas conexiones a esta colección (privacidad del grupo)"
 
-#: ../../include/group.php:251 ../../mod/admin.php:814
+#: ../../include/group.php:251 ../../mod/admin.php:826
 msgid "All Channels"
 msgstr "Todos los canales"
 
@@ -3762,6 +3777,23 @@ msgstr "Añadir nueva colección"
 msgid "Channels not in any collection"
 msgstr "El canal no se encuentra en ninguna colección"
 
+#: ../../include/zot.php:676
+msgid "Invalid data packet"
+msgstr "Paquete de datos no válido"
+
+#: ../../include/zot.php:692
+msgid "Unable to verify channel signature"
+msgstr "No ha sido posible de verificar la firma del canal"
+
+#: ../../include/zot.php:2268
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "No ha sido posible de verificar la firma del sitio para %s"
+
+#: ../../include/zot.php:3584
+msgid "invalid target signature"
+msgstr "La firma recibida no es válida"
+
 #: ../../include/page_widgets.php:6
 msgid "New Page"
 msgstr "Nueva página"
@@ -3793,32 +3825,24 @@ msgstr "Creado"
 msgid "Edited"
 msgstr "Editado"
 
+#: ../../include/network.php:630
+msgid "view full size"
+msgstr "Ver en el tamaño original"
+
+#: ../../include/network.php:1655 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../../include/network.php:1669
+msgid "No Subject"
+msgstr "Sin asunto"
+
 #: ../../include/dba/dba_driver.php:141
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "No se ha podido localizar información de DNS para el servidor de base de datos “%s�"
 
-#: ../../include/photos.php:112
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "La imagen excede el límite de %lu bytes del sitio"
-
-#: ../../include/photos.php:119
-msgid "Image file is empty."
-msgstr "El fichero de imagen está vacío. "
-
-#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
-msgid "Unable to process image"
-msgstr "No ha sido posible procesar la imagen"
-
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr "La foto no ha podido ser guardada."
-
-#: ../../include/photos.php:487
-msgid "Upload New Photos"
-msgstr "Subir nuevas fotos"
-
 #: ../../include/ItemObject.php:130
 msgid "Save to Folder"
 msgstr "Guardar en carpeta"
@@ -3867,11 +3891,11 @@ msgstr "preferidas"
 msgid "Add Tag"
 msgstr "Añadir etiqueta"
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:1026
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
 msgid "I like this (toggle)"
 msgstr "me gusta (cambiar)"
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:1027
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
 msgid "I don't like this (toggle)"
 msgstr "No me gusta esto (cambiar)"
 
@@ -3909,11 +3933,11 @@ msgstr "mediante"
 
 #: ../../include/ItemObject.php:321
 msgid "Wall-to-Wall"
-msgstr "De página del perfil a página del perfil (de Muro a Muro)"
+msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")"
 
 #: ../../include/ItemObject.php:322
 msgid "via Wall-To-Wall:"
-msgstr "Mediante el procedimiento página del perfil a página del perfil (de Muro a Muro)"
+msgstr "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")"
 
 #: ../../include/ItemObject.php:362
 msgid "Save Bookmarks"
@@ -3927,18 +3951,18 @@ msgstr "Añadir al calendario"
 msgid "Mark all seen"
 msgstr "Marcar todo como visto"
 
-#: ../../include/ItemObject.php:378 ../../mod/photos.php:1212
+#: ../../include/ItemObject.php:378 ../../mod/photos.php:1209
 msgctxt "noun"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../include/ItemObject.php:379 ../../mod/photos.php:1213
+#: ../../include/ItemObject.php:379 ../../mod/photos.php:1210
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../include/ItemObject.php:694 ../../mod/photos.php:1045
-#: ../../mod/photos.php:1163
+#: ../../include/ItemObject.php:694 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
 msgid "This is you"
 msgstr "Este es usted"
 
@@ -3954,78 +3978,6 @@ msgstr "Insertar enlace"
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../../include/account.php:27
-msgid "Not a valid email address"
-msgstr "Dirección de correo no válida"
-
-#: ../../include/account.php:29
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Su dirección de correo no pertenece a ninguno de los dominios permitidos en este sitio."
-
-#: ../../include/account.php:35
-msgid "Your email address is already registered at this site."
-msgstr "Su dirección de correo está ya registrada en este sitio."
-
-#: ../../include/account.php:67
-msgid "An invitation is required."
-msgstr "Es obligatorio que le inviten."
-
-#: ../../include/account.php:71
-msgid "Invitation could not be verified."
-msgstr "No se ha podido verificar su invitación."
-
-#: ../../include/account.php:121
-msgid "Please enter the required information."
-msgstr "Por favor introduzca la información requerida."
-
-#: ../../include/account.php:188
-msgid "Failed to store account information."
-msgstr "La información de la cuenta no se ha podido guardar."
-
-#: ../../include/account.php:248
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Confirmación de registro para %s"
-
-#: ../../include/account.php:314
-#, php-format
-msgid "Registration request at %s"
-msgstr "Solicitud de registro en %s"
-
-#: ../../include/account.php:338
-msgid "your registration password"
-msgstr "su contraseña de registro"
-
-#: ../../include/account.php:341 ../../include/account.php:401
-#, php-format
-msgid "Registration details for %s"
-msgstr "Detalles del registro de %s"
-
-#: ../../include/account.php:410
-msgid "Account approved."
-msgstr "Cuenta aprobada."
-
-#: ../../include/account.php:449
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registro revocado para %s"
-
-#: ../../include/account.php:494
-msgid "Account verified. Please login."
-msgstr "Cuenta verificada. Por favor, inicie sesión."
-
-#: ../../include/account.php:707 ../../include/account.php:709
-msgid "Click here to upgrade."
-msgstr "Pulse aquí para actualizar"
-
-#: ../../include/account.php:715
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Esta acción supera los límites establecidos por su plan de suscripción "
-
-#: ../../include/account.php:720
-msgid "This action is not available under your subscription plan."
-msgstr "Esta acción no está disponible en su plan de suscripción."
-
 #: ../../include/apps.php:128
 msgid "Site Admin"
 msgstr "Adminstrador del sitio"
@@ -4056,7 +4008,7 @@ msgstr "Invitar"
 
 #: ../../include/apps.php:152
 msgid "Features"
-msgstr "Características"
+msgstr "Funcionalidades"
 
 #: ../../include/apps.php:153 ../../mod/id.php:28
 msgid "Language"
@@ -4086,7 +4038,7 @@ msgstr "Comprar"
 
 #: ../../include/permissions.php:26
 msgid "Can view my normal stream and posts"
-msgstr "Pueden verse mi flujo de actividad y publicaciones normales"
+msgstr "Pueden verse mi actividad y publicaciones normales"
 
 #: ../../include/permissions.php:27
 msgid "Can view my default channel profile"
@@ -4106,7 +4058,7 @@ msgstr "Pueden verse mis páginas web"
 
 #: ../../include/permissions.php:33
 msgid "Can send me their channel stream and posts"
-msgstr "Me pueden enviar sus entradas y flujo de actividad del canal"
+msgstr "Me pueden enviar sus entradas y contenidos del canal"
 
 #: ../../include/permissions.php:34
 msgid "Can post on my channel page (\"wall\")"
@@ -4207,12 +4159,84 @@ msgstr "Repositorio de grupo"
 msgid "Custom/Expert Mode"
 msgstr "Modo personalizado/experto"
 
-#: ../../include/photo/photo_driver.php:719 ../../mod/photos.php:94
-#: ../../mod/photos.php:699 ../../mod/profile_photo.php:147
+#: ../../include/photo/photo_driver.php:719 ../../mod/profile_photo.php:147
 #: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:379
+#: ../../mod/photos.php:94 ../../mod/photos.php:699
 msgid "Profile Photos"
 msgstr "Fotos del perfil"
 
+#: ../../include/account.php:27
+msgid "Not a valid email address"
+msgstr "Dirección de correo no válida"
+
+#: ../../include/account.php:29
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Su dirección de correo no pertenece a ninguno de los dominios permitidos en este sitio."
+
+#: ../../include/account.php:35
+msgid "Your email address is already registered at this site."
+msgstr "Su dirección de correo está ya registrada en este sitio."
+
+#: ../../include/account.php:67
+msgid "An invitation is required."
+msgstr "Es obligatorio que le inviten."
+
+#: ../../include/account.php:71
+msgid "Invitation could not be verified."
+msgstr "No se ha podido verificar su invitación."
+
+#: ../../include/account.php:121
+msgid "Please enter the required information."
+msgstr "Por favor introduzca la información requerida."
+
+#: ../../include/account.php:188
+msgid "Failed to store account information."
+msgstr "La información de la cuenta no se ha podido guardar."
+
+#: ../../include/account.php:248
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr "Confirmación de registro para %s"
+
+#: ../../include/account.php:314
+#, php-format
+msgid "Registration request at %s"
+msgstr "Solicitud de registro en %s"
+
+#: ../../include/account.php:338
+msgid "your registration password"
+msgstr "su contraseña de registro"
+
+#: ../../include/account.php:341 ../../include/account.php:401
+#, php-format
+msgid "Registration details for %s"
+msgstr "Detalles del registro de %s"
+
+#: ../../include/account.php:410
+msgid "Account approved."
+msgstr "Cuenta aprobada."
+
+#: ../../include/account.php:449
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registro revocado para %s"
+
+#: ../../include/account.php:494
+msgid "Account verified. Please login."
+msgstr "Cuenta verificada. Por favor, inicie sesión."
+
+#: ../../include/account.php:707 ../../include/account.php:709
+msgid "Click here to upgrade."
+msgstr "Pulse aquí para actualizar"
+
+#: ../../include/account.php:715
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Esta acción supera los límites establecidos por su plan de suscripción "
+
+#: ../../include/account.php:720
+msgid "This action is not available under your subscription plan."
+msgstr "Esta acción no está disponible en su plan de suscripción."
+
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
 msgstr "Permiso denegado"
@@ -4305,36 +4329,36 @@ msgstr "Todos los canales conectados"
 msgid "Click on a channel to add or remove."
 msgstr "Haga clic en un canal para agregarlo o quitarlo."
 
-#: ../../mod/item.php:173
+#: ../../mod/item.php:174
 msgid "Unable to locate original post."
 msgstr "No ha sido posible encontrar la entrada original."
 
-#: ../../mod/item.php:417
+#: ../../mod/item.php:418
 msgid "Empty post discarded."
 msgstr "La entrada vacía ha sido desechada."
 
-#: ../../mod/item.php:457
+#: ../../mod/item.php:458
 msgid "Executable content type not permitted to this channel."
 msgstr "Contenido de tipo ejecutable no permitido en este canal."
 
-#: ../../mod/item.php:822
+#: ../../mod/item.php:823
 msgid "Duplicate post suppressed."
 msgstr "Se ha suprimido la entrada duplicada."
 
-#: ../../mod/item.php:953
+#: ../../mod/item.php:954
 msgid "System error. Post not saved."
 msgstr "Error del sistema. La entrada no se ha podido salvar."
 
-#: ../../mod/item.php:1220
+#: ../../mod/item.php:1221
 msgid "Unable to obtain post information from database."
 msgstr "No ha sido posible obtener información de la entrada en la base de datos."
 
-#: ../../mod/item.php:1227
+#: ../../mod/item.php:1228
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
 
-#: ../../mod/item.php:1234
+#: ../../mod/item.php:1235
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Ha alcanzado su límite de %1$.0f páginas web."
@@ -4414,7 +4438,8 @@ msgstr "No se han encontrado perfiles compatibles"
 msgid "OpenID protocol error. No ID returned."
 msgstr "Error del protocolo OpenID. Ningún ID recibido como respuesta."
 
-#: ../../mod/openid.php:72 ../../mod/openid.php:179 ../../mod/post.php:285
+#: ../../mod/openid.php:72 ../../mod/openid.php:179
+#: ../../Zotlabs/Zot/Auth.php:248
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
@@ -4650,7 +4675,7 @@ msgstr "Elemento no válido."
 msgid "Channel not found."
 msgstr "Canal no encontrado."
 
-#: ../../mod/page.php:89 ../../mod/display.php:110 ../../mod/help.php:214
+#: ../../mod/page.php:89 ../../mod/display.php:110 ../../mod/help.php:216
 #: ../../mod/block.php:75 ../../index.php:241
 msgid "Page not found."
 msgstr "Página no encontrada."
@@ -4762,8 +4787,8 @@ msgstr "Leer más sobre los roles"
 msgid "No ratings"
 msgstr "Ninguna valoración"
 
-#: ../../mod/ratings.php:82 ../../mod/search.php:13 ../../mod/directory.php:59
-#: ../../mod/photos.php:490 ../../mod/display.php:13
+#: ../../mod/ratings.php:82 ../../mod/display.php:13
+#: ../../mod/directory.php:59 ../../mod/photos.php:490 ../../mod/search.php:13
 #: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr "Acceso público denegado."
@@ -4820,8 +4845,8 @@ msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"."
 msgid "System check"
 msgstr "Verificación del sistema"
 
-#: ../../mod/setup.php:285 ../../mod/photos.php:914 ../../mod/events.php:668
-#: ../../mod/events.php:675
+#: ../../mod/setup.php:285 ../../mod/photos.php:911 ../../mod/events.php:653
+#: ../../mod/events.php:660
 msgid "Next"
 msgstr "Siguiente"
 
@@ -5209,15 +5234,6 @@ msgstr "Mis marcadores"
 msgid "My Connections Bookmarks"
 msgstr "Marcadores de mis conexiones"
 
-#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:157
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../mod/home.php:75
-#, php-format
-msgid "Welcome to %s"
-msgstr "Bienvenido a %s"
-
 #: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
 msgid "This setting requires special processing and editing has been blocked."
 msgstr "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada."
@@ -5322,7 +5338,7 @@ msgstr "Página personal"
 msgid "Interests"
 msgstr "Intereses"
 
-#: ../../mod/profiles.php:457 ../../mod/admin.php:974
+#: ../../mod/profiles.php:457 ../../mod/admin.php:986
 msgid "Address"
 msgstr "Dirección"
 
@@ -5506,16 +5522,6 @@ msgstr "Añadir cosas al perfil"
 msgid "Include desirable objects in your profile"
 msgstr "Añadir objetos interesantes en su perfil"
 
-#: ../../mod/search.php:212
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "elementos etiquetados con: %s"
-
-#: ../../mod/search.php:214
-#, php-format
-msgid "Search results for: %s"
-msgstr "Resultados de la búsqueda para: %s"
-
 #: ../../mod/connedit.php:75
 msgid "Could not access contact record."
 msgstr "No se ha podido acceder al registro de contacto."
@@ -5538,7 +5544,7 @@ msgstr "ahora está conectado/a"
 
 #: ../../mod/connedit.php:395
 msgid "Could not access address book record."
-msgstr "No se pudo acceder a la entrada en su libreta de direcciones."
+msgstr "No se pudo acceder al registro en su libreta de direcciones."
 
 #: ../../mod/connedit.php:409
 msgid "Refresh failed - channel is currently unavailable."
@@ -5575,11 +5581,11 @@ msgstr "Actividad reciente"
 msgid "View recent posts and comments"
 msgstr "Ver publicaciones y comentarios recientes"
 
-#: ../../mod/connedit.php:519 ../../mod/admin.php:811
+#: ../../mod/connedit.php:519 ../../mod/admin.php:823
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../../mod/connedit.php:519 ../../mod/admin.php:810
+#: ../../mod/connedit.php:519 ../../mod/admin.php:822
 msgid "Block"
 msgstr "Bloquear"
 
@@ -5735,7 +5741,7 @@ msgid ""
 " communication."
 msgstr "(%s) desearía conectar con usted. por favor, apruebe esta conexión para permitir la comunicación."
 
-#: ../../mod/connedit.php:710 ../../mod/admin.php:807
+#: ../../mod/connedit.php:710 ../../mod/admin.php:819
 msgid "Approve"
 msgstr "Aprobar"
 
@@ -5908,19 +5914,19 @@ msgstr "añadió este canal a sus conexiones"
 msgid "posted an event"
 msgstr "publicó un evento"
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
+#: ../../mod/api.php:74 ../../mod/api.php:98
 msgid "Authorize application connection"
 msgstr "Autorizar una conexión de aplicación"
 
-#: ../../mod/api.php:77
+#: ../../mod/api.php:75
 msgid "Return to your app and insert this Securty Code:"
 msgstr "Volver a su aplicación e introducir este código de seguridad:"
 
-#: ../../mod/api.php:89
+#: ../../mod/api.php:85
 msgid "Please login to continue."
 msgstr "Por favor inicia sesión para continuar."
 
-#: ../../mod/api.php:104
+#: ../../mod/api.php:100
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
@@ -5946,7 +5952,7 @@ msgstr "Guardar marcador"
 msgid "URL of bookmark"
 msgstr "Dirección del marcador"
 
-#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:465
+#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:450
 msgid "Description"
 msgstr "Descripción"
 
@@ -6049,7 +6055,7 @@ msgstr "Eliminar etiqueta del elemento."
 msgid "Select a tag to remove: "
 msgstr "Seleccionar una etiqueta para eliminar:"
 
-#: ../../mod/tagrm.php:133 ../../mod/photos.php:954
+#: ../../mod/tagrm.php:133 ../../mod/photos.php:951
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -6160,7 +6166,7 @@ msgid ""
 "Password reset failed."
 msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1494
+#: ../../mod/lostpass.php:86 ../../boot.php:1496
 msgid "Password Reset"
 msgstr "Restablecer la contraseña"
 
@@ -6318,156 +6324,75 @@ msgid ""
 "only once and leave this page open until finished."
 msgstr "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine."
 
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr "La información del propietario de la página no pudo ser recuperada."
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr "�lbum no encontrado."
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr "Borrar álbum"
+#: ../../mod/invite.php:25
+msgid "Total invitation limit exceeded."
+msgstr "Se ha superado el límite máximo de invitaciones."
 
-#: ../../mod/photos.php:171 ../../mod/photos.php:1009
-msgid "Delete Photo"
-msgstr "Borrar foto"
+#: ../../mod/invite.php:49
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : No es una dirección de correo electrónico válida. "
 
-#: ../../mod/photos.php:501
-msgid "No photos selected"
-msgstr "No hay fotos seleccionadas"
+#: ../../mod/invite.php:59
+msgid "Please join us on $Projectname"
+msgstr "Únase a nosotros en $Projectname"
 
-#: ../../mod/photos.php:550
-msgid "Access to this item is restricted."
-msgstr "El acceso a este elemento está restringido."
+#: ../../mod/invite.php:70
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio."
 
-#: ../../mod/photos.php:589
+#: ../../mod/invite.php:75
 #, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."
+msgid "%s : Message delivery failed."
+msgstr "%s : Falló el envío del mensaje."
 
-#: ../../mod/photos.php:592
+#: ../../mod/invite.php:79
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
-
-#: ../../mod/photos.php:620
-msgid "Upload Photos"
-msgstr "Subir fotos"
-
-#: ../../mod/photos.php:624
-msgid "Enter an album name"
-msgstr "Introducir un nombre de álbum"
-
-#: ../../mod/photos.php:625
-msgid "or select an existing album (doubleclick)"
-msgstr "o seleccionar uno existente (doble click)"
-
-#: ../../mod/photos.php:626
-msgid "Create a status post for this upload"
-msgstr "Crear una entrada de estado para esta subida"
-
-#: ../../mod/photos.php:627
-msgid "Caption (optional):"
-msgstr "Título (opcional):"
-
-#: ../../mod/photos.php:628
-msgid "Description (optional):"
-msgstr "Descripción (opcional):"
-
-#: ../../mod/photos.php:655
-msgid "Album name could not be decoded"
-msgstr "El nombre del álbum no ha podido ser descifrado"
-
-#: ../../mod/photos.php:699 ../../mod/photos.php:1236
-#: ../../mod/photos.php:1253
-msgid "Contact Photos"
-msgstr "Fotos de contacto"
-
-#: ../../mod/photos.php:727
-msgid "Show Newest First"
-msgstr "Mostrar lo más reciente primero"
-
-#: ../../mod/photos.php:729
-msgid "Show Oldest First"
-msgstr "Mostrar lo más antiguo primero"
-
-#: ../../mod/photos.php:827
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
-
-#: ../../mod/photos.php:829
-msgid "Photo not available"
-msgstr "Foto no disponible"
-
-#: ../../mod/photos.php:887
-msgid "Use as profile photo"
-msgstr "Usar como foto del perfil"
-
-#: ../../mod/photos.php:894
-msgid "Private Photo"
-msgstr "Foto privada"
-
-#: ../../mod/photos.php:905 ../../mod/events.php:667 ../../mod/events.php:674
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../../mod/photos.php:909
-msgid "View Full Size"
-msgstr "Ver tamaño completo"
-
-#: ../../mod/photos.php:988
-msgid "Edit photo"
-msgstr "Editar foto"
-
-#: ../../mod/photos.php:990
-msgid "Rotate CW (right)"
-msgstr "Girar CW (a la derecha)"
-
-#: ../../mod/photos.php:991
-msgid "Rotate CCW (left)"
-msgstr "Girar CCW (a la izquierda)"
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d mensajes enviados."
+msgstr[1] "%d mensajes enviados."
 
-#: ../../mod/photos.php:994
-msgid "Enter a new album name"
-msgstr "Introducir un nuevo nombre de álbum"
+#: ../../mod/invite.php:98
+msgid "You have no more invitations available"
+msgstr "No tiene más invitaciones disponibles"
 
-#: ../../mod/photos.php:995
-msgid "or select an existing one (doubleclick)"
-msgstr "o seleccionar uno (doble click) existente"
+#: ../../mod/invite.php:129
+msgid "Send invitations"
+msgstr "Enviar invitaciones"
 
-#: ../../mod/photos.php:998
-msgid "Caption"
-msgstr "Título"
+#: ../../mod/invite.php:130
+msgid "Enter email addresses, one per line:"
+msgstr "Introduzca las direcciones de correo electrónico, una por línea:"
 
-#: ../../mod/photos.php:1000
-msgid "Add a Tag"
-msgstr "Añadir una etiqueta"
+#: ../../mod/invite.php:131 ../../mod/mail.php:246
+msgid "Your message:"
+msgstr "Su mensaje:"
 
-#: ../../mod/photos.php:1004
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com"
+#: ../../mod/invite.php:132
+msgid "Please join my community on $Projectname."
+msgstr "Por favor, únase a mi comunidad en $Projectname."
 
-#: ../../mod/photos.php:1007
-msgid "Flag as adult in album view"
-msgstr "Marcar como \"solo para adultos\" en el álbum"
+#: ../../mod/invite.php:134
+msgid "You will need to supply this invitation code: "
+msgstr "Debe proporcionar este código de invitación:"
 
-#: ../../mod/photos.php:1199
-msgid "In This Photo:"
-msgstr "En esta foto:"
+#: ../../mod/invite.php:135
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Regístrese en cualquier sitio de $Projectname (están todos interconectados)"
 
-#: ../../mod/photos.php:1204
-msgid "Map"
-msgstr "Mapa"
+#: ../../mod/invite.php:137
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Introduzca mi dirección $Projectname en la caja de búsqueda del sitio."
 
-#: ../../mod/photos.php:1292
-msgid "View Album"
-msgstr "Ver álbum"
+#: ../../mod/invite.php:138
+msgid "or visit "
+msgstr "o visite "
 
-#: ../../mod/photos.php:1315
-msgid "Recent Photos"
-msgstr "Fotos recientes"
+#: ../../mod/invite.php:140
+msgid "3. Click [Connect]"
+msgstr "3. Pulse [conectar]"
 
 #: ../../mod/probe.php:24 ../../mod/probe.php:30
 #, php-format
@@ -6517,7 +6442,7 @@ msgstr "%1$s ha actualizado su %2$s"
 #: ../../mod/profile_photo.php:302
 #, php-format
 msgid "%1$s updated their %2$s"
-msgstr "%1$s ha actualizado sus %2$s"
+msgstr "%1$s ha actualizado su %2$s"
 
 #: ../../mod/profile_photo.php:304
 msgid "profile photo"
@@ -6693,6 +6618,10 @@ msgstr "foro"
 msgid "Search Results For:"
 msgstr "Buscar resultados para:"
 
+#: ../../mod/network.php:169 ../../mod/channel.php:131 ../../mod/rpost.php:114
+msgid "Public"
+msgstr "Público/a"
+
 #: ../../mod/network.php:207
 msgid "Collection is empty"
 msgstr "La colección está vacía"
@@ -6738,807 +6667,817 @@ msgstr "Por favor, confirme que acepta los Términos del servicio. El registro h
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: ../../mod/register.php:117
+#: ../../mod/register.php:119
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "Registro realizado con éxito. Por favor, compruebe su correo electrónico para ver las instrucciones para validarlo."
 
-#: ../../mod/register.php:123
+#: ../../mod/register.php:125
 msgid "Your registration is pending approval by the site owner."
 msgstr "Su registro está pendiente de aprobación por el propietario del sitio."
 
-#: ../../mod/register.php:126
+#: ../../mod/register.php:128
 msgid "Your registration can not be processed."
 msgstr "Su registro no puede ser procesado."
 
-#: ../../mod/register.php:163
+#: ../../mod/register.php:165
 msgid "Registration on this site/hub is by approval only."
 msgstr "El registro en este servidor/hub está sometido a aprobación previa."
 
-#: ../../mod/register.php:164
+#: ../../mod/register.php:166
 msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
 msgstr "<a href=\"pubsites\">Inscribirse en un servidor/hub afiliado</a>"
 
-#: ../../mod/register.php:174
+#: ../../mod/register.php:176
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Este sitio ha excedido el límite de inscripción diaria de cuentas. Por favor, inténtelo de nuevo mañana."
 
-#: ../../mod/register.php:185
+#: ../../mod/register.php:187
 msgid "Terms of Service"
 msgstr "Términos del servicio"
 
-#: ../../mod/register.php:191
+#: ../../mod/register.php:193
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Acepto los %s de este sitio"
 
-#: ../../mod/register.php:193
+#: ../../mod/register.php:195
 #, php-format
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr "Tengo más de 13 años de edad y acepto los %s de este sitio"
 
-#: ../../mod/register.php:207 ../../mod/admin.php:436
+#: ../../mod/register.php:209 ../../mod/admin.php:448
 msgid "Registration"
 msgstr "Registro"
 
-#: ../../mod/register.php:212
+#: ../../mod/register.php:214
 msgid "Membership on this site is by invitation only."
 msgstr "Para registrarse en este sitio es necesaria una invitación."
 
-#: ../../mod/register.php:213
+#: ../../mod/register.php:215
 msgid "Please enter your invitation code"
 msgstr "Por favor, introduzca el código de su invitación"
 
-#: ../../mod/register.php:216
+#: ../../mod/register.php:218
 msgid "Your email address"
 msgstr "Su dirección de correo electrónico"
 
-#: ../../mod/register.php:217
+#: ../../mod/register.php:219
 msgid "Choose a password"
 msgstr "Elija una contraseña"
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:220
 msgid "Please re-enter your password"
 msgstr "Por favor, vuelva a escribir su contraseña"
 
-#: ../../mod/admin.php:52
+#: ../../mod/admin.php:54
 msgid "Theme settings updated."
 msgstr "Ajustes del tema actualizados."
 
-#: ../../mod/admin.php:160
+#: ../../mod/admin.php:162
 msgid "# Accounts"
 msgstr "# Cuentas"
 
-#: ../../mod/admin.php:161
+#: ../../mod/admin.php:163
 msgid "# blocked accounts"
 msgstr "# cuentas bloqueadas"
 
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:164
 msgid "# expired accounts"
 msgstr "# cuentas caducadas"
 
-#: ../../mod/admin.php:163
+#: ../../mod/admin.php:165
 msgid "# expiring accounts"
 msgstr "# cuentas que caducan"
 
-#: ../../mod/admin.php:174
+#: ../../mod/admin.php:176
 msgid "# Channels"
 msgstr "# Canales"
 
-#: ../../mod/admin.php:175
+#: ../../mod/admin.php:177
 msgid "# primary"
 msgstr "# primario"
 
-#: ../../mod/admin.php:176
+#: ../../mod/admin.php:178
 msgid "# clones"
 msgstr "# clones"
 
-#: ../../mod/admin.php:182
+#: ../../mod/admin.php:184
 msgid "Message queues"
 msgstr "Mensajes en cola"
 
-#: ../../mod/admin.php:198 ../../mod/admin.php:433 ../../mod/admin.php:532
-#: ../../mod/admin.php:800 ../../mod/admin.php:964 ../../mod/admin.php:1061
-#: ../../mod/admin.php:1101 ../../mod/admin.php:1261 ../../mod/admin.php:1295
-#: ../../mod/admin.php:1380
+#: ../../mod/admin.php:200 ../../mod/admin.php:445 ../../mod/admin.php:545
+#: ../../mod/admin.php:812 ../../mod/admin.php:976 ../../mod/admin.php:1073
+#: ../../mod/admin.php:1113 ../../mod/admin.php:1273 ../../mod/admin.php:1307
+#: ../../mod/admin.php:1392
 msgid "Administration"
 msgstr "Administración"
 
-#: ../../mod/admin.php:199
+#: ../../mod/admin.php:201
 msgid "Summary"
 msgstr "Sumario"
 
-#: ../../mod/admin.php:202
+#: ../../mod/admin.php:204
 msgid "Registered accounts"
 msgstr "Cuentas registradas"
 
-#: ../../mod/admin.php:203 ../../mod/admin.php:536
+#: ../../mod/admin.php:205 ../../mod/admin.php:549
 msgid "Pending registrations"
 msgstr "Registros pendientes"
 
-#: ../../mod/admin.php:204
+#: ../../mod/admin.php:206
 msgid "Registered channels"
 msgstr "Canales registrados"
 
-#: ../../mod/admin.php:205 ../../mod/admin.php:537
+#: ../../mod/admin.php:207 ../../mod/admin.php:550
 msgid "Active plugins"
 msgstr "Extensiones activas"
 
-#: ../../mod/admin.php:206
+#: ../../mod/admin.php:208
 msgid "Version"
 msgstr "Versión"
 
-#: ../../mod/admin.php:324
+#: ../../mod/admin.php:329
 msgid "Site settings updated."
 msgstr "Ajustes del sitio actualizados."
 
-#: ../../mod/admin.php:361 ../../mod/settings.php:793
+#: ../../mod/admin.php:366 ../../mod/settings.php:793
 msgid "mobile"
 msgstr "móvil"
 
-#: ../../mod/admin.php:363
+#: ../../mod/admin.php:368
 msgid "experimental"
 msgstr "experimental"
 
-#: ../../mod/admin.php:365
+#: ../../mod/admin.php:370
 msgid "unsupported"
 msgstr "no soportado"
 
-#: ../../mod/admin.php:411
+#: ../../mod/admin.php:416
 msgid "Yes - with approval"
 msgstr "Sí - con aprobación"
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:422
 msgid "My site is not a public server"
 msgstr "Mi sitio no es un servidor público"
 
-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:423
 msgid "My site has paid access only"
 msgstr "Mi sitio es un servicio de pago"
 
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:424
 msgid "My site has free access only"
 msgstr "Mi sitio es un servicio gratuito"
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:425
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mi sitio ofrece cuentas gratuitas con opciones extra de pago"
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:449
 msgid "File upload"
 msgstr "Fichero subido"
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:450
 msgid "Policies"
 msgstr "Políticas"
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
 msgid "Site name"
 msgstr "Nombre del sitio"
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid "Administrator Information"
 msgstr "Información del Administrador"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Información de contacto de los administradores del sitio. Visible en la página \"siteinfo\". Se puede usar BBCode"
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:458
 msgid "System language"
 msgstr "Idioma del sistema"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
 msgid "System theme"
 msgstr "Tema gráfico del sistema"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - <a href='#' id='cnftheme'>modificar los ajustes del tema</a>"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:460
 msgid "Mobile system theme"
 msgstr "Tema del sistema para móviles"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:460
 msgid "Theme for mobile devices"
 msgstr "Tema para dispositivos móviles"
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid "Allow Feeds as Connections"
-msgstr "Permitir flujos RSS como conexiones"
+msgstr "Permitir contenidos RSS como conexiones"
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid "(Heavy system resource usage)"
 msgstr "(Uso intenso de los recursos del sistema)"
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid "Maximum image size"
 msgstr "Tamaño máximo de la imagen"
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Tamaño máximo en bytes de la imagen subida. Por defecto, es 0, lo que significa que no hay límites."
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
 msgid "Does this site allow new member registration?"
 msgstr "¿Debe este sitio permitir el registro de nuevos miembros?"
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:465
+msgid "Invitation only"
+msgstr "Solo con una invitación"
+
+#: ../../mod/admin.php:465
+msgid ""
+"Only allow new member registrations with an invitation code. Above register "
+"policy must be set to Yes."
+msgstr "Solo se permiten inscripciones de nuevos miembros con un código de invitación. Además, deben aceptarse los términos del registro marcando \"Sí\"."
+
+#: ../../mod/admin.php:466
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "¿Cómo describiría el tipo de servicio ofrecido por este servidor?"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:467
 msgid "Register text"
 msgstr "Texto del registro"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:467
 msgid "Will be displayed prominently on the registration page."
 msgstr "Se mostrará de forma destacada en la página de registro."
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:468
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Página personal que se mostrará a los visitantes (por defecto: la página de identificación)"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:468
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "ejemplo: 'public' para mostrar contenido público de los usuarios, 'page/sys/home' para mostrar la página web definida como \"home\" o 'include:home.html' para mostrar el contenido de un fichero."
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:469
 msgid "Preserve site homepage URL"
 msgstr "Preservar la dirección de la página personal"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:469
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Presenta la página personal del sitio en un marco en la ubicación original, en vez de redirigirla."
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:470
 msgid "Accounts abandoned after x days"
 msgstr "Cuentas abandonadas después de x días"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:470
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Para evitar consumir recursos del sistema intentando poner al día las cuentas abandonadas. Introduzca 0 para no tener límite de tiempo."
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:471
 msgid "Allowed friend domains"
 msgstr "Dominios amigos permitidos"
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:471
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Lista separada por comas de dominios a los que está permitido establecer relaciones de amistad con este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio."
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:472
 msgid "Allowed email domains"
 msgstr "Se aceptan dominios de correo electrónico"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:472
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Lista separada por comas de los dominios de los que se acepta una dirección de correo electrónico para registros en este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio. "
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:473
 msgid "Not allowed email domains"
 msgstr "No se permiten dominios de correo electrónico"
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:473
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Lista separada por comas de los dominios de los que no se acepta una dirección de correo electrónico para registros en este sitio. Se permiten comodines. Dejar en claro para no aceptar cualquier dominio, excepto los que se hayan autorizado."
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:474
 msgid "Block public"
 msgstr "Bloquear páginas públicas"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:474
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Activar para bloquear el acceso a todas las páginas públicas personales en este sitio, salvo que estén identificadas en el sistema."
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:475
 msgid "Verify Email Addresses"
 msgstr "Verificar las direcciones de correo electrónico"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:475
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Activar para la verificación de la dirección de correo electrónico en el registro de una cuenta (recomendado)."
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:476
 msgid "Force publish"
 msgstr "Forzar la publicación"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:476
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio."
 
-#: ../../mod/admin.php:464
-msgid "Disable discovery tab"
-msgstr "Desactivar la pestaña \"Descubrir\""
+#: ../../mod/admin.php:477
+msgid "Import Public Streams"
+msgstr "Importar contenido público"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:477
 msgid ""
-"Remove the tab in the network view with public content pulled from sources "
-"chosen for this site."
-msgstr "Quitar la pestaña para ver contenido público extraído de las fuentes elegidas por este sitio."
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
+msgstr "Importar y permitir acceso al contenido público sacado de otros sitios. Advertencia: este contenido no está moderado, por lo que podría encontrar cosas inapropiadas u ofensivas."
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:478
 msgid "login on Homepage"
 msgstr "acceso a la página personal"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:478
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Presentar a los visitantes una casilla de identificación en la página de inicio, si no se ha configurado otro tipo de contenido."
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:480
 msgid "Directory Server URL"
 msgstr "URL del servidor de directorio"
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:480
 msgid "Default directory server"
 msgstr "Servidor de directorio predeterminado"
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:482
 msgid "Proxy user"
 msgstr "Usuario del proxy"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:483
 msgid "Proxy URL"
 msgstr "Dirección del proxy"
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:484
 msgid "Network timeout"
 msgstr "Tiempo de espera de la red"
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:484
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Valor en segundos. Poner a 0 para que no haya tiempo límite (no recomendado)"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:485
 msgid "Delivery interval"
 msgstr "Intervalo de entrega"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:485
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Retrasar los procesos de transmisión en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para sitios compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados."
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:486
 msgid "Deliveries per process"
 msgstr "Intentos de envío por proceso"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:486
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Numero de envíos a intentar en un único proceso del sistema operativo. Ajustar si es necesario mejorar el rendimiento. Se recomienda: 1-5."
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:487
 msgid "Poll interval"
 msgstr "Intervalo de sondeo"
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:487
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Retrasar el sondeo en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de transmisión."
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:488
 msgid "Maximum Load Average"
 msgstr "Carga media máxima"
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:488
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Carga máxima del sistema antes de que los procesos de transmisión y sondeo se hayan retardado - por defecto, 50."
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:489
 msgid "Expiration period in days for imported (matrix/network) content"
 msgstr "Periodo de caducidad en días para el contenido importado (red)"
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:489
 msgid "0 for no expiration of imported content"
 msgstr "0 para que no caduque el contenido importado"
 
-#: ../../mod/admin.php:524
+#: ../../mod/admin.php:537
 msgid "No server found"
 msgstr "Servidor no encontrado"
 
-#: ../../mod/admin.php:531 ../../mod/admin.php:814
+#: ../../mod/admin.php:544 ../../mod/admin.php:826
 msgid "ID"
 msgstr "ID"
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:544
 msgid "for channel"
 msgstr "por canal"
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:544
 msgid "on server"
 msgstr "en el servidor"
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:544
 msgid "Status"
 msgstr "Estado"
 
-#: ../../mod/admin.php:533
+#: ../../mod/admin.php:546
 msgid "Server"
 msgstr "Servidor"
 
-#: ../../mod/admin.php:550
+#: ../../mod/admin.php:563
 msgid "Update has been marked successful"
 msgstr "La actualización ha sido marcada como exitosa"
 
-#: ../../mod/admin.php:560
+#: ../../mod/admin.php:573
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "La ejecución de %s ha fallado. Mirar en los informes del sistema."
 
-#: ../../mod/admin.php:563
+#: ../../mod/admin.php:576
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "La actualización de %s se ha realizado exitosamente."
 
-#: ../../mod/admin.php:567
+#: ../../mod/admin.php:580
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "La actualización de %s no ha devuelto ningún estado. No se sabe si ha tenido éxito."
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:583
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "No se encuentra la función de actualización de %s."
 
-#: ../../mod/admin.php:586
+#: ../../mod/admin.php:599
 msgid "No failed updates."
 msgstr "No ha fallado ninguna actualización."
 
-#: ../../mod/admin.php:590
+#: ../../mod/admin.php:603
 msgid "Failed Updates"
 msgstr "Han fallado las actualizaciones"
 
-#: ../../mod/admin.php:592
+#: ../../mod/admin.php:605
 msgid "Mark success (if update was manually applied)"
 msgstr "Marcar como exitosa (si la actualización se ha hecho manualmente)"
 
-#: ../../mod/admin.php:593
+#: ../../mod/admin.php:606
 msgid "Attempt to execute this update step automatically"
 msgstr "Intentar ejecutar este paso de actualización automáticamente"
 
-#: ../../mod/admin.php:625
+#: ../../mod/admin.php:637
 msgid "Queue Statistics"
 msgstr "Estadísticas de la cola"
 
-#: ../../mod/admin.php:626
+#: ../../mod/admin.php:638
 msgid "Total Entries"
 msgstr "Total de entradas"
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:639
 msgid "Priority"
 msgstr "Prioridad"
 
-#: ../../mod/admin.php:628
+#: ../../mod/admin.php:640
 msgid "Destination URL"
 msgstr "Dirección de destino"
 
-#: ../../mod/admin.php:629
+#: ../../mod/admin.php:641
 msgid "Mark hub permanently offline"
 msgstr "Marcar el servidor como permanentemente fuera de línea"
 
-#: ../../mod/admin.php:630
+#: ../../mod/admin.php:642
 msgid "Empty queue for this hub"
 msgstr "Vaciar la cola para este servidor"
 
-#: ../../mod/admin.php:631
+#: ../../mod/admin.php:643
 msgid "Last known contact"
 msgstr "Último contacto conocido"
 
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:679
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s cuenta bloqueada/desbloqueada"
 msgstr[1] "%s cuenta bloqueada/desbloqueada"
 
-#: ../../mod/admin.php:675
+#: ../../mod/admin.php:687
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s cuentas eliminadas"
 msgstr[1] "%s cuentas eliminadas"
 
-#: ../../mod/admin.php:711
+#: ../../mod/admin.php:723
 msgid "Account not found"
 msgstr "Cuenta no encontrada"
 
-#: ../../mod/admin.php:723
+#: ../../mod/admin.php:735
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "La cuenta '%s' ha sido eliminada"
 
-#: ../../mod/admin.php:731
+#: ../../mod/admin.php:743
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "La cuenta '%s' ha sido bloqueada"
 
-#: ../../mod/admin.php:739
+#: ../../mod/admin.php:751
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "La cuenta '%s' ha sido desbloqueada"
 
-#: ../../mod/admin.php:801 ../../mod/admin.php:813
+#: ../../mod/admin.php:813 ../../mod/admin.php:825
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../../mod/admin.php:803 ../../mod/admin.php:967
+#: ../../mod/admin.php:815 ../../mod/admin.php:979
 msgid "select all"
 msgstr "seleccionar todo"
 
-#: ../../mod/admin.php:804
+#: ../../mod/admin.php:816
 msgid "User registrations waiting for confirm"
 msgstr "Registros de usuario en espera de aprobación"
 
-#: ../../mod/admin.php:805
+#: ../../mod/admin.php:817
 msgid "Request date"
 msgstr "Fecha de solicitud"
 
-#: ../../mod/admin.php:806
+#: ../../mod/admin.php:818
 msgid "No registrations."
 msgstr "Sin registros."
 
-#: ../../mod/admin.php:808
+#: ../../mod/admin.php:820
 msgid "Deny"
 msgstr "Rechazar"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Register date"
 msgstr "Fecha de registro"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Last login"
 msgstr "Último acceso"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Expires"
 msgstr "Caduca"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Service Class"
 msgstr "Clase de servicio"
 
-#: ../../mod/admin.php:816
+#: ../../mod/admin.php:828
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "¡Las cuentas seleccionadas van a ser eliminadas!\\n\\n¡Todo lo que estas cuentas han publicado en este sitio será borrado de forma permanente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: ../../mod/admin.php:817
+#: ../../mod/admin.php:829
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "¡La cuenta {0} va a ser eliminada!\\n\\n¡Todo lo que esta cuenta ha publicado en este sitio será borrado de forma permanente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: ../../mod/admin.php:853
+#: ../../mod/admin.php:865
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s canales censurados/no censurados"
 msgstr[1] "%s canales censurados/no censurados"
 
-#: ../../mod/admin.php:862
+#: ../../mod/admin.php:874
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "%s código permitido/no permitido al canal"
 msgstr[1] "%s código permitido/no permitido al canal"
 
-#: ../../mod/admin.php:869
+#: ../../mod/admin.php:881
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s canales eliminados"
 msgstr[1] "%s canales eliminados"
 
-#: ../../mod/admin.php:889
+#: ../../mod/admin.php:901
 msgid "Channel not found"
 msgstr "Canal no encontrado"
 
-#: ../../mod/admin.php:900
+#: ../../mod/admin.php:912
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Canal '%s' eliminado"
 
-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:924
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Canal '%s' censurado"
 
-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:924
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Canal '%s' no censurado"
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:935
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Código permitido al canal '%s'"
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:935
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Código no permitido al canal '%s'"
 
-#: ../../mod/admin.php:969
+#: ../../mod/admin.php:981
 msgid "Censor"
 msgstr "Censurar"
 
-#: ../../mod/admin.php:970
+#: ../../mod/admin.php:982
 msgid "Uncensor"
 msgstr "No censurar"
 
-#: ../../mod/admin.php:971
+#: ../../mod/admin.php:983
 msgid "Allow Code"
 msgstr "Permitir código"
 
-#: ../../mod/admin.php:972
+#: ../../mod/admin.php:984
 msgid "Disallow Code"
 msgstr "No permitir código"
 
-#: ../../mod/admin.php:974
+#: ../../mod/admin.php:986
 msgid "UID"
 msgstr "UID"
 
-#: ../../mod/admin.php:976
+#: ../../mod/admin.php:988
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Los canales seleccionados se eliminarán!\\n\\nTodo lo publicado por estos canales en este sitio se borrarán definitivamente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: ../../mod/admin.php:977
+#: ../../mod/admin.php:989
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "El canal {0} va a ser eliminado!\\n\\nTodo lo publicado por el canal en este sitio se borrará definitivamente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: ../../mod/admin.php:1017
+#: ../../mod/admin.php:1029
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Extensión %s desactivada."
 
-#: ../../mod/admin.php:1021
+#: ../../mod/admin.php:1033
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Extensión %s activada."
 
-#: ../../mod/admin.php:1031 ../../mod/admin.php:1234
+#: ../../mod/admin.php:1043 ../../mod/admin.php:1246
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../../mod/admin.php:1034 ../../mod/admin.php:1236
+#: ../../mod/admin.php:1046 ../../mod/admin.php:1248
 msgid "Enable"
 msgstr "Activar"
 
-#: ../../mod/admin.php:1063 ../../mod/admin.php:1263
+#: ../../mod/admin.php:1075 ../../mod/admin.php:1275
 msgid "Toggle"
 msgstr "Cambiar"
 
-#: ../../mod/admin.php:1071 ../../mod/admin.php:1273
+#: ../../mod/admin.php:1083 ../../mod/admin.php:1285
 msgid "Author: "
 msgstr "Autor:"
 
-#: ../../mod/admin.php:1072 ../../mod/admin.php:1274
+#: ../../mod/admin.php:1084 ../../mod/admin.php:1286
 msgid "Maintainer: "
 msgstr "Mantenedor:"
 
-#: ../../mod/admin.php:1199
+#: ../../mod/admin.php:1211
 msgid "No themes found."
 msgstr "No se han encontrado temas."
 
-#: ../../mod/admin.php:1255
+#: ../../mod/admin.php:1267
 msgid "Screenshot"
 msgstr "Instantánea de pantalla"
 
-#: ../../mod/admin.php:1301
+#: ../../mod/admin.php:1313
 msgid "[Experimental]"
 msgstr "[Experimental]"
 
-#: ../../mod/admin.php:1302
+#: ../../mod/admin.php:1314
 msgid "[Unsupported]"
 msgstr "[No soportado]"
 
-#: ../../mod/admin.php:1326
+#: ../../mod/admin.php:1338
 msgid "Log settings updated."
 msgstr "Actualizado el informe de configuraciones."
 
-#: ../../mod/admin.php:1383
+#: ../../mod/admin.php:1395
 msgid "Clear"
 msgstr "Vaciar"
 
-#: ../../mod/admin.php:1389
+#: ../../mod/admin.php:1401
 msgid "Debugging"
 msgstr "Depuración"
 
-#: ../../mod/admin.php:1390
+#: ../../mod/admin.php:1402
 msgid "Log file"
 msgstr "Fichero de informe"
 
-#: ../../mod/admin.php:1390
+#: ../../mod/admin.php:1402
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr "Debe tener permisos de escritura por el servidor web. La ruta es relativa al directorio de instalación de Hubzilla."
 
-#: ../../mod/admin.php:1391
+#: ../../mod/admin.php:1403
 msgid "Log level"
 msgstr "Nivel de depuración"
 
-#: ../../mod/admin.php:1437
+#: ../../mod/admin.php:1449
 msgid "New Profile Field"
 msgstr "Nuevo campo en el perfil"
 
-#: ../../mod/admin.php:1438 ../../mod/admin.php:1458
+#: ../../mod/admin.php:1450 ../../mod/admin.php:1470
 msgid "Field nickname"
 msgstr "Alias del campo"
 
-#: ../../mod/admin.php:1438 ../../mod/admin.php:1458
+#: ../../mod/admin.php:1450 ../../mod/admin.php:1470
 msgid "System name of field"
 msgstr "Nombre del campo en el sistema"
 
-#: ../../mod/admin.php:1439 ../../mod/admin.php:1459
+#: ../../mod/admin.php:1451 ../../mod/admin.php:1471
 msgid "Input type"
 msgstr "Tipo de entrada"
 
-#: ../../mod/admin.php:1440 ../../mod/admin.php:1460
+#: ../../mod/admin.php:1452 ../../mod/admin.php:1472
 msgid "Field Name"
 msgstr "Nombre del campo"
 
-#: ../../mod/admin.php:1440 ../../mod/admin.php:1460
+#: ../../mod/admin.php:1452 ../../mod/admin.php:1472
 msgid "Label on profile pages"
 msgstr "Etiqueta a mostrar en la página del perfil"
 
-#: ../../mod/admin.php:1441 ../../mod/admin.php:1461
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "Help text"
 msgstr "Texto de ayuda"
 
-#: ../../mod/admin.php:1441 ../../mod/admin.php:1461
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "Additional info (optional)"
 msgstr "Información adicional (opcional)"
 
-#: ../../mod/admin.php:1451
+#: ../../mod/admin.php:1463
 msgid "Field definition not found"
 msgstr "Definición del campo no encontrada"
 
-#: ../../mod/admin.php:1457
+#: ../../mod/admin.php:1469
 msgid "Edit Profile Field"
 msgstr "Modificar el campo del perfil"
 
@@ -7565,7 +7504,7 @@ msgstr "El nombre es obligatorio"
 
 #: ../../mod/settings.php:80
 msgid "Key and Secret are required"
-msgstr "Clave y Secreto son obligatorios"
+msgstr "\"Key\" y \"Secret\" son obligatorios"
 
 #: ../../mod/settings.php:232
 msgid "Passwords do not match. Password unchanged."
@@ -7610,7 +7549,7 @@ msgstr "Nombre de la aplicación"
 
 #: ../../mod/settings.php:589 ../../mod/settings.php:615
 msgid "Consumer Key"
-msgstr "Clave de consumidor"
+msgstr "Consumer Key"
 
 #: ../../mod/settings.php:589 ../../mod/settings.php:590
 msgid "Automatically generated - change if desired. Max length 20"
@@ -7618,7 +7557,7 @@ msgstr "Generado automáticamente - si lo desea,  cámbielo. Longitud máxima: 2
 
 #: ../../mod/settings.php:590 ../../mod/settings.php:616
 msgid "Consumer Secret"
-msgstr "Clave secreta de consumidor"
+msgstr "Consumer Secret"
 
 #: ../../mod/settings.php:591 ../../mod/settings.php:617
 msgid "Redirect"
@@ -7648,7 +7587,7 @@ msgstr "Aplicaciones conectadas"
 
 #: ../../mod/settings.php:650
 msgid "Client key starts with"
-msgstr "La clave de cliente empieza por"
+msgstr "La \"client key\" empieza por"
 
 #: ../../mod/settings.php:651
 msgid "No name"
@@ -7664,7 +7603,7 @@ msgstr "No se ha establecido la configuración de características"
 
 #: ../../mod/settings.php:672
 msgid "Feature/Addon Settings"
-msgstr "Ajustes de la característica o el complemento"
+msgstr "Ajustes de los complementos"
 
 #: ../../mod/settings.php:695
 msgid "Account Settings"
@@ -7700,7 +7639,7 @@ msgstr "Activado"
 
 #: ../../mod/settings.php:724
 msgid "Additional Features"
-msgstr "Características adicionales"
+msgstr "Funcionalidades"
 
 #: ../../mod/settings.php:748
 msgid "Connector Settings"
@@ -7971,7 +7910,7 @@ msgstr "Por defecto, enviar un mensaje de estado cuando:"
 
 #: ../../mod/settings.php:1071
 msgid "accepting a friend request"
-msgstr "acepte una solicitud de amistad"
+msgstr "Acepte una solicitud de amistad"
 
 #: ../../mod/settings.php:1072
 msgid "joining a forum/community"
@@ -7979,7 +7918,7 @@ msgstr "al unirse a un foro o comunidad"
 
 #: ../../mod/settings.php:1073
 msgid "making an <em>interesting</em> profile change"
-msgstr "realice un cambio <em>interesante</em> en su perfil"
+msgstr "Realice un cambio <em>interesante</em> en su perfil"
 
 #: ../../mod/settings.php:1074
 msgid "Send a notification email when:"
@@ -7995,7 +7934,7 @@ msgstr "Sus conexiones hayan sido confirmadas"
 
 #: ../../mod/settings.php:1077
 msgid "Someone writes on your profile wall"
-msgstr "Alguien escriba en la página de su perfil (muro)"
+msgstr "Alguien escriba en la página de su perfil (\"muro\")"
 
 #: ../../mod/settings.php:1078
 msgid "Someone writes a followup comment"
@@ -8015,7 +7954,7 @@ msgstr "Usted sea etiquetado en una publicación"
 
 #: ../../mod/settings.php:1082
 msgid "You are poked/prodded/etc. in a post"
-msgstr "Reciba un toque o incitación en una entrada"
+msgstr "Reciba un toque o incitación en una publicación"
 
 #: ../../mod/settings.php:1085
 msgid "Show visual notifications including:"
@@ -8099,7 +8038,7 @@ msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales"
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
-msgstr "Activar modo experto (en <a href=\"settings/features\">Ajustes > Características Adicionales</a>) para ajustar."
+msgstr "¡Activar el modo de experto (en <a href=\"settings/features\">Ajustes > Funcionalidades</a>) para realizar cambios!."
 
 #: ../../mod/settings.php:1107
 msgid "Miscellaneous Settings"
@@ -8167,7 +8106,7 @@ msgstr "Ubicación (URL) de la aplicación"
 
 #: ../../mod/appman.php:94
 msgid "Photo icon URL"
-msgstr "Dirección del icono que se va a utilizar para esta foto"
+msgstr "Dirección del icono"
 
 #: ../../mod/appman.php:94
 msgid "80 x 80 pixels - optional"
@@ -8257,92 +8196,14 @@ msgstr "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo."
 
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr "Imposible asociar a un destinatario."
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr "Imposible comunicar con el canal solicitado."
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr "No se puede verificar el canal solicitado."
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
-
-#: ../../mod/mail.php:132
-msgid "Messages"
-msgstr "Mensajes"
-
-#: ../../mod/mail.php:167
-msgid "Message recalled."
-msgstr "Mensaje revocado."
-
-#: ../../mod/mail.php:180
-msgid "Conversation removed."
-msgstr "Conversación eliminada."
-
-#: ../../mod/mail.php:223
-msgid "Requested channel is not in this network"
-msgstr "El canal solicitado no existe en esta red"
-
-#: ../../mod/mail.php:231
-msgid "Send Private Message"
-msgstr "Enviar un mensaje privado"
-
-#: ../../mod/mail.php:232 ../../mod/mail.php:361
-msgid "To:"
-msgstr "Para:"
-
-#: ../../mod/mail.php:235 ../../mod/mail.php:363
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: ../../mod/mail.php:238 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr "Su mensaje:"
-
-#: ../../mod/mail.php:242
-msgid "Send"
-msgstr "Enviar"
-
-#: ../../mod/mail.php:333
-msgid "Delete message"
-msgstr "Borrar mensaje"
-
-#: ../../mod/mail.php:334
-msgid "Delivery report"
-msgstr "Informe de transmisión"
-
-#: ../../mod/mail.php:335
-msgid "Recall message"
-msgstr "Revocar el mensaje"
-
-#: ../../mod/mail.php:337
-msgid "Message has been recalled."
-msgstr "El mensaje ha sido revocado."
-
-#: ../../mod/mail.php:354
-msgid "Delete Conversation"
-msgstr "Eliminar conversación"
-
-#: ../../mod/mail.php:356
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
-
-#: ../../mod/mail.php:360
-msgid "Send Reply"
-msgstr "Responder"
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:61
+msgid "$Projectname"
+msgstr "$Projectname"
 
-#: ../../mod/mail.php:365
+#: ../../mod/home.php:75
 #, php-format
-msgid "Your message for %s (%s):"
-msgstr "Su mensaje para %s (%s):"
+msgid "Welcome to %s"
+msgstr "Bienvenido a %s"
 
 #: ../../mod/regmod.php:11
 msgid "Please login."
@@ -8372,71 +8233,157 @@ msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
 msgid "Item not available."
 msgstr "Elemento no disponible"
 
-#: ../../mod/invite.php:25
-msgid "Total invitation limit exceeded."
-msgstr "Se ha superado el límite máximo de invitaciones."
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr "La información del propietario de la página no pudo ser recuperada."
 
-#: ../../mod/invite.php:49
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : No es una dirección de correo electrónico válida. "
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr "�lbum no encontrado."
 
-#: ../../mod/invite.php:76
-msgid "Please join us on $Projectname"
-msgstr "Únase a nosotros en $Projectname"
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr "Borrar álbum"
 
-#: ../../mod/invite.php:87
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio."
+#: ../../mod/photos.php:171 ../../mod/photos.php:1006
+msgid "Delete Photo"
+msgstr "Borrar foto"
+
+#: ../../mod/photos.php:501
+msgid "No photos selected"
+msgstr "No hay fotos seleccionadas"
+
+#: ../../mod/photos.php:550
+msgid "Access to this item is restricted."
+msgstr "El acceso a este elemento está restringido."
 
-#: ../../mod/invite.php:92
+#: ../../mod/photos.php:589
 #, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Falló el envío del mensaje."
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."
 
-#: ../../mod/invite.php:96
+#: ../../mod/photos.php:592
 #, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d mensajes enviados."
-msgstr[1] "%d mensajes enviados."
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
 
-#: ../../mod/invite.php:115
-msgid "You have no more invitations available"
-msgstr "No tiene más invitaciones disponibles"
+#: ../../mod/photos.php:620
+msgid "Upload Photos"
+msgstr "Subir fotos"
 
-#: ../../mod/invite.php:129
-msgid "Send invitations"
-msgstr "Enviar invitaciones"
+#: ../../mod/photos.php:624
+msgid "Enter an album name"
+msgstr "Introducir un nombre de álbum"
 
-#: ../../mod/invite.php:130
-msgid "Enter email addresses, one per line:"
-msgstr "Introduzca las direcciones de correo electrónico, una por línea:"
+#: ../../mod/photos.php:625
+msgid "or select an existing album (doubleclick)"
+msgstr "o seleccionar uno existente (doble click)"
 
-#: ../../mod/invite.php:132
-msgid "Please join my community on $Projectname."
-msgstr "Por favor, únase a mi comunidad en $Projectname."
+#: ../../mod/photos.php:626
+msgid "Create a status post for this upload"
+msgstr "Crear un mensaje de estado para esta subida"
 
-#: ../../mod/invite.php:134
-msgid "You will need to supply this invitation code: "
-msgstr "Debe proporcionar este código de invitación:"
+#: ../../mod/photos.php:627
+msgid "Caption (optional):"
+msgstr "Título (opcional):"
 
-#: ../../mod/invite.php:135
-msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Regístrese en cualquier sitio de $Projectname (están todos interconectados)"
+#: ../../mod/photos.php:628
+msgid "Description (optional):"
+msgstr "Descripción (opcional):"
 
-#: ../../mod/invite.php:137
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Introduzca mi dirección $Projectname en la caja de búsqueda del sitio."
+#: ../../mod/photos.php:655
+msgid "Album name could not be decoded"
+msgstr "El nombre del álbum no ha podido ser descifrado"
 
-#: ../../mod/invite.php:138
-msgid "or visit "
-msgstr "o visite "
+#: ../../mod/photos.php:699 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1250
+msgid "Contact Photos"
+msgstr "Fotos de contacto"
 
-#: ../../mod/invite.php:140
-msgid "3. Click [Connect]"
-msgstr "3. Pulse [conectar]"
+#: ../../mod/photos.php:722
+msgid "Show Newest First"
+msgstr "Mostrar lo más reciente primero"
+
+#: ../../mod/photos.php:724
+msgid "Show Oldest First"
+msgstr "Mostrar lo más antiguo primero"
+
+#: ../../mod/photos.php:824
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
+
+#: ../../mod/photos.php:826
+msgid "Photo not available"
+msgstr "Foto no disponible"
+
+#: ../../mod/photos.php:884
+msgid "Use as profile photo"
+msgstr "Usar como foto del perfil"
+
+#: ../../mod/photos.php:891
+msgid "Private Photo"
+msgstr "Foto privada"
+
+#: ../../mod/photos.php:902 ../../mod/events.php:652 ../../mod/events.php:659
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../../mod/photos.php:906
+msgid "View Full Size"
+msgstr "Ver tamaño completo"
+
+#: ../../mod/photos.php:985
+msgid "Edit photo"
+msgstr "Editar foto"
+
+#: ../../mod/photos.php:987
+msgid "Rotate CW (right)"
+msgstr "Girar CW (a la derecha)"
+
+#: ../../mod/photos.php:988
+msgid "Rotate CCW (left)"
+msgstr "Girar CCW (a la izquierda)"
+
+#: ../../mod/photos.php:991
+msgid "Enter a new album name"
+msgstr "Introducir un nuevo nombre de álbum"
+
+#: ../../mod/photos.php:992
+msgid "or select an existing one (doubleclick)"
+msgstr "o seleccionar uno (doble click) existente"
+
+#: ../../mod/photos.php:995
+msgid "Caption"
+msgstr "Título"
+
+#: ../../mod/photos.php:997
+msgid "Add a Tag"
+msgstr "Añadir una etiqueta"
+
+#: ../../mod/photos.php:1001
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com"
+
+#: ../../mod/photos.php:1004
+msgid "Flag as adult in album view"
+msgstr "Marcar como \"solo para adultos\" en el álbum"
+
+#: ../../mod/photos.php:1196
+msgid "In This Photo:"
+msgstr "En esta foto:"
+
+#: ../../mod/photos.php:1201
+msgid "Map"
+msgstr "Mapa"
+
+#: ../../mod/photos.php:1289
+msgid "View Album"
+msgstr "Ver álbum"
+
+#: ../../mod/photos.php:1300 ../../mod/photos.php:1313
+#: ../../mod/photos.php:1314
+msgid "Recent Photos"
+msgstr "Fotos recientes"
 
 #: ../../mod/lockview.php:37
 msgid "Remote privacy information not available."
@@ -8472,7 +8419,7 @@ msgstr "Exportar la información sobre su canal y el contenido reciente a un fic
 
 #: ../../mod/uexport.php:56
 msgid "Export your posts from a given year."
-msgstr "Exporta sus entradas de un año dado."
+msgstr "Exporta sus publicaciones de un año dado."
 
 #: ../../mod/uexport.php:58
 msgid ""
@@ -8587,6 +8534,16 @@ msgstr "Tiempo de expiración de los mensajes en los chats (en minutos)"
 msgid "%1$s's Chatrooms"
 msgstr "Salas de chat de %1$s"
 
+#: ../../mod/search.php:212
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "elementos etiquetados con: %s"
+
+#: ../../mod/search.php:214
+#, php-format
+msgid "Search results for: %s"
+msgstr "Resultados de la búsqueda para: %s"
+
 #: ../../mod/viewsrc.php:40
 msgid "Source of Item"
 msgstr "Origen del elemento"
@@ -8680,22 +8637,6 @@ msgstr "Buscar sus conexiones"
 msgid "Finding: "
 msgstr "Búsqueda:"
 
-#: ../../mod/help.php:147
-msgid "Documentation Search"
-msgstr "Búsqueda de Documentación"
-
-#: ../../mod/help.php:184 ../../mod/help.php:190 ../../mod/help.php:196
-msgid "Help:"
-msgstr "Ayuda:"
-
-#: ../../mod/help.php:211 ../../index.php:238
-msgid "Not Found"
-msgstr "No encontrado"
-
-#: ../../mod/help.php:235
-msgid "$Projectname Documentation"
-msgstr "Documentación de $Projectname"
-
 #: ../../mod/manage.php:130
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
@@ -8827,72 +8768,165 @@ msgstr "El título del menú tal como será visto por los demás"
 msgid "Allow bookmarks"
 msgstr "Permitir marcadores"
 
-#: ../../mod/post.php:234
+#: ../../mod/mail.php:34
+msgid "Unable to lookup recipient."
+msgstr "Imposible asociar a un destinatario."
+
+#: ../../mod/mail.php:42
+msgid "Unable to communicate with requested channel."
+msgstr "Imposible comunicar con el canal solicitado."
+
+#: ../../mod/mail.php:49
+msgid "Cannot verify requested channel."
+msgstr "No se puede verificar el canal solicitado."
+
+#: ../../mod/mail.php:75
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
+
+#: ../../mod/mail.php:140
+msgid "Messages"
+msgstr "Mensajes"
+
+#: ../../mod/mail.php:175
+msgid "Message recalled."
+msgstr "Mensaje revocado."
+
+#: ../../mod/mail.php:188
+msgid "Conversation removed."
+msgstr "Conversación eliminada."
+
+#: ../../mod/mail.php:231
+msgid "Requested channel is not in this network"
+msgstr "El canal solicitado no existe en esta red"
+
+#: ../../mod/mail.php:239
+msgid "Send Private Message"
+msgstr "Enviar un mensaje privado"
+
+#: ../../mod/mail.php:240 ../../mod/mail.php:370
+msgid "To:"
+msgstr "Para:"
+
+#: ../../mod/mail.php:243 ../../mod/mail.php:372
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: ../../mod/mail.php:250
+msgid "Send"
+msgstr "Enviar"
+
+#: ../../mod/mail.php:342
+msgid "Delete message"
+msgstr "Borrar mensaje"
+
+#: ../../mod/mail.php:343
+msgid "Delivery report"
+msgstr "Informe de transmisión"
+
+#: ../../mod/mail.php:344
+msgid "Recall message"
+msgstr "Revocar el mensaje"
+
+#: ../../mod/mail.php:346
+msgid "Message has been recalled."
+msgstr "El mensaje ha sido revocado."
+
+#: ../../mod/mail.php:363
+msgid "Delete Conversation"
+msgstr "Eliminar conversación"
+
+#: ../../mod/mail.php:365
 msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo."
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
+
+#: ../../mod/mail.php:369
+msgid "Send Reply"
+msgstr "Responder"
+
+#: ../../mod/mail.php:374
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Su mensaje para %s (%s):"
+
+#: ../../mod/help.php:148
+msgid "Documentation Search"
+msgstr "Búsqueda de Documentación"
+
+#: ../../mod/help.php:186 ../../mod/help.php:192 ../../mod/help.php:198
+msgid "Help:"
+msgstr "Ayuda:"
+
+#: ../../mod/help.php:213 ../../index.php:238
+msgid "Not Found"
+msgstr "No encontrado"
+
+#: ../../mod/help.php:237
+msgid "$Projectname Documentation"
+msgstr "Documentación de $Projectname"
 
 #: ../../mod/service_limits.php:19
 msgid "No service class restrictions found."
 msgstr "No se han encontrado restricciones sobre esta clase de servicio."
 
-#: ../../mod/siteinfo.php:111
+#: ../../mod/siteinfo.php:15
 #, php-format
 msgid "Version %s"
 msgstr "Versión %s"
 
-#: ../../mod/siteinfo.php:132
+#: ../../mod/siteinfo.php:36
 msgid "Installed plugins/addons/apps:"
-msgstr "Extensiones/Aplicaciones instaladas:"
+msgstr "Extensiones, complementos o aplicaciones instaladas:"
 
-#: ../../mod/siteinfo.php:145
+#: ../../mod/siteinfo.php:49
 msgid "No installed plugins/addons/apps"
-msgstr "Extensiones/Aplicaciones no instaladas:"
+msgstr "No hay instalada ninguna extensión, complemento o aplicación"
 
-#: ../../mod/siteinfo.php:158
+#: ../../mod/siteinfo.php:62
 msgid ""
 "This is a hub of $Projectname - a global cooperative network of "
 "decentralized privacy enhanced websites."
 msgstr "Este es un sitio integrado en $Projectname - una red cooperativa mundial de sitios web descentralizados de privacidad mejorada."
 
-#: ../../mod/siteinfo.php:160
+#: ../../mod/siteinfo.php:64
 msgid "Tag: "
 msgstr "Etiqueta:"
 
-#: ../../mod/siteinfo.php:162
+#: ../../mod/siteinfo.php:66
 msgid "Last background fetch: "
 msgstr "Última actualización en segundo plano:"
 
-#: ../../mod/siteinfo.php:164
+#: ../../mod/siteinfo.php:68
 msgid "Current load average: "
 msgstr "Carga media actual:"
 
-#: ../../mod/siteinfo.php:167
+#: ../../mod/siteinfo.php:71
 msgid "Running at web location"
 msgstr "Corriendo en el sitio web"
 
-#: ../../mod/siteinfo.php:168
+#: ../../mod/siteinfo.php:72
 msgid ""
 "Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
 "about $Projectname."
 msgstr "Por favor, visite <a href=\"http://hubzilla.org\">hubzilla.org</a> para más información sobre $Projectname."
 
-#: ../../mod/siteinfo.php:169
+#: ../../mod/siteinfo.php:73
 msgid "Bug reports and issues: please visit"
 msgstr "Informes de errores e incidencias: por, favor visite"
 
-#: ../../mod/siteinfo.php:171
+#: ../../mod/siteinfo.php:75
 msgid "$projectname issues"
 msgstr "Problemas en $projectname"
 
-#: ../../mod/siteinfo.php:172
+#: ../../mod/siteinfo.php:76
 msgid ""
 "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
 "com"
 msgstr "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com"
 
-#: ../../mod/siteinfo.php:174
+#: ../../mod/siteinfo.php:78
 msgid "Site Administrators"
 msgstr "Administradores del sitio"
 
@@ -8926,77 +8960,105 @@ msgstr "Se requieren el título del evento y su hora de inicio."
 msgid "Event not found."
 msgstr "Evento no encontrado."
 
-#: ../../mod/events.php:452
-msgid "Event Title"
+#: ../../mod/events.php:437
+msgid "Edit event titel"
+msgstr "Editar el título del evento"
+
+#: ../../mod/events.php:437
+msgid "Event titel"
 msgstr "Título del evento"
 
-#: ../../mod/events.php:454
+#: ../../mod/events.php:439
 msgid "Categories (comma-separated list)"
 msgstr "Categorías (lista separada por comas)"
 
-#: ../../mod/events.php:455
+#: ../../mod/events.php:440
+msgid "Edit Category"
+msgstr "Editar la categoría"
+
+#: ../../mod/events.php:440
 msgid "Category"
 msgstr "Categoría"
 
-#: ../../mod/events.php:458
+#: ../../mod/events.php:443
+msgid "Edit start date and time"
+msgstr "Modificar la fecha y hora de comienzo"
+
+#: ../../mod/events.php:443
 msgid "Start date and time"
 msgstr "Fecha y hora de comienzo"
 
-#: ../../mod/events.php:459 ../../mod/events.php:462
+#: ../../mod/events.php:444 ../../mod/events.php:447
 msgid "Finish date and time are not known or not relevant"
 msgstr "La fecha y hora de terminación no se conocen o no son relevantes"
 
-#: ../../mod/events.php:461
+#: ../../mod/events.php:446
+msgid "Edit finish date and time"
+msgstr "Modificar la fecha y hora de terminación"
+
+#: ../../mod/events.php:446
 msgid "Finish date and time"
 msgstr "Fecha y hora de terminación"
 
-#: ../../mod/events.php:463 ../../mod/events.php:464
+#: ../../mod/events.php:448 ../../mod/events.php:449
 msgid "Adjust for viewer timezone"
 msgstr "Ajustar para obtener el visor de zona horaria"
 
-#: ../../mod/events.php:463
+#: ../../mod/events.php:448
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales."
 
-#: ../../mod/events.php:470 ../../mod/events.php:472
+#: ../../mod/events.php:450
+msgid "Edit Description"
+msgstr "Editar la descripción"
+
+#: ../../mod/events.php:452
+msgid "Edit Location"
+msgstr "Modificar la localización"
+
+#: ../../mod/events.php:455 ../../mod/events.php:457
 msgid "Share this event"
 msgstr "Compartir este evento"
 
-#: ../../mod/events.php:477
+#: ../../mod/events.php:462
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: ../../mod/events.php:589
+#: ../../mod/events.php:574
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../mod/events.php:611
+#: ../../mod/events.php:596
 msgid "Edit event"
 msgstr "Editar evento"
 
-#: ../../mod/events.php:613
+#: ../../mod/events.php:598
 msgid "Delete event"
 msgstr "Borrar evento"
 
-#: ../../mod/events.php:647
+#: ../../mod/events.php:632
 msgid "calendar"
 msgstr "calendario"
 
-#: ../../mod/events.php:666
-msgid "New Event"
-msgstr "Nuevo evento"
+#: ../../mod/events.php:651
+msgid "Edit Event"
+msgstr "Editar el evento"
+
+#: ../../mod/events.php:651
+msgid "Create Event"
+msgstr "Crear un evento"
 
-#: ../../mod/events.php:676
+#: ../../mod/events.php:661
 msgid "Today"
 msgstr "Hoy"
 
-#: ../../mod/events.php:707
+#: ../../mod/events.php:692
 msgid "Event removed"
 msgstr "Evento borrado"
 
-#: ../../mod/events.php:710
+#: ../../mod/events.php:695
 msgid "Failed to remove event"
 msgstr "Error al eliminar el evento"
 
@@ -9128,10 +9190,6 @@ msgstr "Editar elemento del menú"
 msgid "Link text"
 msgstr "Texto del enlace"
 
-#: ../../mod/wholikesme.php:13
-msgid "Who likes me?"
-msgstr "¿Quién me ha puesto \"Me gusta\"?"
-
 #: ../../mod/sharedwithme.php:94
 msgid "Files: shared with me"
 msgstr "Ficheros: compartidos conmigo"
@@ -9255,7 +9313,7 @@ msgstr "Ejemplo: 14px"
 
 #: ../../view/theme/redbasic/php/config.php:124
 msgid "Set font-size for posts and comments"
-msgstr "Ajustar el tamaño del tipo de letra para entradas y comentarios"
+msgstr "Ajustar el tamaño del tipo de letra para publicaciones y comentarios"
 
 #: ../../view/theme/redbasic/php/config.php:125
 msgid "Set font-color for posts and comments"
@@ -9293,51 +9351,57 @@ msgstr "Ajustar el tamaño de la foto del autor de la conversación"
 msgid "Set size of followup author photos"
 msgstr "Ajustar el tamaño de foto de los seguidores del autor"
 
-#: ../../boot.php:1291
+#: ../../Zotlabs/Zot/Auth.php:140
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo."
+
+#: ../../boot.php:1299
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "La actualización %s ha fallado. Mire el informe de errores."
 
-#: ../../boot.php:1294
+#: ../../boot.php:1302
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error de actualización en %s"
 
-#: ../../boot.php:1461
+#: ../../boot.php:1469
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla"
 
-#: ../../boot.php:1489
+#: ../../boot.php:1491
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../../boot.php:1490
+#: ../../boot.php:1492
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../../boot.php:1493
+#: ../../boot.php:1495
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:2113
+#: ../../boot.php:2115
 msgid "toggle mobile"
 msgstr "cambiar a modo móvil"
 
-#: ../../boot.php:2248
+#: ../../boot.php:2250
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
 
-#: ../../boot.php:2251
+#: ../../boot.php:2253
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2288
+#: ../../boot.php:2290
 msgid "Cron/Scheduled tasks not running."
 msgstr "Las tareas del Planificador/Cron no están funcionando."
 
-#: ../../boot.php:2292
+#: ../../boot.php:2294
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Las tareas de Cron no están funcionando en %s"
diff --git a/view/es/hstrings.php b/view/es-es/hstrings.php
index 18cdf0a8a..e3af4e95e 100644
--- a/view/es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -1,7 +1,7 @@
 <?php
 
-if(! function_exists("string_plural_select_es")) {
-function string_plural_select_es($n){
+if(! function_exists("string_plural_select_es_es")) {
+function string_plural_select_es_es($n){
 	return ($n != 1);;
 }}
 ;
@@ -19,8 +19,100 @@ $a->strings["Cannot create a duplicate channel identifier on this system. Import
 $a->strings["Unable to create a unique channel address. Import failed."] = "No se ha podido crear una dirección de canal única. Ha fallado la importación.";
 $a->strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado.";
 $a->strings["Cloned channel not found. Import failed."] = "No se ha podido importar el canal porque el canal clonado no se ha encontrado.";
-$a->strings["parent"] = "padre";
+$a->strings["prev"] = "anterior";
+$a->strings["first"] = "primera";
+$a->strings["last"] = "última";
+$a->strings["next"] = "próxima";
+$a->strings["older"] = "más antiguas";
+$a->strings["newer"] = "más recientes";
+$a->strings["No connections"] = "Sin conexiones";
+$a->strings["%d Connection"] = array(
+	0 => "%d Conexión",
+	1 => "%d Conexiones",
+);
+$a->strings["View Connections"] = "Ver conexiones";
+$a->strings["Search"] = "Buscar";
+$a->strings["Save"] = "Guardar";
+$a->strings["poke"] = "un toque";
+$a->strings["poked"] = "ha dado un toque a";
+$a->strings["ping"] = "un \"ping\"";
+$a->strings["pinged"] = "ha enviado un \"ping\" a";
+$a->strings["prod"] = "una incitación ";
+$a->strings["prodded"] = "ha incitado a ";
+$a->strings["slap"] = "una bofetada ";
+$a->strings["slapped"] = "ha abofeteado a ";
+$a->strings["finger"] = "un \"finger\" ";
+$a->strings["fingered"] = "envió un \"finger\" a";
+$a->strings["rebuff"] = "un reproche";
+$a->strings["rebuffed"] = "ha hecho un reproche a ";
+$a->strings["happy"] = "feliz ";
+$a->strings["sad"] = "triste ";
+$a->strings["mellow"] = "tranquilo/a";
+$a->strings["tired"] = "cansado/a ";
+$a->strings["perky"] = "vivaz";
+$a->strings["angry"] = "enfadado/a";
+$a->strings["stupefied"] = "asombrado";
+$a->strings["puzzled"] = "perplejo/a";
+$a->strings["interested"] = "interesado/a";
+$a->strings["bitter"] = "amargado/a";
+$a->strings["cheerful"] = "alegre";
+$a->strings["alive"] = "animado/a";
+$a->strings["annoyed"] = "molesto/a";
+$a->strings["anxious"] = "ansioso/a";
+$a->strings["cranky"] = "de mal humor";
+$a->strings["disturbed"] = "perturbado/a";
+$a->strings["frustrated"] = "frustrado/a";
+$a->strings["depressed"] = "deprimido/a";
+$a->strings["motivated"] = "motivado/a";
+$a->strings["relaxed"] = "relajado/a";
+$a->strings["surprised"] = "sorprendido/a";
+$a->strings["Monday"] = "lunes";
+$a->strings["Tuesday"] = "martes";
+$a->strings["Wednesday"] = "miércoles";
+$a->strings["Thursday"] = "jueves";
+$a->strings["Friday"] = "viernes";
+$a->strings["Saturday"] = "sábado";
+$a->strings["Sunday"] = "domingo";
+$a->strings["January"] = "enero";
+$a->strings["February"] = "febrero";
+$a->strings["March"] = "marzo";
+$a->strings["April"] = "abril";
+$a->strings["May"] = "mayo";
+$a->strings["June"] = "junio";
+$a->strings["July"] = "julio";
+$a->strings["August"] = "agosto";
+$a->strings["September"] = "septiembre";
+$a->strings["October"] = "octubre";
+$a->strings["November"] = "noviembre";
+$a->strings["December"] = "diciembre";
+$a->strings["Unknown Attachment"] = "Adjunto no reconocido";
+$a->strings["Size"] = "Tamaño";
+$a->strings["unknown"] = "desconocido";
+$a->strings["remove category"] = "eliminar categoría";
+$a->strings["remove from file"] = "eliminar del fichero";
+$a->strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
+$a->strings["Starts:"] = "Comienza:";
+$a->strings["Finishes:"] = "Finaliza:";
+$a->strings["Location:"] = "Ubicación:";
+$a->strings["Click to open/close"] = "Pulsar para abrir/cerrar";
+$a->strings["Link to Source"] = "Enlazar con la entrada en su ubicación original";
+$a->strings["default"] = "por defecto";
+$a->strings["Page layout"] = "Formato de la página";
+$a->strings["You can create your own with the layouts tool"] = "Puede crear su propio formato gráfico con las herramientas de diseño";
+$a->strings["Page content type"] = "Tipo de contenido de página";
+$a->strings["Select an alternate language"] = "Seleccionar un idioma alternativo";
+$a->strings["photo"] = "foto";
+$a->strings["event"] = "evento";
+$a->strings["status"] = "el mensaje de estado";
+$a->strings["comment"] = "el comentario";
+$a->strings["activity"] = "actividad";
+$a->strings["Design Tools"] = "Herramientas de diseño";
+$a->strings["Blocks"] = "Bloques";
+$a->strings["Menus"] = "Menús";
+$a->strings["Layouts"] = "Formato gráfico";
+$a->strings["Pages"] = "Páginas";
 $a->strings["Collection"] = "Colección";
+$a->strings["parent"] = "padre";
 $a->strings["Principal"] = "Principal";
 $a->strings["Addressbook"] = "Libreta de direcciones";
 $a->strings["Calendar"] = "Calendario";
@@ -34,7 +126,6 @@ $a->strings["Create"] = "Crear";
 $a->strings["Upload"] = "Subir";
 $a->strings["Name"] = "Nombre";
 $a->strings["Type"] = "Tipo";
-$a->strings["Size"] = "Tamaño";
 $a->strings["Last Modified"] = "Última modificación";
 $a->strings["Edit"] = "Editar";
 $a->strings["Delete"] = "Eliminar";
@@ -81,18 +172,7 @@ $a->strings["about a year"] = "alrededor de un año";
 $a->strings["%d years"] = "%d años";
 $a->strings[" "] = " ";
 $a->strings["timeago.numbers"] = "timeago.numbers";
-$a->strings["January"] = "enero";
-$a->strings["February"] = "febrero";
-$a->strings["March"] = "marzo";
-$a->strings["April"] = "abril";
 $a->strings["__ctx:long__ May"] = "mayo";
-$a->strings["June"] = "junio";
-$a->strings["July"] = "julio";
-$a->strings["August"] = "agosto";
-$a->strings["September"] = "septiembre";
-$a->strings["October"] = "octubre";
-$a->strings["November"] = "noviembre";
-$a->strings["December"] = "diciembre";
 $a->strings["Jan"] = "ene";
 $a->strings["Feb"] = "feb";
 $a->strings["Mar"] = "mar";
@@ -105,13 +185,6 @@ $a->strings["Sep"] = "sep";
 $a->strings["Oct"] = "oct";
 $a->strings["Nov"] = "nov";
 $a->strings["Dec"] = "dic";
-$a->strings["Sunday"] = "domingo";
-$a->strings["Monday"] = "lunes";
-$a->strings["Tuesday"] = "martes";
-$a->strings["Wednesday"] = "miércoles";
-$a->strings["Thursday"] = "jueves";
-$a->strings["Friday"] = "viernes";
-$a->strings["Saturday"] = "sábado";
 $a->strings["Sun"] = "dom";
 $a->strings["Mon"] = "lun";
 $a->strings["Tue"] = "mar";
@@ -143,23 +216,7 @@ $a->strings["Collection is empty."] = "La colección está vacía.";
 $a->strings["Collection: %s"] = "Colección: %s";
 $a->strings["Connection: %s"] = "Conexión: %s";
 $a->strings["Connection not found."] = "Conexión no encontrada";
-$a->strings["No recipient provided."] = "No se ha especificado ningún destinatario.";
-$a->strings["[no subject]"] = "[sin asunto]";
-$a->strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
-$a->strings["Stored post could not be verified."] = "No se han podido verificar las entradas guardadas.";
-$a->strings["view full size"] = "Ver en el tamaño original";
-$a->strings["\$Projectname Notification"] = "Notificación de \$Projectname";
-$a->strings["\$projectname"] = "\$projectname";
-$a->strings["Thank You,"] = "Gracias,";
-$a->strings["%s Administrator"] = "%s Administrador";
-$a->strings["Administrator"] = "Administrador";
-$a->strings["No Subject"] = "Sin asunto";
-$a->strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
-$a->strings["Starts:"] = "Comienza:";
-$a->strings["Finishes:"] = "Finaliza:";
-$a->strings["Location:"] = "Ubicación:";
 $a->strings["This event has been added to your calendar."] = "Este evento ha sido añadido a su calendario.";
-$a->strings["event"] = "evento";
 $a->strings["Not specified"] = "Sin especificar";
 $a->strings["Needs Action"] = "Necesita de una intervención";
 $a->strings["Completed"] = "Completado/a";
@@ -174,7 +231,7 @@ $a->strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso.
 $a->strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio.";
 $a->strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada";
 $a->strings["Default Profile"] = "Perfil principal";
-$a->strings["Friends"] = "Amigos";
+$a->strings["Friends"] = "Amigos/as";
 $a->strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
 $a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
 $a->strings["Change profile photo"] = "Cambiar la foto del perfil";
@@ -236,18 +293,26 @@ $a->strings["has"] = "tiene";
 $a->strings["want"] = "quiero";
 $a->strings["wants"] = "quiere";
 $a->strings["like"] = "me gusta";
-$a->strings["likes"] = "le gusta";
+$a->strings["likes"] = "gusta de";
 $a->strings["dislike"] = "no me gusta";
-$a->strings["dislikes"] = "no le gusta";
+$a->strings["dislikes"] = "no gusta de";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio";
+$a->strings["Image file is empty."] = "El fichero de imagen está vacío. ";
+$a->strings["Unable to process image"] = "No ha sido posible procesar la imagen";
+$a->strings["Photo storage failed."] = "La foto no ha podido ser guardada.";
+$a->strings["a new photo"] = "una nueva foto";
+$a->strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha publicado %2\$s en %3\$s";
+$a->strings["Photo Albums"] = "�lbumes de fotos";
+$a->strings["Upload New Photos"] = "Subir nuevas fotos";
 $a->strings["Visible to your default audience"] = "Visible para su público predeterminado.";
 $a->strings["Show"] = "Mostrar";
 $a->strings["Don't show"] = "No mostrar";
-$a->strings["Other networks and post services"] = "Otras redes y servicios de correo";
+$a->strings["Other networks and post services"] = "Otras redes y servicios de publicación";
 $a->strings["Permissions"] = "Permisos";
 $a->strings["Close"] = "Cerrar";
 $a->strings[" and "] = "y";
 $a->strings["public profile"] = "perfil público";
-$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s cambió %2\$s a &ldquo;%3\$s&rdquo;";
+$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s ha cambiado %2\$s a &ldquo;%3\$s&rdquo;";
 $a->strings["Visit %1\$s's %2\$s"] = "Visitar %2\$s de %1\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha actualizado %2\$s cambiando %3\$s.";
 $a->strings["Item was not found."] = "Elemento no encontrado.";
@@ -265,8 +330,6 @@ $a->strings["Path not found."] = "Ruta no encontrada";
 $a->strings["mkdir failed."] = "mkdir ha fallado.";
 $a->strings["database storage failed."] = "el almacenamiento en la base de datos ha fallado.";
 $a->strings["Empty path"] = "Ruta vacía";
-$a->strings["Attachments:"] = "Ficheros adjuntos:";
-$a->strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname:";
 $a->strings["created a new post"] = "ha creado una nueva entrada";
 $a->strings["commented on %s's post"] = "ha comentado la entrada de %s";
 $a->strings["Apps"] = "Aplicaciones";
@@ -282,7 +345,6 @@ $a->strings["Add New Connection"] = "Añadir nueva conexión";
 $a->strings["Enter the channel address"] = "Introducir la dirección del canal";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Ejemplo: paco@ejemplo.com, http://ejemplo.com/paco";
 $a->strings["Notes"] = "Notas";
-$a->strings["Save"] = "Guardar";
 $a->strings["Remove term"] = "Eliminar término";
 $a->strings["Saved Searches"] = "Búsquedas guardadas";
 $a->strings["add"] = "añadir";
@@ -292,12 +354,12 @@ $a->strings["Archives"] = "Hemeroteca";
 $a->strings["Me"] = "Yo";
 $a->strings["Family"] = "Familia";
 $a->strings["Acquaintances"] = "Conocidos/as";
-$a->strings["All"] = "Todas";
+$a->strings["All"] = "Todos/as";
 $a->strings["Refresh"] = "Recargar";
 $a->strings["Account settings"] = "Configuración de la cuenta";
 $a->strings["Channel settings"] = "Configuración del canal";
-$a->strings["Additional features"] = "Características adicionales";
-$a->strings["Feature/Addon settings"] = "Configuración de características o complementos";
+$a->strings["Additional features"] = "Funcionalidades";
+$a->strings["Feature/Addon settings"] = "Complementos";
 $a->strings["Display settings"] = "Ajustes de visualización";
 $a->strings["Connected apps"] = "Aplicaciones conectadas";
 $a->strings["Export channel"] = "Exportar canal";
@@ -321,6 +383,9 @@ $a->strings["Week View"] = "Eventos de la semana";
 $a->strings["Month View"] = "Eventos del mes";
 $a->strings["Export"] = "Exportar";
 $a->strings["Import"] = "Importar";
+$a->strings["Events Tools"] = "Gestión de eventos";
+$a->strings["Export Calendar"] = "Exportar el calendario";
+$a->strings["Import Calendar"] = "Importar un calendario";
 $a->strings["Chat Rooms"] = "Salas de chat";
 $a->strings["Bookmarked Chatrooms"] = "Salas de chat preferidas";
 $a->strings["Suggested Chatrooms"] = "Salas de chat sugeridas";
@@ -345,12 +410,14 @@ $a->strings["Profile Config"] = "Ajustes del perfil";
 $a->strings["DB updates"] = "Actualizaciones de la base de datos";
 $a->strings["Logs"] = "Informes";
 $a->strings["Admin"] = "Administrador";
-$a->strings["Plugin Features"] = "Ajustes de la extensión";
+$a->strings["Plugin Features"] = "Extensiones";
 $a->strings["User registrations waiting for confirmation"] = "Registros de usuarios pendientes de confirmación";
 $a->strings["View Photo"] = "Ver foto";
 $a->strings["Edit Album"] = "Editar álbum";
+$a->strings["Attachments:"] = "Ficheros adjuntos:";
+$a->strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname:";
 $a->strings["%1\$s's bookmarks"] = "Marcadores de %1\$s";
-$a->strings["General Features"] = "Características generales";
+$a->strings["General Features"] = "Funcionalidades básicas";
 $a->strings["Content Expiration"] = "Caducidad del contenido";
 $a->strings["Remove posts/comments and/or private messages at a future time"] = "Eliminar publicaciones/comentarios y/o mensajes privados más adelante";
 $a->strings["Multiple Profiles"] = "Múltiples perfiles";
@@ -371,15 +438,15 @@ $a->strings["Expert Mode"] = "Modo de experto";
 $a->strings["Enable Expert Mode to provide advanced configuration options"] = "Habilitar el modo de experto para acceder a opciones avanzadas de configuración";
 $a->strings["Premium Channel"] = "Canal premium";
 $a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Les permite configurar restricciones y normas de uso a aquellos que conectan con su canal";
-$a->strings["Post Composition Features"] = "Características de composición de entradas";
+$a->strings["Post Composition Features"] = "Opciones para la redacción de entradas";
 $a->strings["Use Markdown"] = "Usar Markdown";
 $a->strings["Allow use of \"Markdown\" to format posts"] = "Permitir el uso de \"Markdown\" para formatear publicaciones";
 $a->strings["Large Photos"] = "Fotos de gran tamaño";
-$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (6400px)";
+$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)";
 $a->strings["Automatically import channel content from other channels or feeds"] = "Importar automáticamente contenido de otros canales o \"feeds\"";
 $a->strings["Even More Encryption"] = "Más cifrado todavía";
 $a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida.";
-$a->strings["Enable Voting Tools"] = "Activar herramientas de votación";
+$a->strings["Enable Voting Tools"] = "Permitir entradas con votación";
 $a->strings["Provide a class of post which others can vote on"] = "Proveer una clase de publicación en la que otros puedan votar";
 $a->strings["Delayed Posting"] = "Publicación aplazada";
 $a->strings["Allow posts to be published at a later date"] = "Permitir mensajes que se publicarán en una fecha posterior";
@@ -396,12 +463,12 @@ $a->strings["Enable tab to display only Network posts that you've interacted on"
 $a->strings["Network New Tab"] = "Contenido nuevo";
 $a->strings["Enable tab to display all new Network activity"] = "Habilitar una pestaña en la que se muestre solo el contenido nuevo";
 $a->strings["Affinity Tool"] = "Herramienta de afinidad";
-$a->strings["Filter stream activity by depth of relationships"] = "Filtrar la actividad del flujo por profundidad de relaciones";
+$a->strings["Filter stream activity by depth of relationships"] = "Filtrar el contenido según la profundidad de las relaciones";
 $a->strings["Connection Filtering"] = "Filtrado de conexiones";
 $a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido";
 $a->strings["Suggest Channels"] = "Sugerir canales";
 $a->strings["Show channel suggestions"] = "Mostrar sugerencias de canales";
-$a->strings["Post/Comment Tools"] = "Herramientas de entradas/comentarios";
+$a->strings["Post/Comment Tools"] = "Gestión de entradas y comentarios";
 $a->strings["Tagging"] = "Etiquetado";
 $a->strings["Ability to tag existing posts"] = "Capacidad de etiquetar entradas existentes";
 $a->strings["Post Categories"] = "Categorías de entradas";
@@ -493,15 +560,11 @@ $a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "hace %
 $a->strings["%1\$s's birthday"] = "Cumpleaños de %1\$s";
 $a->strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s";
 $a->strings["Public Timeline"] = "Cronología pública";
-$a->strings["photo"] = "foto";
-$a->strings["channel"] = "canal";
-$a->strings["status"] = "el mensaje de estado";
-$a->strings["comment"] = "comentario";
+$a->strings["channel"] = "el canal";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s le gusta %3\$s de %2\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "a %1\$s no le gusta %3\$s de %2\$s";
 $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s";
-$a->strings["poked"] = "ha recibido un toque";
 $a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s";
 $a->strings["__ctx:title__ Likes"] = "Me gusta";
 $a->strings["__ctx:title__ Dislikes"] = "No me gusta";
@@ -526,13 +589,13 @@ $a->strings["Please wait"] = "Espere por favor";
 $a->strings["remove"] = "eliminar";
 $a->strings["Loading..."] = "Cargando...";
 $a->strings["Delete Selected Items"] = "Eliminar elementos seleccionados";
-$a->strings["View Source"] = "Ver la fuente original de la entrada";
+$a->strings["View Source"] = "Ver la fuente original de la publicación";
 $a->strings["Follow Thread"] = "Seguir este hilo";
 $a->strings["Unfollow Thread"] = "Dejar de seguir este hilo";
-$a->strings["View Status"] = "Ver el estado actual";
+$a->strings["View Status"] = "Ver mi estado actual";
 $a->strings["View Profile"] = "Ver el perfil";
 $a->strings["View Photos"] = "Ver fotos";
-$a->strings["Activity/Posts"] = "Actividad y entradas";
+$a->strings["Activity/Posts"] = "Actividad y publicaciones";
 $a->strings["Edit Connection"] = "Editar conexión";
 $a->strings["Send PM"] = "Enviar un mensaje privado";
 $a->strings["Poke"] = "Toques y otras cosas";
@@ -597,14 +660,14 @@ $a->strings["Encrypt text"] = "Cifrar texto";
 $a->strings["OK"] = "OK";
 $a->strings["Cancel"] = "Cancelar";
 $a->strings["Discover"] = "Descubrir";
-$a->strings["Imported public streams"] = "Flujos públicos importados";
+$a->strings["Imported public streams"] = "Contenidos públicos importados";
 $a->strings["Commented Order"] = "Comentarios recientes";
 $a->strings["Sort by Comment Date"] = "Ordenar por fecha de comentario";
 $a->strings["Posted Order"] = "Publicaciones recientes";
 $a->strings["Sort by Post Date"] = "Ordenar por fecha de publicación";
 $a->strings["Posts that mention or involve you"] = "Publicaciones que le mencionan o involucran";
 $a->strings["New"] = "Nuevas";
-$a->strings["Activity Stream - by date"] = "Flujo de actividad - por fecha";
+$a->strings["Activity Stream - by date"] = "Contenido - por fecha";
 $a->strings["Starred"] = "Preferidas";
 $a->strings["Favourite Posts"] = "Publicaciones favoritas";
 $a->strings["Spam"] = "Correo basura";
@@ -614,7 +677,6 @@ $a->strings["Status Messages and Posts"] = "Mensajes de estado y publicaciones";
 $a->strings["About"] = "Mi perfil";
 $a->strings["Profile Details"] = "Detalles del perfil";
 $a->strings["Photos"] = "Fotos";
-$a->strings["Photo Albums"] = "�lbumes de fotos";
 $a->strings["Files and Storage"] = "Ficheros y repositorio";
 $a->strings["Chatrooms"] = "Salas de chat";
 $a->strings["Bookmarks"] = "Marcadores";
@@ -669,10 +731,6 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
-$a->strings["Invalid data packet"] = "Paquete de datos no válido";
-$a->strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
-$a->strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
-$a->strings["invalid target signature"] = "La firma recibida no es válida";
 $a->strings["Image/photo"] = "Imagen/foto";
 $a->strings["Encrypted content"] = "Contenido cifrado";
 $a->strings["Install %s element: "] = "Instalar el elemento %s:";
@@ -685,7 +743,7 @@ $a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió la sigui
 $a->strings["post"] = "entrada";
 $a->strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta";
 $a->strings["$1 spoiler"] = "$1 spoiler";
-$a->strings["$1 wrote:"] = "$1 escribió";
+$a->strings["$1 wrote:"] = "$1 escribió:";
 $a->strings["%d invitation available"] = array(
 	0 => "%d invitación pendiente",
 	1 => "%d invitaciones disponibles",
@@ -705,16 +763,14 @@ $a->strings["%d connection in common"] = array(
 	1 => "%d conexiones en común",
 );
 $a->strings["show more"] = "mostrar más";
-$a->strings["Directory Options"] = "Opciones del directorio";
-$a->strings["Safe Mode"] = "Modo seguro";
-$a->strings["No"] = "No";
-$a->strings["Yes"] = "Sí";
-$a->strings["Public Forums Only"] = "Solo foros públicos";
-$a->strings["This Website Only"] = "Solo este sitio web";
+$a->strings["\$Projectname Notification"] = "Notificación de \$Projectname";
+$a->strings["\$projectname"] = "\$projectname";
+$a->strings["Thank You,"] = "Gracias,";
+$a->strings["%s Administrator"] = "%s Administrador";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Aviso] Nuevo mensaje en %s";
 $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s le envió %2\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s le ha enviado %2\$s.";
 $a->strings["a private message"] = "un mensaje privado";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
 $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s[/zrl]";
@@ -723,18 +779,18 @@ $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %
 $a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Aviso] Nuevo comentario de %2\$s a la conversación #%1\$d";
 $a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha comentado un elemento/conversación que ha estado siguiendo.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s";
-$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s publicó en su página del perfil en %3\$s";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s publicó en [zrl=%3\$s]su página del perfil[/zrl]";
+$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s ha publicado en su página del perfil en %3\$s";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s ha publicado en [zrl=%3\$s]su página del perfil[/zrl]";
 $a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Aviso] %s le ha etiquetado";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le etiquetó en %3\$s";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le ha etiquetado en %3\$s";
 $a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]le etiquetó[/zrl].";
 $a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Aviso] %1\$s le ha dado un toque";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le dio un toque en %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le dio un toque[/zrl].";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le ha dado un toque en %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le ha dado un toque[/zrl].";
 $a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Aviso] %s ha etiquetado su publicación";
 $a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha etiquetado su publicación en %3\$s";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s etiquetó [zrl=%3\$s]su publicación[/zrl]";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha etiquetado [zrl=%3\$s]su publicación[/zrl]";
 $a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Aviso] Ha recibido una solicitud de conexión";
 $a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una nueva solicitud de conexión de '%2\$s' en  %3\$s";
 $a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una nueva solicitud de conexión[/zrl] de %3\$s.";
@@ -757,10 +813,14 @@ $a->strings["local account not found."] = "No se ha encontrado la cuenta local."
 $a->strings["Cannot connect to yourself."] = "No puede conectarse consigo mismo.";
 $a->strings["Embedded content"] = "Contenido incorporado";
 $a->strings["Embedding disabled"] = "Incrustación deshabilitada";
+$a->strings["No recipient provided."] = "No se ha especificado ningún destinatario.";
+$a->strings["[no subject]"] = "[sin asunto]";
+$a->strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
+$a->strings["Stored post could not be verified."] = "No se han podido verificar las publicaciones guardadas.";
 $a->strings["Logout"] = "Finalizar sesión";
 $a->strings["End this session"] = "Finalizar esta sesión";
 $a->strings["Home"] = "Inicio";
-$a->strings["Your posts and conversations"] = "Sus entradas y conversaciones";
+$a->strings["Your posts and conversations"] = "Sus publicaciones y conversaciones";
 $a->strings["Your profile page"] = "Su página del perfil";
 $a->strings["Edit Profiles"] = "Editar perfiles";
 $a->strings["Manage/Edit profiles"] = "Administrar/editar perfiles";
@@ -782,7 +842,6 @@ $a->strings["Create an account"] = "Crear una cuenta";
 $a->strings["Help"] = "Ayuda";
 $a->strings["Help and documentation"] = "Ayuda y documentación";
 $a->strings["Applications, utilities, links, games"] = "Aplicaciones, utilidades, enlaces, juegos";
-$a->strings["Search"] = "Buscar";
 $a->strings["Search site @name, #tag, ?docs, content"] = "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido";
 $a->strings["Directory"] = "Directorio";
 $a->strings["Channel Directory"] = "Directorio de canales";
@@ -812,68 +871,12 @@ $a->strings["Site Setup and Configuration"] = "Ajustes y configuración del siti
 $a->strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido";
 $a->strings["Please wait..."] = "Espere por favor…";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado";
-$a->strings["prev"] = "anterior";
-$a->strings["first"] = "primera";
-$a->strings["last"] = "última";
-$a->strings["next"] = "próxima";
-$a->strings["older"] = "más antiguas";
-$a->strings["newer"] = "más recientes";
-$a->strings["No connections"] = "Sin conexiones";
-$a->strings["%d Connection"] = array(
-	0 => "%d Conexión",
-	1 => "%d Conexiones",
-);
-$a->strings["View Connections"] = "Ver conexiones";
-$a->strings["poke"] = "un toque";
-$a->strings["ping"] = "un \"ping\"";
-$a->strings["pinged"] = "avisado/a";
-$a->strings["prod"] = "una incitación";
-$a->strings["prodded"] = "ha recibido una incitación";
-$a->strings["slap"] = "una bofetada";
-$a->strings["slapped"] = "ha recibido una bofetada";
-$a->strings["finger"] = "un \"finger\"";
-$a->strings["fingered"] = "ha recibido un \"finger\"";
-$a->strings["rebuff"] = "un rechazo";
-$a->strings["rebuffed"] = "ha sido rechazado/a";
-$a->strings["happy"] = "feliz";
-$a->strings["sad"] = "triste";
-$a->strings["mellow"] = "amable";
-$a->strings["tired"] = "cansado/a";
-$a->strings["perky"] = "fresco/a";
-$a->strings["angry"] = "enfadado/a";
-$a->strings["stupified"] = "estupefacto/a";
-$a->strings["puzzled"] = "perplejo/a";
-$a->strings["interested"] = "interesado/a";
-$a->strings["bitter"] = "amargado/a";
-$a->strings["cheerful"] = "alegre";
-$a->strings["alive"] = "vivo/a";
-$a->strings["annoyed"] = "molesto/a";
-$a->strings["anxious"] = "ansioso/a";
-$a->strings["cranky"] = "de mal humor";
-$a->strings["disturbed"] = "perturbado/a";
-$a->strings["frustrated"] = "frustrado/a";
-$a->strings["depressed"] = "deprimido/a";
-$a->strings["motivated"] = "motivado/a";
-$a->strings["relaxed"] = "relajado/a";
-$a->strings["surprised"] = "sorprendido/a";
-$a->strings["May"] = "mayo";
-$a->strings["Unknown Attachment"] = "Adjunto no reconocido";
-$a->strings["unknown"] = "desconocido";
-$a->strings["remove category"] = "eliminar categoría";
-$a->strings["remove from file"] = "eliminar del fichero";
-$a->strings["Click to open/close"] = "Pulsar para abrir/cerrar";
-$a->strings["Link to Source"] = "Enlazar con la entrada en su ubicación original";
-$a->strings["default"] = "por defecto";
-$a->strings["Page layout"] = "Formato de la página";
-$a->strings["You can create your own with the layouts tool"] = "Puede crear su propio formato gráfico con las herramientas de diseño";
-$a->strings["Page content type"] = "Tipo de contenido de página";
-$a->strings["Select an alternate language"] = "Seleccionar un idioma alternativo";
-$a->strings["activity"] = "actividad";
-$a->strings["Design Tools"] = "Herramientas de diseño";
-$a->strings["Blocks"] = "Bloques";
-$a->strings["Menus"] = "Menús";
-$a->strings["Layouts"] = "Formato gráfico";
-$a->strings["Pages"] = "Páginas";
+$a->strings["Directory Options"] = "Opciones del directorio";
+$a->strings["Safe Mode"] = "Modo seguro";
+$a->strings["No"] = "No";
+$a->strings["Yes"] = "Sí";
+$a->strings["Public Forums Only"] = "Solo foros públicos";
+$a->strings["This Website Only"] = "Solo este sitio web";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente.";
 $a->strings["Add new connections to this collection (privacy group)"] = "Añadir nuevas conexiones a esta colección (privacidad del grupo)";
 $a->strings["All Channels"] = "Todos los canales";
@@ -882,6 +885,10 @@ $a->strings["Collections"] = "Colecciones";
 $a->strings["Edit collection"] = "Editar colección";
 $a->strings["Add new collection"] = "Añadir nueva colección";
 $a->strings["Channels not in any collection"] = "El canal no se encuentra en ninguna colección";
+$a->strings["Invalid data packet"] = "Paquete de datos no válido";
+$a->strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
+$a->strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
+$a->strings["invalid target signature"] = "La firma recibida no es válida";
 $a->strings["New Page"] = "Nueva página";
 $a->strings["View"] = "Ver";
 $a->strings["Actions"] = "Acciones";
@@ -889,12 +896,10 @@ $a->strings["Page Link"] = "Vínculo de la página";
 $a->strings["Title"] = "Título";
 $a->strings["Created"] = "Creado";
 $a->strings["Edited"] = "Editado";
+$a->strings["view full size"] = "Ver en el tamaño original";
+$a->strings["Administrator"] = "Administrador";
+$a->strings["No Subject"] = "Sin asunto";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "No se ha podido localizar información de DNS para el servidor de base de datos “%s�";
-$a->strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio";
-$a->strings["Image file is empty."] = "El fichero de imagen está vacío. ";
-$a->strings["Unable to process image"] = "No ha sido posible procesar la imagen";
-$a->strings["Photo storage failed."] = "La foto no ha podido ser guardada.";
-$a->strings["Upload New Photos"] = "Subir nuevas fotos";
 $a->strings["Save to Folder"] = "Guardar en carpeta";
 $a->strings["I will attend"] = "Participaré";
 $a->strings["I will not attend"] = "No participaré";
@@ -919,8 +924,8 @@ $a->strings["%d comment"] = array(
 $a->strings["View %s's profile - %s"] = "Ver el perfil de %s - %s";
 $a->strings["to"] = "a";
 $a->strings["via"] = "mediante";
-$a->strings["Wall-to-Wall"] = "De página del perfil a página del perfil (de Muro a Muro)";
-$a->strings["via Wall-To-Wall:"] = "Mediante el procedimiento página del perfil a página del perfil (de Muro a Muro)";
+$a->strings["Wall-to-Wall"] = "De página del perfil a página del perfil (de \"muro\" a \"muro\")";
+$a->strings["via Wall-To-Wall:"] = "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")";
 $a->strings["Save Bookmarks"] = "Guardar en Marcadores";
 $a->strings["Add to Calendar"] = "Añadir al calendario";
 $a->strings["Mark all seen"] = "Marcar todo como visto";
@@ -930,23 +935,6 @@ $a->strings["This is you"] = "Este es usted";
 $a->strings["Image"] = "Imagen";
 $a->strings["Insert Link"] = "Insertar enlace";
 $a->strings["Video"] = "Vídeo";
-$a->strings["Not a valid email address"] = "Dirección de correo no válida";
-$a->strings["Your email domain is not among those allowed on this site"] = "Su dirección de correo no pertenece a ninguno de los dominios permitidos en este sitio.";
-$a->strings["Your email address is already registered at this site."] = "Su dirección de correo está ya registrada en este sitio.";
-$a->strings["An invitation is required."] = "Es obligatorio que le inviten.";
-$a->strings["Invitation could not be verified."] = "No se ha podido verificar su invitación.";
-$a->strings["Please enter the required information."] = "Por favor introduzca la información requerida.";
-$a->strings["Failed to store account information."] = "La información de la cuenta no se ha podido guardar.";
-$a->strings["Registration confirmation for %s"] = "Confirmación de registro para %s";
-$a->strings["Registration request at %s"] = "Solicitud de registro en %s";
-$a->strings["your registration password"] = "su contraseña de registro";
-$a->strings["Registration details for %s"] = "Detalles del registro de %s";
-$a->strings["Account approved."] = "Cuenta aprobada.";
-$a->strings["Registration revoked for %s"] = "Registro revocado para %s";
-$a->strings["Account verified. Please login."] = "Cuenta verificada. Por favor, inicie sesión.";
-$a->strings["Click here to upgrade."] = "Pulse aquí para actualizar";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Esta acción supera los límites establecidos por su plan de suscripción ";
-$a->strings["This action is not available under your subscription plan."] = "Esta acción no está disponible en su plan de suscripción.";
 $a->strings["Site Admin"] = "Adminstrador del sitio";
 $a->strings["Address Book"] = "Libreta de direcciones";
 $a->strings["Mood"] = "Estado de ánimo";
@@ -954,19 +942,19 @@ $a->strings["Probe"] = "Probar";
 $a->strings["Suggest"] = "Sugerir";
 $a->strings["Random Channel"] = "Canal aleatorio";
 $a->strings["Invite"] = "Invitar";
-$a->strings["Features"] = "Características";
+$a->strings["Features"] = "Funcionalidades";
 $a->strings["Language"] = "Idioma";
 $a->strings["Post"] = "Publicación";
 $a->strings["Profile Photo"] = "Foto del perfil";
 $a->strings["Update"] = "Actualizar";
 $a->strings["Install"] = "Instalar";
 $a->strings["Purchase"] = "Comprar";
-$a->strings["Can view my normal stream and posts"] = "Pueden verse mi flujo de actividad y publicaciones normales";
+$a->strings["Can view my normal stream and posts"] = "Pueden verse mi actividad y publicaciones normales";
 $a->strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado.";
 $a->strings["Can view my connections"] = "Pueden verse mis conexiones";
 $a->strings["Can view my file storage and photos"] = "Pueden verse mi repositorio de ficheros y mis fotos";
 $a->strings["Can view my webpages"] = "Pueden verse mis páginas web";
-$a->strings["Can send me their channel stream and posts"] = "Me pueden enviar sus entradas y flujo de actividad del canal";
+$a->strings["Can send me their channel stream and posts"] = "Me pueden enviar sus entradas y contenidos del canal";
 $a->strings["Can post on my channel page (\"wall\")"] = "Pueden crearse entradas en mi página de inicio del canal (“muro�)";
 $a->strings["Can comment on or like my posts"] = "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'.";
 $a->strings["Can send me private mail messages"] = "Se me pueden enviar mensajes privados";
@@ -992,6 +980,23 @@ $a->strings["Celebrity/Soapbox"] = "Página para fans";
 $a->strings["Group Repository"] = "Repositorio de grupo";
 $a->strings["Custom/Expert Mode"] = "Modo personalizado/experto";
 $a->strings["Profile Photos"] = "Fotos del perfil";
+$a->strings["Not a valid email address"] = "Dirección de correo no válida";
+$a->strings["Your email domain is not among those allowed on this site"] = "Su dirección de correo no pertenece a ninguno de los dominios permitidos en este sitio.";
+$a->strings["Your email address is already registered at this site."] = "Su dirección de correo está ya registrada en este sitio.";
+$a->strings["An invitation is required."] = "Es obligatorio que le inviten.";
+$a->strings["Invitation could not be verified."] = "No se ha podido verificar su invitación.";
+$a->strings["Please enter the required information."] = "Por favor introduzca la información requerida.";
+$a->strings["Failed to store account information."] = "La información de la cuenta no se ha podido guardar.";
+$a->strings["Registration confirmation for %s"] = "Confirmación de registro para %s";
+$a->strings["Registration request at %s"] = "Solicitud de registro en %s";
+$a->strings["your registration password"] = "su contraseña de registro";
+$a->strings["Registration details for %s"] = "Detalles del registro de %s";
+$a->strings["Account approved."] = "Cuenta aprobada.";
+$a->strings["Registration revoked for %s"] = "Registro revocado para %s";
+$a->strings["Account verified. Please login."] = "Cuenta verificada. Por favor, inicie sesión.";
+$a->strings["Click here to upgrade."] = "Pulse aquí para actualizar";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Esta acción supera los límites establecidos por su plan de suscripción ";
+$a->strings["This action is not available under your subscription plan."] = "Esta acción no está disponible en su plan de suscripción.";
 $a->strings["Permission Denied."] = "Permiso denegado";
 $a->strings["File not found."] = "Fichero no encontrado.";
 $a->strings["Edit file permissions"] = "Modificar los permisos del fichero";
@@ -1211,8 +1216,6 @@ $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for t
 $a->strings["Bookmark added"] = "Marcador añadido";
 $a->strings["My Bookmarks"] = "Mis marcadores";
 $a->strings["My Connections Bookmarks"] = "Marcadores de mis conexiones";
-$a->strings["\$Projectname"] = "\$Projectname";
-$a->strings["Welcome to %s"] = "Bienvenido a %s";
 $a->strings["This setting requires special processing and editing has been blocked."] = "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada.";
 $a->strings["Configuration Editor"] = "Editor de configuración";
 $a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica.";
@@ -1284,14 +1287,12 @@ $a->strings["Age: "] = "Edad:";
 $a->strings["Edit/Manage Profiles"] = "Modificar/gestionar perfiles";
 $a->strings["Add profile things"] = "Añadir cosas al perfil";
 $a->strings["Include desirable objects in your profile"] = "Añadir objetos interesantes en su perfil";
-$a->strings["Items tagged with: %s"] = "elementos etiquetados con: %s";
-$a->strings["Search results for: %s"] = "Resultados de la búsqueda para: %s";
 $a->strings["Could not access contact record."] = "No se ha podido acceder al registro de contacto.";
 $a->strings["Could not locate selected profile."] = "No se ha podido localizar el perfil seleccionado.";
 $a->strings["Connection updated."] = "Conexión actualizada.";
 $a->strings["Failed to update connection record."] = "Error al actualizar el registro de la conexión.";
 $a->strings["is now connected to"] = "ahora está conectado/a";
-$a->strings["Could not access address book record."] = "No se pudo acceder a la entrada en su libreta de direcciones.";
+$a->strings["Could not access address book record."] = "No se pudo acceder al registro en su libreta de direcciones.";
 $a->strings["Refresh failed - channel is currently unavailable."] = "Recarga fallida - no se puede encontrar el canal en este momento.";
 $a->strings["Unable to set address book parameters."] = "No ha sido posible establecer los parámetros de la libreta de direcciones.";
 $a->strings["Connection has been removed."] = "La conexión ha sido eliminada.";
@@ -1474,43 +1475,25 @@ $a->strings["For either option, please choose whether to make this hub your new
 $a->strings["Make this hub my primary location"] = "Convertir este servidor en mi ubicación primaria";
 $a->strings["Import existing posts if possible (experimental - limited by available memory"] = "Importar el contenido publicado si es posible (experimental - limitado por la memoria disponible";
 $a->strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine.";
-$a->strings["Page owner information could not be retrieved."] = "La información del propietario de la página no pudo ser recuperada.";
-$a->strings["Album not found."] = "�lbum no encontrado.";
-$a->strings["Delete Album"] = "Borrar álbum";
-$a->strings["Delete Photo"] = "Borrar foto";
-$a->strings["No photos selected"] = "No hay fotos seleccionadas";
-$a->strings["Access to this item is restricted."] = "El acceso a este elemento está restringido.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado.";
-$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB de almacenamiento de fotos utilizado.";
-$a->strings["Upload Photos"] = "Subir fotos";
-$a->strings["Enter an album name"] = "Introducir un nombre de álbum";
-$a->strings["or select an existing album (doubleclick)"] = "o seleccionar uno existente (doble click)";
-$a->strings["Create a status post for this upload"] = "Crear una entrada de estado para esta subida";
-$a->strings["Caption (optional):"] = "Título (opcional):";
-$a->strings["Description (optional):"] = "Descripción (opcional):";
-$a->strings["Album name could not be decoded"] = "El nombre del álbum no ha podido ser descifrado";
-$a->strings["Contact Photos"] = "Fotos de contacto";
-$a->strings["Show Newest First"] = "Mostrar lo más reciente primero";
-$a->strings["Show Oldest First"] = "Mostrar lo más antiguo primero";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Permiso denegado. El acceso a este elemento puede estar restringido.";
-$a->strings["Photo not available"] = "Foto no disponible";
-$a->strings["Use as profile photo"] = "Usar como foto del perfil";
-$a->strings["Private Photo"] = "Foto privada";
-$a->strings["Previous"] = "Anterior";
-$a->strings["View Full Size"] = "Ver tamaño completo";
-$a->strings["Edit photo"] = "Editar foto";
-$a->strings["Rotate CW (right)"] = "Girar CW (a la derecha)";
-$a->strings["Rotate CCW (left)"] = "Girar CCW (a la izquierda)";
-$a->strings["Enter a new album name"] = "Introducir un nuevo nombre de álbum";
-$a->strings["or select an existing one (doubleclick)"] = "o seleccionar uno (doble click) existente";
-$a->strings["Caption"] = "Título";
-$a->strings["Add a Tag"] = "Añadir una etiqueta";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com";
-$a->strings["Flag as adult in album view"] = "Marcar como \"solo para adultos\" en el álbum";
-$a->strings["In This Photo:"] = "En esta foto:";
-$a->strings["Map"] = "Mapa";
-$a->strings["View Album"] = "Ver álbum";
-$a->strings["Recent Photos"] = "Fotos recientes";
+$a->strings["Total invitation limit exceeded."] = "Se ha superado el límite máximo de invitaciones.";
+$a->strings["%s : Not a valid email address."] = "%s : No es una dirección de correo electrónico válida. ";
+$a->strings["Please join us on \$Projectname"] = "Únase a nosotros en \$Projectname";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio.";
+$a->strings["%s : Message delivery failed."] = "%s : Falló el envío del mensaje.";
+$a->strings["%d message sent."] = array(
+	0 => "%d mensajes enviados.",
+	1 => "%d mensajes enviados.",
+);
+$a->strings["You have no more invitations available"] = "No tiene más invitaciones disponibles";
+$a->strings["Send invitations"] = "Enviar invitaciones";
+$a->strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónico, una por línea:";
+$a->strings["Your message:"] = "Su mensaje:";
+$a->strings["Please join my community on \$Projectname."] = "Por favor, únase a mi comunidad en \$Projectname.";
+$a->strings["You will need to supply this invitation code: "] = "Debe proporcionar este código de invitación:";
+$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Regístrese en cualquier sitio de \$Projectname (están todos interconectados)";
+$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Introduzca mi dirección \$Projectname en la caja de búsqueda del sitio.";
+$a->strings["or visit "] = "o visite ";
+$a->strings["3. Click [Connect]"] = "3. Pulse [conectar]";
 $a->strings["Fetching URL returns error: %1\$s"] = "Al intentar obtener la dirección, retorna el error: %1\$s";
 $a->strings["Image uploaded but image cropping failed."] = "Imagen actualizada, pero el recorte de la imagen ha fallado. ";
 $a->strings["Image resize failed."] = "El ajuste del tamaño de la imagen ha fallado.";
@@ -1521,7 +1504,7 @@ $a->strings["female"] = "mujer";
 $a->strings["%1\$s updated her %2\$s"] = "%1\$s ha actualizado su %2\$s";
 $a->strings["male"] = "hombre";
 $a->strings["%1\$s updated his %2\$s"] = "%1\$s ha actualizado su %2\$s";
-$a->strings["%1\$s updated their %2\$s"] = "%1\$s ha actualizado sus %2\$s";
+$a->strings["%1\$s updated their %2\$s"] = "%1\$s ha actualizado su %2\$s";
 $a->strings["profile photo"] = "foto del perfil";
 $a->strings["Photo not available."] = "Foto no disponible.";
 $a->strings["Upload File:"] = "Subir fichero:";
@@ -1563,6 +1546,7 @@ $a->strings["No such group"] = "No se encuentra el grupo";
 $a->strings["No such channel"] = "No se encuentra el  canal";
 $a->strings["forum"] = "foro";
 $a->strings["Search Results For:"] = "Buscar resultados para:";
+$a->strings["Public"] = "Público/a";
 $a->strings["Collection is empty"] = "La colección está vacía";
 $a->strings["Collection: "] = "Colección:";
 $a->strings["Invalid connection."] = "Conexión no válida.";
@@ -1625,11 +1609,13 @@ $a->strings["System theme"] = "Tema gráfico del sistema";
 $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - <a href='#' id='cnftheme'>modificar los ajustes del tema</a>";
 $a->strings["Mobile system theme"] = "Tema del sistema para móviles";
 $a->strings["Theme for mobile devices"] = "Tema para dispositivos móviles";
-$a->strings["Allow Feeds as Connections"] = "Permitir flujos RSS como conexiones";
+$a->strings["Allow Feeds as Connections"] = "Permitir contenidos RSS como conexiones";
 $a->strings["(Heavy system resource usage)"] = "(Uso intenso de los recursos del sistema)";
 $a->strings["Maximum image size"] = "Tamaño máximo de la imagen";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Tamaño máximo en bytes de la imagen subida. Por defecto, es 0, lo que significa que no hay límites.";
 $a->strings["Does this site allow new member registration?"] = "¿Debe este sitio permitir el registro de nuevos miembros?";
+$a->strings["Invitation only"] = "Solo con una invitación";
+$a->strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Solo se permiten inscripciones de nuevos miembros con un código de invitación. Además, deben aceptarse los términos del registro marcando \"Sí\".";
 $a->strings["Which best describes the types of account offered by this hub?"] = "¿Cómo describiría el tipo de servicio ofrecido por este servidor?";
 $a->strings["Register text"] = "Texto del registro";
 $a->strings["Will be displayed prominently on the registration page."] = "Se mostrará de forma destacada en la página de registro.";
@@ -1651,8 +1637,8 @@ $a->strings["Verify Email Addresses"] = "Verificar las direcciones de correo ele
 $a->strings["Check to verify email addresses used in account registration (recommended)."] = "Activar para la verificación de la dirección de correo electrónico en el registro de una cuenta (recomendado).";
 $a->strings["Force publish"] = "Forzar la publicación";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio.";
-$a->strings["Disable discovery tab"] = "Desactivar la pestaña \"Descubrir\"";
-$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Quitar la pestaña para ver contenido público extraído de las fuentes elegidas por este sitio.";
+$a->strings["Import Public Streams"] = "Importar contenido público";
+$a->strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Importar y permitir acceso al contenido público sacado de otros sitios. Advertencia: este contenido no está moderado, por lo que podría encontrar cosas inapropiadas u ofensivas.";
 $a->strings["login on Homepage"] = "acceso a la página personal";
 $a->strings["Present a login box to visitors on the home page if no other content has been configured."] = "Presentar a los visitantes una casilla de identificación en la página de inicio, si no se ha configurado otro tipo de contenido.";
 $a->strings["Directory Server URL"] = "URL del servidor de directorio";
@@ -1774,7 +1760,7 @@ $a->strings["Layout Description (Optional)"] = "Descripción del formato gráfic
 $a->strings["Layout Name"] = "Nombre del formato";
 $a->strings["Edit Layout"] = "Modificar el formato";
 $a->strings["Name is required"] = "El nombre es obligatorio";
-$a->strings["Key and Secret are required"] = "Clave y Secreto son obligatorios";
+$a->strings["Key and Secret are required"] = "\"Key\" y \"Secret\" son obligatorios";
 $a->strings["Passwords do not match. Password unchanged."] = "Las contraseñas no coinciden. La contraseña no se ha cambiado.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "No se permiten contraseñas vacías. La contraseña no se ha cambiado.";
 $a->strings["Password changed."] = "Contraseña cambiada.";
@@ -1785,20 +1771,20 @@ $a->strings["System failure storing new email. Please try again."] = "Fallo de s
 $a->strings["Settings updated."] = "Ajustes actualizados.";
 $a->strings["Add application"] = "Añadir aplicación";
 $a->strings["Name of application"] = "Nombre de la aplicación";
-$a->strings["Consumer Key"] = "Clave de consumidor";
+$a->strings["Consumer Key"] = "Consumer Key";
 $a->strings["Automatically generated - change if desired. Max length 20"] = "Generado automáticamente - si lo desea,  cámbielo. Longitud máxima: 20";
-$a->strings["Consumer Secret"] = "Clave secreta de consumidor";
+$a->strings["Consumer Secret"] = "Consumer Secret";
 $a->strings["Redirect"] = "Redirigir";
 $a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI de redirección - dejar en blanco a menos que su aplicación específicamente lo requiera";
 $a->strings["Icon url"] = "Dirección del icono";
 $a->strings["Optional"] = "Opcional";
 $a->strings["You can't edit this application."] = "No puede modificar esta aplicación.";
 $a->strings["Connected Apps"] = "Aplicaciones conectadas";
-$a->strings["Client key starts with"] = "La clave de cliente empieza por";
+$a->strings["Client key starts with"] = "La \"client key\" empieza por";
 $a->strings["No name"] = "Sin nombre";
 $a->strings["Remove authorization"] = "Eliminar autorización";
 $a->strings["No feature settings configured"] = "No se ha establecido la configuración de características";
-$a->strings["Feature/Addon Settings"] = "Ajustes de la característica o el complemento";
+$a->strings["Feature/Addon Settings"] = "Ajustes de los complementos";
 $a->strings["Account Settings"] = "Configuración de la cuenta";
 $a->strings["Enter New Password:"] = "Introduzca la nueva contraseña:";
 $a->strings["Confirm New Password:"] = "Confirme la nueva contraseña:";
@@ -1807,7 +1793,7 @@ $a->strings["Email Address:"] = "Dirección de correo electrónico:";
 $a->strings["Remove this account including all its channels"] = "Eliminar esta cuenta incluyendo todos sus canales";
 $a->strings["Off"] = "Desactivado";
 $a->strings["On"] = "Activado";
-$a->strings["Additional Features"] = "Características adicionales";
+$a->strings["Additional Features"] = "Funcionalidades";
 $a->strings["Connector Settings"] = "Configuración del conector";
 $a->strings["No special theme for mobile devices"] = "Sin tema especial para dispositivos móviles";
 $a->strings["%s - (Experimental)"] = "%s - (Experimental)";
@@ -1873,18 +1859,18 @@ $a->strings["Maximum private messages per day from unknown people:"] = "Máximo
 $a->strings["Useful to reduce spamming"] = "Útil para reducir el envío de correo no deseado";
 $a->strings["Notification Settings"] = "Configuración de notificaciones";
 $a->strings["By default post a status message when:"] = "Por defecto, enviar un mensaje de estado cuando:";
-$a->strings["accepting a friend request"] = "acepte una solicitud de amistad";
+$a->strings["accepting a friend request"] = "Acepte una solicitud de amistad";
 $a->strings["joining a forum/community"] = "al unirse a un foro o comunidad";
-$a->strings["making an <em>interesting</em> profile change"] = "realice un cambio <em>interesante</em> en su perfil";
+$a->strings["making an <em>interesting</em> profile change"] = "Realice un cambio <em>interesante</em> en su perfil";
 $a->strings["Send a notification email when:"] = "Enviar una notificación por correo electrónico cuando:";
 $a->strings["You receive a connection request"] = "Reciba una solicitud de conexión";
 $a->strings["Your connections are confirmed"] = "Sus conexiones hayan sido confirmadas";
-$a->strings["Someone writes on your profile wall"] = "Alguien escriba en la página de su perfil (muro)";
+$a->strings["Someone writes on your profile wall"] = "Alguien escriba en la página de su perfil (\"muro\")";
 $a->strings["Someone writes a followup comment"] = "Alguien escriba un comentario sobre sus publicaciones";
 $a->strings["You receive a private message"] = "Reciba un mensaje privado";
 $a->strings["You receive a friend suggestion"] = "Reciba una sugerencia de amistad";
 $a->strings["You are tagged in a post"] = "Usted sea etiquetado en una publicación";
-$a->strings["You are poked/prodded/etc. in a post"] = "Reciba un toque o incitación en una entrada";
+$a->strings["You are poked/prodded/etc. in a post"] = "Reciba un toque o incitación en una publicación";
 $a->strings["Show visual notifications including:"] = "Mostrar notificaciones visuales que incluyan:";
 $a->strings["Unseen matrix activity"] = "Actividad no vista en la red";
 $a->strings["Unseen channel activity"] = "Actividad no vista en el canal";
@@ -1904,7 +1890,7 @@ $a->strings["Notify me of events this many days in advance"] = "Avisarme de los
 $a->strings["Must be greater than 0"] = "Debe ser mayor que 0";
 $a->strings["Advanced Account/Page Type Settings"] = "Ajustes avanzados de la cuenta y de los tipos de página";
 $a->strings["Change the behaviour of this account for special situations"] = "Cambiar el comportamiento de esta cuenta en situaciones especiales";
-$a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = "Activar modo experto (en <a href=\"settings/features\">Ajustes > Características Adicionales</a>) para ajustar.";
+$a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = "¡Activar el modo de experto (en <a href=\"settings/features\">Ajustes > Funcionalidades</a>) para realizar cambios!.";
 $a->strings["Miscellaneous Settings"] = "Ajustes diversos";
 $a->strings["Default photo upload folder"] = "Carpeta por defecto de las fotos subidas";
 $a->strings["%Y - current year, %m -  current month"] = "%Y - año en curso, %m - mes actual";
@@ -1921,7 +1907,7 @@ $a->strings["Edit App"] = "Modificar la aplicación";
 $a->strings["Create App"] = "Crear una aplicación";
 $a->strings["Name of app"] = "Nombre de la aplicación";
 $a->strings["Location (URL) of app"] = "Ubicación (URL) de la aplicación";
-$a->strings["Photo icon URL"] = "Dirección del icono que se va a utilizar para esta foto";
+$a->strings["Photo icon URL"] = "Dirección del icono";
 $a->strings["80 x 80 pixels - optional"] = "80 x 80 pixels - opcional";
 $a->strings["Version ID"] = "Versión";
 $a->strings["Price of app"] = "Precio de la aplicación";
@@ -1943,27 +1929,8 @@ $a->strings["Sync now"] = "Sincronizar ahora";
 $a->strings["Please wait several minutes between consecutive operations."] = "Por favor, espere algunos minutos entre operaciones consecutivas.";
 $a->strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o \"hub\" y borrando su canal.";
 $a->strings["Use this form to drop the location if the hub is no longer operating."] = "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo.";
-$a->strings["Unable to lookup recipient."] = "Imposible asociar a un destinatario.";
-$a->strings["Unable to communicate with requested channel."] = "Imposible comunicar con el canal solicitado.";
-$a->strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
-$a->strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
-$a->strings["Messages"] = "Mensajes";
-$a->strings["Message recalled."] = "Mensaje revocado.";
-$a->strings["Conversation removed."] = "Conversación eliminada.";
-$a->strings["Requested channel is not in this network"] = "El canal solicitado no existe en esta red";
-$a->strings["Send Private Message"] = "Enviar un mensaje privado";
-$a->strings["To:"] = "Para:";
-$a->strings["Subject:"] = "Asunto:";
-$a->strings["Your message:"] = "Su mensaje:";
-$a->strings["Send"] = "Enviar";
-$a->strings["Delete message"] = "Borrar mensaje";
-$a->strings["Delivery report"] = "Informe de transmisión";
-$a->strings["Recall message"] = "Revocar el mensaje";
-$a->strings["Message has been recalled."] = "El mensaje ha sido revocado.";
-$a->strings["Delete Conversation"] = "Eliminar conversación";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente.";
-$a->strings["Send Reply"] = "Responder";
-$a->strings["Your message for %s (%s):"] = "Su mensaje para %s (%s):";
+$a->strings["\$Projectname"] = "\$Projectname";
+$a->strings["Welcome to %s"] = "Bienvenido a %s";
 $a->strings["Please login."] = "Por favor, inicie sesión.";
 $a->strings["Xchan Lookup"] = "Búsqueda de canales";
 $a->strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:";
@@ -1971,31 +1938,50 @@ $a->strings["Not found."] = "No encontrado.";
 $a->strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página.";
 $a->strings["Insufficient permissions.  Request redirected to profile page."] = "Permisos insuficientes. Petición redirigida a la página del perfil.";
 $a->strings["Item not available."] = "Elemento no disponible";
-$a->strings["Total invitation limit exceeded."] = "Se ha superado el límite máximo de invitaciones.";
-$a->strings["%s : Not a valid email address."] = "%s : No es una dirección de correo electrónico válida. ";
-$a->strings["Please join us on \$Projectname"] = "Únase a nosotros en \$Projectname";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio.";
-$a->strings["%s : Message delivery failed."] = "%s : Falló el envío del mensaje.";
-$a->strings["%d message sent."] = array(
-	0 => "%d mensajes enviados.",
-	1 => "%d mensajes enviados.",
-);
-$a->strings["You have no more invitations available"] = "No tiene más invitaciones disponibles";
-$a->strings["Send invitations"] = "Enviar invitaciones";
-$a->strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónico, una por línea:";
-$a->strings["Please join my community on \$Projectname."] = "Por favor, únase a mi comunidad en \$Projectname.";
-$a->strings["You will need to supply this invitation code: "] = "Debe proporcionar este código de invitación:";
-$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Regístrese en cualquier sitio de \$Projectname (están todos interconectados)";
-$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Introduzca mi dirección \$Projectname en la caja de búsqueda del sitio.";
-$a->strings["or visit "] = "o visite ";
-$a->strings["3. Click [Connect]"] = "3. Pulse [conectar]";
+$a->strings["Page owner information could not be retrieved."] = "La información del propietario de la página no pudo ser recuperada.";
+$a->strings["Album not found."] = "�lbum no encontrado.";
+$a->strings["Delete Album"] = "Borrar álbum";
+$a->strings["Delete Photo"] = "Borrar foto";
+$a->strings["No photos selected"] = "No hay fotos seleccionadas";
+$a->strings["Access to this item is restricted."] = "El acceso a este elemento está restringido.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado.";
+$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB de almacenamiento de fotos utilizado.";
+$a->strings["Upload Photos"] = "Subir fotos";
+$a->strings["Enter an album name"] = "Introducir un nombre de álbum";
+$a->strings["or select an existing album (doubleclick)"] = "o seleccionar uno existente (doble click)";
+$a->strings["Create a status post for this upload"] = "Crear un mensaje de estado para esta subida";
+$a->strings["Caption (optional):"] = "Título (opcional):";
+$a->strings["Description (optional):"] = "Descripción (opcional):";
+$a->strings["Album name could not be decoded"] = "El nombre del álbum no ha podido ser descifrado";
+$a->strings["Contact Photos"] = "Fotos de contacto";
+$a->strings["Show Newest First"] = "Mostrar lo más reciente primero";
+$a->strings["Show Oldest First"] = "Mostrar lo más antiguo primero";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permiso denegado. El acceso a este elemento puede estar restringido.";
+$a->strings["Photo not available"] = "Foto no disponible";
+$a->strings["Use as profile photo"] = "Usar como foto del perfil";
+$a->strings["Private Photo"] = "Foto privada";
+$a->strings["Previous"] = "Anterior";
+$a->strings["View Full Size"] = "Ver tamaño completo";
+$a->strings["Edit photo"] = "Editar foto";
+$a->strings["Rotate CW (right)"] = "Girar CW (a la derecha)";
+$a->strings["Rotate CCW (left)"] = "Girar CCW (a la izquierda)";
+$a->strings["Enter a new album name"] = "Introducir un nuevo nombre de álbum";
+$a->strings["or select an existing one (doubleclick)"] = "o seleccionar uno (doble click) existente";
+$a->strings["Caption"] = "Título";
+$a->strings["Add a Tag"] = "Añadir una etiqueta";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com";
+$a->strings["Flag as adult in album view"] = "Marcar como \"solo para adultos\" en el álbum";
+$a->strings["In This Photo:"] = "En esta foto:";
+$a->strings["Map"] = "Mapa";
+$a->strings["View Album"] = "Ver álbum";
+$a->strings["Recent Photos"] = "Fotos recientes";
 $a->strings["Remote privacy information not available."] = "La información privada remota no está disponible.";
 $a->strings["Visible to:"] = "Visible para:";
 $a->strings["Export Channel"] = "Exportar el canal";
 $a->strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido.";
 $a->strings["Export Content"] = "Exportar contenidos";
 $a->strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportar la información sobre su canal y el contenido reciente a un fichero de respaldo JSON, que puede ser restaurado o importado a otro servidor. Este fichero incluye todas sus conexiones, permisos, datos del perfil y publicaciones de varios meses. Puede llegar a ser MUY grande. Por favor, sea paciente, la descarga puede tardar varios minutos en comenzar.";
-$a->strings["Export your posts from a given year."] = "Exporta sus entradas de un año dado.";
+$a->strings["Export your posts from a given year."] = "Exporta sus publicaciones de un año dado.";
 $a->strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "También puede exportar sus mensajes y conversaciones durante un año o mes en particular. Ajuste la fecha en la barra de direcciones del navegador para seleccionar otras fechas. Si la exportación falla (posiblemente debido al agotamiento de la memoria del servidor hub), por favor, intente de nuevo la selección de un rango de fechas más pequeño.";
 $a->strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un año determinado, como este año, visite <a href=\"%1\$s\">%2\$s</a>";
 $a->strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un mes determinado, como el de enero de este año, visite <a href=\"%1\$s\">%2\$s</a>";
@@ -2020,6 +2006,8 @@ $a->strings["New Chatroom"] = "Nueva sala de chat";
 $a->strings["Chatroom Name"] = "Nombre de la sala de chat";
 $a->strings["Expiration of chats (minutes)"] = "Tiempo de expiración de los mensajes en los chats (en minutos)";
 $a->strings["%1\$s's Chatrooms"] = "Salas de chat de %1\$s";
+$a->strings["Items tagged with: %s"] = "elementos etiquetados con: %s";
+$a->strings["Search results for: %s"] = "Resultados de la búsqueda para: %s";
 $a->strings["Source of Item"] = "Origen del elemento";
 $a->strings["Share content from Firefox to \$Projectname"] = "Compartir contenido desde Firefox a \$Projectname";
 $a->strings["Activate the Firefox \$Projectname provider"] = "Servicio de compartición de Firefox: activar el proveedor \$Projectname ";
@@ -2043,10 +2031,6 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
 $a->strings["Edit connection"] = "Editar conexión";
 $a->strings["Search your connections"] = "Buscar sus conexiones";
 $a->strings["Finding: "] = "Búsqueda:";
-$a->strings["Documentation Search"] = "Búsqueda de Documentación";
-$a->strings["Help:"] = "Ayuda:";
-$a->strings["Not Found"] = "No encontrado";
-$a->strings["\$Projectname Documentation"] = "Documentación de \$Projectname";
 $a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Ha creado %1$.0f de %2$.0f canales permitidos.";
 $a->strings["Create a new channel"] = "Crear un nuevo canal";
 $a->strings["Current Channel"] = "Canal actual";
@@ -2079,11 +2063,34 @@ $a->strings["Must be unique, only seen by you"] = "Debe ser único, solo será v
 $a->strings["Menu title"] = "Título del menú";
 $a->strings["Menu title as seen by others"] = "El título del menú tal como será visto por los demás";
 $a->strings["Allow bookmarks"] = "Permitir marcadores";
-$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo.";
+$a->strings["Unable to lookup recipient."] = "Imposible asociar a un destinatario.";
+$a->strings["Unable to communicate with requested channel."] = "Imposible comunicar con el canal solicitado.";
+$a->strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
+$a->strings["Messages"] = "Mensajes";
+$a->strings["Message recalled."] = "Mensaje revocado.";
+$a->strings["Conversation removed."] = "Conversación eliminada.";
+$a->strings["Requested channel is not in this network"] = "El canal solicitado no existe en esta red";
+$a->strings["Send Private Message"] = "Enviar un mensaje privado";
+$a->strings["To:"] = "Para:";
+$a->strings["Subject:"] = "Asunto:";
+$a->strings["Send"] = "Enviar";
+$a->strings["Delete message"] = "Borrar mensaje";
+$a->strings["Delivery report"] = "Informe de transmisión";
+$a->strings["Recall message"] = "Revocar el mensaje";
+$a->strings["Message has been recalled."] = "El mensaje ha sido revocado.";
+$a->strings["Delete Conversation"] = "Eliminar conversación";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente.";
+$a->strings["Send Reply"] = "Responder";
+$a->strings["Your message for %s (%s):"] = "Su mensaje para %s (%s):";
+$a->strings["Documentation Search"] = "Búsqueda de Documentación";
+$a->strings["Help:"] = "Ayuda:";
+$a->strings["Not Found"] = "No encontrado";
+$a->strings["\$Projectname Documentation"] = "Documentación de \$Projectname";
 $a->strings["No service class restrictions found."] = "No se han encontrado restricciones sobre esta clase de servicio.";
 $a->strings["Version %s"] = "Versión %s";
-$a->strings["Installed plugins/addons/apps:"] = "Extensiones/Aplicaciones instaladas:";
-$a->strings["No installed plugins/addons/apps"] = "Extensiones/Aplicaciones no instaladas:";
+$a->strings["Installed plugins/addons/apps:"] = "Extensiones, complementos o aplicaciones instaladas:";
+$a->strings["No installed plugins/addons/apps"] = "No hay instalada ninguna extensión, complemento o aplicación";
 $a->strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Este es un sitio integrado en \$Projectname - una red cooperativa mundial de sitios web descentralizados de privacidad mejorada.";
 $a->strings["Tag: "] = "Etiqueta:";
 $a->strings["Last background fetch: "] = "Última actualización en segundo plano:";
@@ -2101,21 +2108,28 @@ $a->strings["Event can not end before it has started."] = "Un evento no puede te
 $a->strings["Unable to generate preview."] = "No se puede crear la vista previa.";
 $a->strings["Event title and start time are required."] = "Se requieren el título del evento y su hora de inicio.";
 $a->strings["Event not found."] = "Evento no encontrado.";
-$a->strings["Event Title"] = "Título del evento";
+$a->strings["Edit event titel"] = "Editar el título del evento";
+$a->strings["Event titel"] = "Título del evento";
 $a->strings["Categories (comma-separated list)"] = "Categorías (lista separada por comas)";
+$a->strings["Edit Category"] = "Editar la categoría";
 $a->strings["Category"] = "Categoría";
+$a->strings["Edit start date and time"] = "Modificar la fecha y hora de comienzo";
 $a->strings["Start date and time"] = "Fecha y hora de comienzo";
 $a->strings["Finish date and time are not known or not relevant"] = "La fecha y hora de terminación no se conocen o no son relevantes";
+$a->strings["Edit finish date and time"] = "Modificar la fecha y hora de terminación";
 $a->strings["Finish date and time"] = "Fecha y hora de terminación";
 $a->strings["Adjust for viewer timezone"] = "Ajustar para obtener el visor de zona horaria";
 $a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales.";
+$a->strings["Edit Description"] = "Editar la descripción";
+$a->strings["Edit Location"] = "Modificar la localización";
 $a->strings["Share this event"] = "Compartir este evento";
 $a->strings["Advanced Options"] = "Opciones avanzadas";
 $a->strings["l, F j"] = "l j F";
 $a->strings["Edit event"] = "Editar evento";
 $a->strings["Delete event"] = "Borrar evento";
 $a->strings["calendar"] = "calendario";
-$a->strings["New Event"] = "Nuevo evento";
+$a->strings["Edit Event"] = "Editar el evento";
+$a->strings["Create Event"] = "Crear un evento";
 $a->strings["Today"] = "Hoy";
 $a->strings["Event removed"] = "Evento borrado";
 $a->strings["Failed to remove event"] = "Error al eliminar el evento";
@@ -2151,7 +2165,6 @@ $a->strings["Menu item deleted."] = "Este elemento del menú ha sido borrado";
 $a->strings["Menu item could not be deleted."] = "Este elemento del menú no puede ser borrado.";
 $a->strings["Edit Menu Element"] = "Editar elemento del menú";
 $a->strings["Link text"] = "Texto del enlace";
-$a->strings["Who likes me?"] = "¿Quién me ha puesto \"Me gusta\"?";
 $a->strings["Files: shared with me"] = "Ficheros: compartidos conmigo";
 $a->strings["NEW"] = "NUEVO";
 $a->strings["Remove all files"] = "Eliminar todos los ficheros";
@@ -2182,7 +2195,7 @@ $a->strings["Set the basic color for item icons"] = "Ajustar el color básico pa
 $a->strings["Set the hover color for item icons"] = "Ajustar el color flotante para los iconos de los elementos";
 $a->strings["Set font-size for the entire application"] = "Ajustar el tamaño de letra para toda la aplicación";
 $a->strings["Example: 14px"] = "Ejemplo: 14px";
-$a->strings["Set font-size for posts and comments"] = "Ajustar el tamaño del tipo de letra para entradas y comentarios";
+$a->strings["Set font-size for posts and comments"] = "Ajustar el tamaño del tipo de letra para publicaciones y comentarios";
 $a->strings["Set font-color for posts and comments"] = "Establecer el color de la letra para publicaciones y comentarios";
 $a->strings["Set radius of corners"] = "Establecer el radio de curvatura de las esquinas";
 $a->strings["Set shadow depth of photos"] = "Ajustar la profundidad de sombras de las fotos";
@@ -2192,6 +2205,7 @@ $a->strings["Left align page content"] = "Alinear a la izquierda el contenido de
 $a->strings["Set minimum opacity of nav bar - to hide it"] = "Ajustar la opacidad mínima de la barra de navegación - para ocultarla";
 $a->strings["Set size of conversation author photo"] = "Ajustar el tamaño de la foto del autor de la conversación";
 $a->strings["Set size of followup author photos"] = "Ajustar el tamaño de foto de los seguidores del autor";
+$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo.";
 $a->strings["Update %s failed. See error logs."] = "La actualización %s ha fallado. Mire el informe de errores.";
 $a->strings["Update Error at %s"] = "Error de actualización en %s";
 $a->strings["Create an account to access services and applications within the Hubzilla"] = "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla";
diff --git a/view/es/lostpass_eml.tpl b/view/es-es/lostpass_eml.tpl
index 0ae657aca..0ae657aca 100644
--- a/view/es/lostpass_eml.tpl
+++ b/view/es-es/lostpass_eml.tpl
diff --git a/view/es/messages.po b/view/es-es/messages.po
index 4ed1d6c44..4ed1d6c44 100644
--- a/view/es/messages.po
+++ b/view/es-es/messages.po
diff --git a/view/es/passchanged_eml.tpl b/view/es-es/passchanged_eml.tpl
index be6ad74d9..be6ad74d9 100644
--- a/view/es/passchanged_eml.tpl
+++ b/view/es-es/passchanged_eml.tpl
diff --git a/view/es/register_open_eml.tpl b/view/es-es/register_open_eml.tpl
index f6d68677e..f6d68677e 100644
--- a/view/es/register_open_eml.tpl
+++ b/view/es-es/register_open_eml.tpl
diff --git a/view/es/register_verify_eml.tpl b/view/es-es/register_verify_eml.tpl
index dc913be97..dc913be97 100644
--- a/view/es/register_verify_eml.tpl
+++ b/view/es-es/register_verify_eml.tpl
diff --git a/view/es/register_verify_member.tpl b/view/es-es/register_verify_member.tpl
index f78a0353a..f78a0353a 100644
--- a/view/es/register_verify_member.tpl
+++ b/view/es-es/register_verify_member.tpl
diff --git a/view/es/strings.php b/view/es-es/strings.php
index be750b0ff..be750b0ff 100644
--- a/view/es/strings.php
+++ b/view/es-es/strings.php
diff --git a/view/es-es/update_fail_eml.tpl b/view/es-es/update_fail_eml.tpl
new file mode 100644
index 000000000..b613c40b7
--- /dev/null
+++ b/view/es-es/update_fail_eml.tpl
@@ -0,0 +1,13 @@
+Hola, 

+Soy el servidor web en {{$sitename}};

+   

+Los desarrolladores de Red Matrix han lanzado la actualización {{$update}} recientemente, 

+pero cuando se intentaba instalar, alguna cosa ha ido terriblemente mal.  

+Esto requiere intervención humana tan pronto como sea posible. 

+Por favor, contacte con algún desarrollador de Red Matrix si no puede arreglarlo 

+por sí mismo. Mi base se datos puede quedar inservible. 

+

+El mensaje de error ha sido el siguiente: '{{$error}}'.   

+

+Disculpe por cualquier inconveniente causado, 

+	su servidor web en {{$siteurl}}
\ No newline at end of file
diff --git a/view/es/update_fail_eml.tpl b/view/es/update_fail_eml.tpl
deleted file mode 100644
index 6643947bb..000000000
--- a/view/es/update_fail_eml.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-Hey, 

-Soy el servidor web en  {{$sitename}};

-   

-Los desarrolladores de RedMatrix/Hubzilla han lanzado la actualización {{$update}} recientemente, 

-pero cuando se intentaba instalar, alguna cosa ha ido terriblemente mal.  

-Esto requiere intervención humana tan pronto como sea posible. 

-Por favor, contacte con algún desarrollador de Red si no puede arreglarlo 

-por sí mismo. Mi base se datos puede quedar inservible. 

-
-

-El mensaje de error ha sido el siguiente:  '{{$error}}'.   

-

-Disculpe por cualquier inconveniente causado, 

-	su servidor web en {{$siteurl}}
diff --git a/view/it/hmessages.po b/view/it/hmessages.po
index a341ebe43..be521f738 100644
--- a/view/it/hmessages.po
+++ b/view/it/hmessages.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Davide Pesenti <mrjive@mrjive.it>, 2015
-# tuscanhobbit <pynolo@tarine.net>, 2015
+# Paolo Wave <pynolo@tarine.net>, 2015
+# Paolo Wave <pynolo@tarine.net>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-27 00:03-0800\n"
-"PO-Revision-Date: 2015-11-30 15:22+0000\n"
-"Last-Translator: tuscanhobbit <pynolo@tarine.net>\n"
+"POT-Creation-Date: 2015-12-18 00:03-0800\n"
+"PO-Revision-Date: 2015-12-20 09:00+0000\n"
+"Last-Translator: Paolo Wave <pynolo@tarine.net>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/red-matrix/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../include/Contact.php:101 ../../include/identity.php:953
+#: ../../include/Contact.php:101 ../../include/identity.php:947
 #: ../../include/widgets.php:137 ../../include/widgets.php:175
 #: ../../include/conversation.php:953 ../../mod/match.php:64
 #: ../../mod/directory.php:318 ../../mod/suggest.php:52
@@ -55,17 +56,17 @@ msgstr "Il nome della chat non è valido."
 msgid "Room not found."
 msgstr "Chat non trovata."
 
-#: ../../include/chat.php:133 ../../include/items.php:4396
-#: ../../include/attach.php:140 ../../include/attach.php:188
-#: ../../include/attach.php:251 ../../include/attach.php:265
-#: ../../include/attach.php:272 ../../include/attach.php:337
-#: ../../include/attach.php:351 ../../include/attach.php:358
-#: ../../include/attach.php:436 ../../include/attach.php:884
-#: ../../include/attach.php:955 ../../include/attach.php:1107
-#: ../../include/photos.php:29 ../../mod/filestorage.php:18
+#: ../../include/chat.php:133 ../../include/items.php:4405
+#: ../../include/photos.php:29 ../../include/attach.php:140
+#: ../../include/attach.php:188 ../../include/attach.php:251
+#: ../../include/attach.php:265 ../../include/attach.php:272
+#: ../../include/attach.php:337 ../../include/attach.php:351
+#: ../../include/attach.php:358 ../../include/attach.php:436
+#: ../../include/attach.php:888 ../../include/attach.php:959
+#: ../../include/attach.php:1111 ../../mod/filestorage.php:18
 #: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/group.php:9 ../../mod/item.php:205
-#: ../../mod/item.php:213 ../../mod/item.php:1049 ../../mod/common.php:35
+#: ../../mod/filestorage.php:115 ../../mod/group.php:9 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:1050 ../../mod/common.php:35
 #: ../../mod/achievements.php:30 ../../mod/rate.php:111
 #: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/id.php:71
 #: ../../mod/like.php:177 ../../mod/page.php:31 ../../mod/page.php:86
@@ -78,20 +79,20 @@ msgstr "Chat non trovata."
 #: ../../mod/editwebpage.php:125 ../../mod/profile.php:64
 #: ../../mod/profile.php:72 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/fsuggest.php:78 ../../mod/sources.php:66
-#: ../../mod/notifications.php:66 ../../mod/photos.php:70
-#: ../../mod/profile_photo.php:341 ../../mod/profile_photo.php:354
-#: ../../mod/thing.php:271 ../../mod/thing.php:291 ../../mod/thing.php:328
-#: ../../mod/editblock.php:65 ../../mod/network.php:12
-#: ../../mod/pdledit.php:21 ../../mod/register.php:72
+#: ../../mod/notifications.php:66 ../../mod/invite.php:13
+#: ../../mod/invite.php:87 ../../mod/profile_photo.php:341
+#: ../../mod/profile_photo.php:354 ../../mod/thing.php:271
+#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/editblock.php:65
+#: ../../mod/network.php:12 ../../mod/pdledit.php:21 ../../mod/register.php:72
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
 #: ../../mod/settings.php:568 ../../mod/webpages.php:69
 #: ../../mod/appman.php:66 ../../mod/layouts.php:69 ../../mod/layouts.php:76
-#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/mail.php:118
-#: ../../mod/regmod.php:17 ../../mod/channel.php:100 ../../mod/channel.php:214
-#: ../../mod/channel.php:254 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../mod/editpost.php:13 ../../mod/chat.php:94 ../../mod/chat.php:99
-#: ../../mod/viewsrc.php:14 ../../mod/authtest.php:13
-#: ../../mod/connections.php:29 ../../mod/manage.php:6 ../../mod/menu.php:74
+#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/regmod.php:17
+#: ../../mod/channel.php:100 ../../mod/channel.php:214
+#: ../../mod/channel.php:254 ../../mod/photos.php:70 ../../mod/editpost.php:13
+#: ../../mod/chat.php:94 ../../mod/chat.php:99 ../../mod/viewsrc.php:14
+#: ../../mod/authtest.php:13 ../../mod/connections.php:29
+#: ../../mod/manage.php:6 ../../mod/menu.php:74 ../../mod/mail.php:126
 #: ../../mod/service_limits.php:7 ../../mod/suggest.php:26
 #: ../../mod/events.php:260 ../../mod/message.php:16 ../../mod/block.php:22
 #: ../../mod/block.php:72 ../../mod/mitem.php:111 ../../mod/sharedwithme.php:7
@@ -121,15 +122,390 @@ msgstr "Impossibile clonare il canale. L'importazione è fallita."
 msgid "Cloned channel not found. Import failed."
 msgstr "Impossibile trovare il canale clonato. L'importazione è fallita."
 
+#: ../../include/text.php:394
+msgid "prev"
+msgstr "prec"
+
+#: ../../include/text.php:396
+msgid "first"
+msgstr "inizio"
+
+#: ../../include/text.php:425
+msgid "last"
+msgstr "fine"
+
+#: ../../include/text.php:428
+msgid "next"
+msgstr "succ"
+
+#: ../../include/text.php:438
+msgid "older"
+msgstr "più recenti"
+
+#: ../../include/text.php:440
+msgid "newer"
+msgstr "più nuovi"
+
+#: ../../include/text.php:785
+msgid "No connections"
+msgstr "Nessun contatto"
+
+#: ../../include/text.php:797
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d contatto"
+msgstr[1] "%d contatti"
+
+#: ../../include/text.php:810 ../../mod/viewconnections.php:101
+msgid "View Connections"
+msgstr "Elenco contatti"
+
+#: ../../include/text.php:867 ../../include/text.php:879
+#: ../../include/nav.php:159 ../../include/apps.php:147
+#: ../../mod/search.php:40
+msgid "Search"
+msgstr "Cerca"
+
+#: ../../include/text.php:868 ../../include/text.php:880
+#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:100 ../../mod/admin.php:1454 ../../mod/admin.php:1474
+#: ../../mod/filer.php:49
+msgid "Save"
+msgstr "Salva"
+
+#: ../../include/text.php:954
+msgid "poke"
+msgstr "poke"
+
+#: ../../include/text.php:954 ../../include/conversation.php:243
+msgid "poked"
+msgstr "ha ricevuto un poke"
+
+#: ../../include/text.php:955
+msgid "ping"
+msgstr "ping"
+
+#: ../../include/text.php:955
+msgid "pinged"
+msgstr "ha ricevuto un ping"
+
+#: ../../include/text.php:956
+msgid "prod"
+msgstr "spintone"
+
+#: ../../include/text.php:956
+msgid "prodded"
+msgstr "ha ricevuto uno spintone"
+
+#: ../../include/text.php:957
+msgid "slap"
+msgstr "schiaffo"
+
+#: ../../include/text.php:957
+msgid "slapped"
+msgstr "ha ricevuto uno schiaffo"
+
+#: ../../include/text.php:958
+msgid "finger"
+msgstr "finger"
+
+#: ../../include/text.php:958
+msgid "fingered"
+msgstr "ha ricevuto un finger"
+
+#: ../../include/text.php:959
+msgid "rebuff"
+msgstr "rifiuto"
+
+#: ../../include/text.php:959
+msgid "rebuffed"
+msgstr "ha ricevuto un rifiuto"
+
+#: ../../include/text.php:969
+msgid "happy"
+msgstr "felice"
+
+#: ../../include/text.php:970
+msgid "sad"
+msgstr "triste"
+
+#: ../../include/text.php:971
+msgid "mellow"
+msgstr "calmo"
+
+#: ../../include/text.php:972
+msgid "tired"
+msgstr "stanco"
+
+#: ../../include/text.php:973
+msgid "perky"
+msgstr "vivace"
+
+#: ../../include/text.php:974
+msgid "angry"
+msgstr "arrabbiato"
+
+#: ../../include/text.php:975
+msgid "stupified"
+msgstr "stordito"
+
+#: ../../include/text.php:976
+msgid "puzzled"
+msgstr "confuso"
+
+#: ../../include/text.php:977
+msgid "interested"
+msgstr "attento"
+
+#: ../../include/text.php:978
+msgid "bitter"
+msgstr "amaro"
+
+#: ../../include/text.php:979
+msgid "cheerful"
+msgstr "allegro"
+
+#: ../../include/text.php:980
+msgid "alive"
+msgstr "vivace"
+
+#: ../../include/text.php:981
+msgid "annoyed"
+msgstr "seccato"
+
+#: ../../include/text.php:982
+msgid "anxious"
+msgstr "ansioso"
+
+#: ../../include/text.php:983
+msgid "cranky"
+msgstr "irritabile"
+
+#: ../../include/text.php:984
+msgid "disturbed"
+msgstr "turbato"
+
+#: ../../include/text.php:985
+msgid "frustrated"
+msgstr "frustrato"
+
+#: ../../include/text.php:986
+msgid "depressed"
+msgstr "in depressione"
+
+#: ../../include/text.php:987
+msgid "motivated"
+msgstr "motivato"
+
+#: ../../include/text.php:988
+msgid "relaxed"
+msgstr "rilassato"
+
+#: ../../include/text.php:989
+msgid "surprised"
+msgstr "sorpreso"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "lunedì"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "martedì"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "mercoledì"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "giovedì"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "venerdì"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "sabato"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "domenica"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:45
+msgid "January"
+msgstr "gennaio"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:46
+msgid "February"
+msgstr "febbraio"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:47
+msgid "March"
+msgstr "marzo"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:48
+msgid "April"
+msgstr "aprile"
+
+#: ../../include/text.php:1165
+msgid "May"
+msgstr "Mag"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:50
+msgid "June"
+msgstr "giugno"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:51
+msgid "July"
+msgstr "luglio"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:52
+msgid "August"
+msgstr "agosto"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:53
+msgid "September"
+msgstr "settembre"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:54
+msgid "October"
+msgstr "ottobre"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:55
+msgid "November"
+msgstr "novembre"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:56
+msgid "December"
+msgstr "dicembre"
+
+#: ../../include/text.php:1242 ../../include/text.php:1246
+msgid "Unknown Attachment"
+msgstr "Allegato non riconoscuto"
+
+#: ../../include/text.php:1248 ../../include/RedDAV/RedBrowser.php:237
+#: ../../mod/sharedwithme.php:97
+msgid "Size"
+msgstr "Dimensione"
+
+#: ../../include/text.php:1248
+msgid "unknown"
+msgstr "sconosciuta"
+
+#: ../../include/text.php:1284
+msgid "remove category"
+msgstr "rimuovi la categoria"
+
+#: ../../include/text.php:1361
+msgid "remove from file"
+msgstr "rimuovi dal file"
+
+#: ../../include/text.php:1392 ../../include/event.php:22
+#: ../../include/bb2diaspora.php:465
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d F Y \\@ G:i"
+
+#: ../../include/text.php:1396 ../../include/event.php:30
+#: ../../include/bb2diaspora.php:471
+msgid "Starts:"
+msgstr "Inizio:"
+
+#: ../../include/text.php:1400 ../../include/event.php:40
+#: ../../include/bb2diaspora.php:479
+msgid "Finishes:"
+msgstr "Fine:"
+
+#: ../../include/text.php:1407 ../../include/event.php:52
+#: ../../include/identity.php:998 ../../include/bb2diaspora.php:487
+#: ../../mod/directory.php:304
+msgid "Location:"
+msgstr "Luogo:"
+
+#: ../../include/text.php:1503 ../../include/text.php:1514
+msgid "Click to open/close"
+msgstr "Clicca per aprire/chiudere"
+
+#: ../../include/text.php:1698 ../../mod/events.php:623
+msgid "Link to Source"
+msgstr "Link al sito d'origine"
+
+#: ../../include/text.php:1719 ../../include/text.php:1791
+msgid "default"
+msgstr "predefinito"
+
+#: ../../include/text.php:1727
+msgid "Page layout"
+msgstr "Layout della pagina"
+
+#: ../../include/text.php:1727
+msgid "You can create your own with the layouts tool"
+msgstr "Puoi creare un tuo layout dalla configurazione delle pagine web"
+
+#: ../../include/text.php:1769
+msgid "Page content type"
+msgstr "Tipo di contenuto della pagina"
+
+#: ../../include/text.php:1803
+msgid "Select an alternate language"
+msgstr "Seleziona una lingua diversa"
+
+#: ../../include/text.php:1922 ../../include/conversation.php:120
+#: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
+msgid "photo"
+msgstr "la foto"
+
+#: ../../include/text.php:1925 ../../include/event.php:904
+#: ../../include/conversation.php:123 ../../mod/tagger.php:47
+#: ../../mod/like.php:363 ../../mod/events.php:249
+msgid "event"
+msgstr "l'evento"
+
+#: ../../include/text.php:1928 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:83
+msgid "status"
+msgstr "il messaggio di stato"
+
+#: ../../include/text.php:1930 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr "il commento"
+
+#: ../../include/text.php:1935
+msgid "activity"
+msgstr "l'attività"
+
+#: ../../include/text.php:2230
+msgid "Design Tools"
+msgstr "Strumenti di design"
+
+#: ../../include/text.php:2233 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr "Block"
+
+#: ../../include/text.php:2234 ../../mod/menu.php:103
+msgid "Menus"
+msgstr "Menù"
+
+#: ../../include/text.php:2235 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr "Layout"
+
+#: ../../include/text.php:2236
+msgid "Pages"
+msgstr "Pagine"
+
+#: ../../include/text.php:2588 ../../include/RedDAV/RedBrowser.php:131
+msgid "Collection"
+msgstr "Cartella"
+
 #: ../../include/RedDAV/RedBrowser.php:107
 #: ../../include/RedDAV/RedBrowser.php:239
 msgid "parent"
 msgstr "cartella superiore"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2582
-msgid "Collection"
-msgstr "Cartella"
-
 #: ../../include/RedDAV/RedBrowser.php:134
 msgid "Principal"
 msgstr "Principale"
@@ -150,16 +526,16 @@ msgstr "Appuntamenti ricevuti"
 msgid "Schedule Outbox"
 msgstr "Appuntamenti inviati"
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1317
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1330
 #: ../../include/conversation.php:1027 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../mod/photos.php:759
-#: ../../mod/photos.php:1198
+#: ../../include/apps.php:415 ../../mod/photos.php:754
+#: ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr "Sconosciuto"
 
 #: ../../include/RedDAV/RedBrowser.php:226 ../../include/conversation.php:1629
 #: ../../include/nav.php:93 ../../include/apps.php:135
-#: ../../mod/fbrowser.php:114
+#: ../../mod/fbrowser.php:109
 msgid "Files"
 msgstr "Archivio file"
 
@@ -179,13 +555,13 @@ msgid "Create"
 msgstr "Crea"
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1329
-#: ../../mod/photos.php:784 ../../mod/photos.php:1317
-#: ../../mod/profile_photo.php:453
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1343
+#: ../../mod/profile_photo.php:453 ../../mod/photos.php:781
+#: ../../mod/photos.php:1316
 msgid "Upload"
 msgstr "Carica"
 
-#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:974
+#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:986
 #: ../../mod/settings.php:588 ../../mod/settings.php:614
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
@@ -195,11 +571,6 @@ msgstr "Nome"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../include/RedDAV/RedBrowser.php:237 ../../include/text.php:1248
-#: ../../mod/sharedwithme.php:97
-msgid "Size"
-msgstr "Dimensione"
-
 #: ../../include/RedDAV/RedBrowser.php:238 ../../mod/sharedwithme.php:98
 msgid "Last Modified"
 msgstr "Ultima modifica"
@@ -220,10 +591,10 @@ msgstr "Modifica"
 #: ../../include/RedDAV/RedBrowser.php:241 ../../include/conversation.php:657
 #: ../../include/ItemObject.php:120 ../../include/apps.php:260
 #: ../../mod/group.php:173 ../../mod/blocks.php:155 ../../mod/connedit.php:551
-#: ../../mod/editwebpage.php:223 ../../mod/photos.php:1129
-#: ../../mod/thing.php:258 ../../mod/editblock.php:181 ../../mod/admin.php:809
-#: ../../mod/admin.php:968 ../../mod/editlayout.php:179
-#: ../../mod/settings.php:649 ../../mod/webpages.php:183
+#: ../../mod/editwebpage.php:223 ../../mod/thing.php:258
+#: ../../mod/editblock.php:181 ../../mod/admin.php:821 ../../mod/admin.php:980
+#: ../../mod/editlayout.php:179 ../../mod/settings.php:649
+#: ../../mod/webpages.php:183 ../../mod/photos.php:1126
 msgid "Delete"
 msgstr "Elimina"
 
@@ -254,7 +625,7 @@ msgid "Delete this item?"
 msgstr "Eliminare questo elemento?"
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:696
-#: ../../mod/photos.php:1047 ../../mod/photos.php:1165
+#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
 msgid "Comment"
 msgstr "Commento"
 
@@ -320,24 +691,25 @@ msgid "Describe (optional)"
 msgstr "Descrizione (facoltativa)"
 
 #: ../../include/js_strings.php:22 ../../include/widgets.php:676
-#: ../../include/ItemObject.php:697 ../../mod/filestorage.php:156
-#: ../../mod/group.php:81 ../../mod/connect.php:93 ../../mod/rate.php:168
-#: ../../mod/mood.php:135 ../../mod/setup.php:331 ../../mod/setup.php:371
-#: ../../mod/pconfig.php:108 ../../mod/poke.php:171 ../../mod/profiles.php:675
+#: ../../include/widgets.php:688 ../../include/ItemObject.php:697
+#: ../../mod/filestorage.php:156 ../../mod/group.php:81
+#: ../../mod/connect.php:93 ../../mod/rate.php:168 ../../mod/mood.php:135
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/pconfig.php:108
+#: ../../mod/poke.php:171 ../../mod/profiles.php:675
 #: ../../mod/connedit.php:715 ../../mod/fsuggest.php:108
 #: ../../mod/sources.php:104 ../../mod/sources.php:138
-#: ../../mod/import.php:527 ../../mod/photos.php:637 ../../mod/photos.php:1008
-#: ../../mod/photos.php:1048 ../../mod/photos.php:1166 ../../mod/thing.php:313
+#: ../../mod/import.php:527 ../../mod/invite.php:142 ../../mod/thing.php:313
 #: ../../mod/thing.php:359 ../../mod/import_items.php:122
-#: ../../mod/pdledit.php:58 ../../mod/admin.php:435 ../../mod/admin.php:802
-#: ../../mod/admin.php:966 ../../mod/admin.php:1103 ../../mod/admin.php:1297
-#: ../../mod/admin.php:1382 ../../mod/settings.php:586
+#: ../../mod/pdledit.php:58 ../../mod/admin.php:447 ../../mod/admin.php:814
+#: ../../mod/admin.php:978 ../../mod/admin.php:1115 ../../mod/admin.php:1309
+#: ../../mod/admin.php:1394 ../../mod/settings.php:586
 #: ../../mod/settings.php:698 ../../mod/settings.php:726
 #: ../../mod/settings.php:749 ../../mod/settings.php:834
 #: ../../mod/settings.php:1023 ../../mod/appman.php:99 ../../mod/locs.php:116
-#: ../../mod/mail.php:371 ../../mod/xchan.php:11 ../../mod/invite.php:142
-#: ../../mod/chat.php:184 ../../mod/chat.php:213 ../../mod/events.php:476
-#: ../../mod/events.php:673 ../../mod/mitem.php:231
+#: ../../mod/xchan.php:11 ../../mod/photos.php:637 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1045 ../../mod/photos.php:1163 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/mail.php:380 ../../mod/events.php:461
+#: ../../mod/events.php:658 ../../mod/mitem.php:231
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Salva"
@@ -351,7 +723,7 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr "Non hai salvato i cambiamenti. Vuoi davvero lasciare questa pagina?"
 
 #: ../../include/js_strings.php:25 ../../mod/pubsites.php:28
-#: ../../mod/profiles.php:464 ../../mod/events.php:467
+#: ../../mod/profiles.php:464 ../../mod/events.php:452
 msgid "Location"
 msgstr "Posizione geografica"
 
@@ -428,55 +800,11 @@ msgstr " "
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1165
-msgid "January"
-msgstr "gennaio"
-
-#: ../../include/js_strings.php:46 ../../include/text.php:1165
-msgid "February"
-msgstr "febbraio"
-
-#: ../../include/js_strings.php:47 ../../include/text.php:1165
-msgid "March"
-msgstr "marzo"
-
-#: ../../include/js_strings.php:48 ../../include/text.php:1165
-msgid "April"
-msgstr "aprile"
-
 #: ../../include/js_strings.php:49
 msgctxt "long"
 msgid "May"
 msgstr "maggio"
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1165
-msgid "June"
-msgstr "giugno"
-
-#: ../../include/js_strings.php:51 ../../include/text.php:1165
-msgid "July"
-msgstr "luglio"
-
-#: ../../include/js_strings.php:52 ../../include/text.php:1165
-msgid "August"
-msgstr "agosto"
-
-#: ../../include/js_strings.php:53 ../../include/text.php:1165
-msgid "September"
-msgstr "settembre"
-
-#: ../../include/js_strings.php:54 ../../include/text.php:1165
-msgid "October"
-msgstr "ottobre"
-
-#: ../../include/js_strings.php:55 ../../include/text.php:1165
-msgid "November"
-msgstr "novembre"
-
-#: ../../include/js_strings.php:56 ../../include/text.php:1165
-msgid "December"
-msgstr "dicembre"
-
 #: ../../include/js_strings.php:57
 msgid "Jan"
 msgstr "Gen"
@@ -526,34 +854,6 @@ msgstr "Nov"
 msgid "Dec"
 msgstr "Dic"
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1161
-msgid "Sunday"
-msgstr "domenica"
-
-#: ../../include/js_strings.php:70 ../../include/text.php:1161
-msgid "Monday"
-msgstr "lunedì"
-
-#: ../../include/js_strings.php:71 ../../include/text.php:1161
-msgid "Tuesday"
-msgstr "martedì"
-
-#: ../../include/js_strings.php:72 ../../include/text.php:1161
-msgid "Wednesday"
-msgstr "mercoledì"
-
-#: ../../include/js_strings.php:73 ../../include/text.php:1161
-msgid "Thursday"
-msgstr "giovedì"
-
-#: ../../include/js_strings.php:74 ../../include/text.php:1161
-msgid "Friday"
-msgstr "venerdì"
-
-#: ../../include/js_strings.php:75 ../../include/text.php:1161
-msgid "Saturday"
-msgstr "sabato"
-
 #: ../../include/js_strings.php:76
 msgid "Sun"
 msgstr "Dom"
@@ -615,7 +915,7 @@ msgstr "Impossibile trovare il nome utente nel file da importare."
 msgid "Import completed."
 msgstr "L'importazione è terminata con successo."
 
-#: ../../include/comanche.php:34 ../../mod/admin.php:351
+#: ../../include/comanche.php:34 ../../mod/admin.php:356
 msgid "Default"
 msgstr "Predefinito"
 
@@ -626,148 +926,75 @@ msgstr "Predefinito"
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: ../../include/items.php:1128 ../../include/items.php:1174
+#: ../../include/items.php:1130 ../../include/items.php:1176
 msgid "(Unknown)"
 msgstr "(Sconosciuto)"
 
-#: ../../include/items.php:1371
+#: ../../include/items.php:1373
 msgid "Visible to anybody on the internet."
 msgstr "Visibile a chiunque su internet."
 
-#: ../../include/items.php:1373
+#: ../../include/items.php:1375
 msgid "Visible to you only."
 msgstr "Visibile solo a te."
 
-#: ../../include/items.php:1375
+#: ../../include/items.php:1377
 msgid "Visible to anybody in this network."
 msgstr "Visibile a tutti su questa rete."
 
-#: ../../include/items.php:1377
+#: ../../include/items.php:1379
 msgid "Visible to anybody authenticated."
 msgstr "Visibile a chiunque sia autenticato."
 
-#: ../../include/items.php:1379
+#: ../../include/items.php:1381
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Visibile a tutti su %s."
 
-#: ../../include/items.php:1381
+#: ../../include/items.php:1383
 msgid "Visible to all connections."
 msgstr "Visibile a tutti coloro che ti seguono."
 
-#: ../../include/items.php:1383
+#: ../../include/items.php:1385
 msgid "Visible to approved connections."
 msgstr "Visibile ai contatti approvati."
 
-#: ../../include/items.php:1385
+#: ../../include/items.php:1387
 msgid "Visible to specific connections."
 msgstr "Visibile ad alcuni contatti scelti."
 
-#: ../../include/items.php:4317 ../../mod/filestorage.php:27
-#: ../../mod/thing.php:86 ../../mod/admin.php:127 ../../mod/admin.php:1005
-#: ../../mod/admin.php:1210 ../../mod/display.php:36 ../../mod/viewsrc.php:20
+#: ../../include/items.php:4326 ../../mod/filestorage.php:27
+#: ../../mod/display.php:36 ../../mod/thing.php:86 ../../mod/admin.php:129
+#: ../../mod/admin.php:1017 ../../mod/admin.php:1222 ../../mod/viewsrc.php:20
 msgid "Item not found."
 msgstr "Elemento non trovato."
 
-#: ../../include/items.php:4826 ../../mod/group.php:38 ../../mod/group.php:137
+#: ../../include/items.php:4838 ../../mod/group.php:38 ../../mod/group.php:137
 msgid "Collection not found."
 msgstr "Insieme di canali non trovato."
 
-#: ../../include/items.php:4842
+#: ../../include/items.php:4854
 msgid "Collection is empty."
 msgstr "L'insieme di canali è vuoto."
 
-#: ../../include/items.php:4849
+#: ../../include/items.php:4861
 #, php-format
 msgid "Collection: %s"
 msgstr "Insieme: %s"
 
-#: ../../include/items.php:4859 ../../mod/connedit.php:683
+#: ../../include/items.php:4871 ../../mod/connedit.php:683
 #, php-format
 msgid "Connection: %s"
 msgstr "Contatto: %s"
 
-#: ../../include/items.php:4861
+#: ../../include/items.php:4873
 msgid "Connection not found."
 msgstr "Contatto non trovato."
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "Devi scegliere un destinatario."
-
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[nessun titolo]"
-
-#: ../../include/message.php:43
-msgid "Unable to determine sender."
-msgstr "Impossibile determinare il mittente."
-
-#: ../../include/message.php:218
-msgid "Stored post could not be verified."
-msgstr "Non è stato possibile verificare il post."
-
-#: ../../include/network.php:630
-msgid "view full size"
-msgstr "guarda nelle dimensioni reali"
-
-#: ../../include/network.php:1608 ../../include/enotify.php:57
-msgid "$Projectname Notification"
-msgstr "Notifica $Projectname"
-
-#: ../../include/network.php:1609 ../../include/enotify.php:58
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/network.php:1611 ../../include/enotify.php:60
-msgid "Thank You,"
-msgstr "Grazie,"
-
-#: ../../include/network.php:1613 ../../include/enotify.php:62
-#, php-format
-msgid "%s Administrator"
-msgstr "L'amministratore di %s"
-
-#: ../../include/network.php:1655 ../../include/account.php:316
-#: ../../include/account.php:343 ../../include/account.php:403
-msgid "Administrator"
-msgstr "Amministratore"
-
-#: ../../include/network.php:1669
-msgid "No Subject"
-msgstr "Nessun titolo"
-
-#: ../../include/event.php:22 ../../include/bb2diaspora.php:471
-#: ../../include/text.php:1392
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d F Y \\@ G:i"
-
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:477
-#: ../../include/text.php:1396
-msgid "Starts:"
-msgstr "Inizio:"
-
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:485
-#: ../../include/text.php:1400
-msgid "Finishes:"
-msgstr "Fine:"
-
-#: ../../include/event.php:52 ../../include/identity.php:1004
-#: ../../include/bb2diaspora.php:493 ../../include/text.php:1407
-#: ../../mod/directory.php:304
-msgid "Location:"
-msgstr "Luogo:"
-
 #: ../../include/event.php:768
 msgid "This event has been added to your calendar."
 msgstr "Questo evento è stato aggiunto al tuo calendario"
 
-#: ../../include/event.php:904 ../../include/conversation.php:123
-#: ../../include/text.php:1919 ../../mod/tagger.php:47 ../../mod/like.php:363
-#: ../../mod/events.php:249
-msgid "event"
-msgstr "l'evento"
-
 #: ../../include/event.php:967
 msgid "Not specified"
 msgstr "Non specificato"
@@ -847,206 +1074,206 @@ msgstr "Il canale che cerchi non è disponibile."
 msgid "Requested profile is not available."
 msgstr "Il profilo richiesto non è disponibile."
 
-#: ../../include/identity.php:966 ../../mod/profiles.php:782
+#: ../../include/identity.php:960 ../../mod/profiles.php:782
 msgid "Change profile photo"
 msgstr "Cambia la foto del profilo"
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:966
 msgid "Profiles"
 msgstr "Profili"
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:966
 msgid "Manage/edit profiles"
 msgstr "Gestisci/modifica i profili"
 
-#: ../../include/identity.php:973 ../../mod/profiles.php:783
+#: ../../include/identity.php:967 ../../mod/profiles.php:783
 msgid "Create New Profile"
 msgstr "Crea un nuovo profilo"
 
-#: ../../include/identity.php:976 ../../include/nav.php:90
+#: ../../include/identity.php:970 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr "Modifica il profilo"
 
-#: ../../include/identity.php:988 ../../mod/profiles.php:794
+#: ../../include/identity.php:982 ../../mod/profiles.php:794
 msgid "Profile Image"
 msgstr "Immagine del profilo"
 
-#: ../../include/identity.php:991
+#: ../../include/identity.php:985
 msgid "visible to everybody"
 msgstr "visibile a tutti"
 
-#: ../../include/identity.php:992 ../../mod/profiles.php:677
+#: ../../include/identity.php:986 ../../mod/profiles.php:677
 #: ../../mod/profiles.php:798
 msgid "Edit visibility"
 msgstr "Cambia la visibilità"
 
-#: ../../include/identity.php:1008 ../../include/identity.php:1248
+#: ../../include/identity.php:1002 ../../include/identity.php:1242
 msgid "Gender:"
 msgstr "Sesso:"
 
-#: ../../include/identity.php:1009 ../../include/identity.php:1292
+#: ../../include/identity.php:1003 ../../include/identity.php:1286
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../../include/identity.php:1010 ../../include/identity.php:1303
+#: ../../include/identity.php:1004 ../../include/identity.php:1297
 msgid "Homepage:"
 msgstr "Home page:"
 
-#: ../../include/identity.php:1011
+#: ../../include/identity.php:1005
 msgid "Online Now"
 msgstr "Online adesso"
 
-#: ../../include/identity.php:1095 ../../include/identity.php:1173
+#: ../../include/identity.php:1089 ../../include/identity.php:1167
 #: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../include/identity.php:1096 ../../include/identity.php:1174
+#: ../../include/identity.php:1090 ../../include/identity.php:1168
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:1141 ../../include/identity.php:1213
+#: ../../include/identity.php:1135 ../../include/identity.php:1207
 #: ../../mod/ping.php:341
 msgid "[today]"
 msgstr "[oggi]"
 
-#: ../../include/identity.php:1152
+#: ../../include/identity.php:1146
 msgid "Birthday Reminders"
 msgstr "Promemoria compleanni"
 
-#: ../../include/identity.php:1153
+#: ../../include/identity.php:1147
 msgid "Birthdays this week:"
 msgstr "Compleanni questa settimana:"
 
-#: ../../include/identity.php:1206
+#: ../../include/identity.php:1200
 msgid "[No description]"
 msgstr "[Nessuna descrizione]"
 
-#: ../../include/identity.php:1224
+#: ../../include/identity.php:1218
 msgid "Event Reminders"
 msgstr "Promemoria"
 
-#: ../../include/identity.php:1225
+#: ../../include/identity.php:1219
 msgid "Events this week:"
 msgstr "Eventi della settimana:"
 
-#: ../../include/identity.php:1238 ../../include/identity.php:1355
+#: ../../include/identity.php:1232 ../../include/identity.php:1349
 #: ../../include/apps.php:138 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../../include/identity.php:1246 ../../mod/settings.php:1029
+#: ../../include/identity.php:1240 ../../mod/settings.php:1029
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: ../../include/identity.php:1253
+#: ../../include/identity.php:1247
 msgid "Like this channel"
 msgstr "Mi piace questo canale"
 
-#: ../../include/identity.php:1264 ../../include/taxonomy.php:414
+#: ../../include/identity.php:1258 ../../include/taxonomy.php:414
 #: ../../include/conversation.php:1721 ../../include/ItemObject.php:179
-#: ../../mod/photos.php:1086
+#: ../../mod/photos.php:1083
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Mi piace"
 msgstr[1] "Mi piace"
 
-#: ../../include/identity.php:1277
+#: ../../include/identity.php:1271
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/identity.php:1278
+#: ../../include/identity.php:1272
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/identity.php:1285
+#: ../../include/identity.php:1279
 msgid "Birthday:"
 msgstr "Compleanno:"
 
-#: ../../include/identity.php:1289 ../../mod/directory.php:299
+#: ../../include/identity.php:1283 ../../mod/directory.php:299
 msgid "Age:"
 msgstr "Età:"
 
-#: ../../include/identity.php:1298
+#: ../../include/identity.php:1292
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "per %1$d %2$s"
 
-#: ../../include/identity.php:1301 ../../mod/profiles.php:699
+#: ../../include/identity.php:1295 ../../mod/profiles.php:699
 msgid "Sexual Preference:"
 msgstr "Preferenze sessuali:"
 
-#: ../../include/identity.php:1305 ../../mod/profiles.php:701
+#: ../../include/identity.php:1299 ../../mod/profiles.php:701
 #: ../../mod/directory.php:315
 msgid "Hometown:"
 msgstr "Città dove vivo:"
 
-#: ../../include/identity.php:1307
+#: ../../include/identity.php:1301
 msgid "Tags:"
 msgstr "Tag:"
 
-#: ../../include/identity.php:1309 ../../mod/profiles.php:702
+#: ../../include/identity.php:1303 ../../mod/profiles.php:702
 msgid "Political Views:"
 msgstr "Orientamento politico:"
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1305
 msgid "Religion:"
 msgstr "Religione:"
 
-#: ../../include/identity.php:1313 ../../mod/directory.php:317
+#: ../../include/identity.php:1307 ../../mod/directory.php:317
 msgid "About:"
 msgstr "Informazioni:"
 
-#: ../../include/identity.php:1315
+#: ../../include/identity.php:1309
 msgid "Hobbies/Interests:"
 msgstr "Interessi e hobby:"
 
-#: ../../include/identity.php:1317 ../../mod/profiles.php:705
+#: ../../include/identity.php:1311 ../../mod/profiles.php:705
 msgid "Likes:"
 msgstr "Mi piace:"
 
-#: ../../include/identity.php:1319 ../../mod/profiles.php:706
+#: ../../include/identity.php:1313 ../../mod/profiles.php:706
 msgid "Dislikes:"
 msgstr "Non mi piace:"
 
-#: ../../include/identity.php:1321
+#: ../../include/identity.php:1315
 msgid "Contact information and Social Networks:"
 msgstr "Contatti e social network:"
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1317
 msgid "My other channels:"
 msgstr "I miei altri canali:"
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1319
 msgid "Musical interests:"
 msgstr "Gusti musicali:"
 
-#: ../../include/identity.php:1327
+#: ../../include/identity.php:1321
 msgid "Books, literature:"
 msgstr "Libri, letteratura:"
 
-#: ../../include/identity.php:1329
+#: ../../include/identity.php:1323
 msgid "Television:"
 msgstr "Televisione:"
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1325
 msgid "Film/dance/culture/entertainment:"
 msgstr "Film, danza, cultura, intrattenimento:"
 
-#: ../../include/identity.php:1333
+#: ../../include/identity.php:1327
 msgid "Love/Romance:"
 msgstr "Amore:"
 
-#: ../../include/identity.php:1335
+#: ../../include/identity.php:1329
 msgid "Work/employment:"
 msgstr "Lavoro:"
 
-#: ../../include/identity.php:1337
+#: ../../include/identity.php:1331
 msgid "School/education:"
 msgstr "Scuola:"
 
-#: ../../include/identity.php:1357
+#: ../../include/identity.php:1351
 msgid "Like this thing"
 msgstr "Mi piace"
 
@@ -1095,6 +1322,41 @@ msgstr "non mi piace"
 msgid "dislikes"
 msgstr "non gli piace"
 
+#: ../../include/photos.php:112
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "L'immagine supera il limite massimo di %lu bytes"
+
+#: ../../include/photos.php:119
+msgid "Image file is empty."
+msgstr "Il file dell'immagine è vuoto."
+
+#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
+msgid "Unable to process image"
+msgstr "Impossibile elaborare l'immagine"
+
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr "Impossibile salvare la foto."
+
+#: ../../include/photos.php:297
+msgid "a new photo"
+msgstr "una nuova foto"
+
+#: ../../include/photos.php:301
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s ha pubblicato %2$s su %3$s"
+
+#: ../../include/photos.php:506 ../../include/conversation.php:1625
+msgid "Photo Albums"
+msgstr "Album foto"
+
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Carica nuove foto"
+
 #: ../../include/acl_selectors.php:240
 msgid "Visible to your default audience"
 msgstr "Visibile secondo le impostazioni predefinite"
@@ -1112,13 +1374,13 @@ msgid "Other networks and post services"
 msgstr "Invio ad altre reti o a siti esterni"
 
 #: ../../include/acl_selectors.php:249 ../../mod/filestorage.php:147
-#: ../../mod/photos.php:631 ../../mod/photos.php:1001 ../../mod/thing.php:310
-#: ../../mod/thing.php:356 ../../mod/chat.php:211
+#: ../../mod/thing.php:310 ../../mod/thing.php:356 ../../mod/photos.php:631
+#: ../../mod/photos.php:998 ../../mod/chat.php:211
 msgid "Permissions"
 msgstr "Permessi"
 
 #: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:384
-#: ../../mod/photos.php:1218
+#: ../../mod/photos.php:1215
 msgid "Close"
 msgstr "Chiudi"
 
@@ -1153,68 +1415,60 @@ msgstr "Elemento non trovato."
 msgid "No source file."
 msgstr "Nessun file di origine."
 
-#: ../../include/attach.php:514
+#: ../../include/attach.php:518
 msgid "Cannot locate file to replace"
 msgstr "Il file da sostituire non è stato trovato"
 
-#: ../../include/attach.php:532
+#: ../../include/attach.php:536
 msgid "Cannot locate file to revise/update"
 msgstr "Il file da aggiornare non è stato trovato"
 
-#: ../../include/attach.php:667
+#: ../../include/attach.php:671
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "Il file supera la dimensione massima di %d"
 
-#: ../../include/attach.php:681
+#: ../../include/attach.php:685
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati."
 
-#: ../../include/attach.php:837
+#: ../../include/attach.php:841
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato."
 
-#: ../../include/attach.php:850
+#: ../../include/attach.php:854
 msgid "Stored file could not be verified. Upload failed."
 msgstr "Il file non può essere verificato. Caricamento fallito."
 
-#: ../../include/attach.php:898 ../../include/attach.php:914
+#: ../../include/attach.php:902 ../../include/attach.php:918
 msgid "Path not available."
 msgstr "Percorso non disponibile."
 
-#: ../../include/attach.php:960 ../../include/attach.php:1112
+#: ../../include/attach.php:964 ../../include/attach.php:1116
 msgid "Empty pathname"
 msgstr "Il percorso del file è vuoto"
 
-#: ../../include/attach.php:986
+#: ../../include/attach.php:990
 msgid "duplicate filename or path"
 msgstr "il file o il percorso del file è duplicato"
 
-#: ../../include/attach.php:1008
+#: ../../include/attach.php:1012
 msgid "Path not found."
 msgstr "Percorso del file non trovato."
 
-#: ../../include/attach.php:1066
+#: ../../include/attach.php:1070
 msgid "mkdir failed."
 msgstr "mkdir fallito."
 
-#: ../../include/attach.php:1070
+#: ../../include/attach.php:1074
 msgid "database storage failed."
 msgstr "scrittura su database fallita."
 
-#: ../../include/attach.php:1118
+#: ../../include/attach.php:1122
 msgid "Empty path"
 msgstr "La posizione è vuota"
 
-#: ../../include/bb2diaspora.php:382
-msgid "Attachments:"
-msgstr "Allegati:"
-
-#: ../../include/bb2diaspora.php:473
-msgid "$Projectname event notification:"
-msgstr "Notifica evento $Projectname:"
-
 #: ../../include/notify.php:20
 msgid "created a new post"
 msgstr "Ha creato un nuovo post"
@@ -1278,12 +1532,6 @@ msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"
 msgid "Notes"
 msgstr "Note"
 
-#: ../../include/widgets.php:192 ../../include/text.php:868
-#: ../../include/text.php:880 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100
-#: ../../mod/admin.php:1442 ../../mod/admin.php:1462 ../../mod/filer.php:49
-msgid "Save"
-msgstr "Salva"
-
 #: ../../include/widgets.php:266
 msgid "Remove term"
 msgstr "Rimuovi termine"
@@ -1373,8 +1621,8 @@ msgid "Channel Sources"
 msgstr "Sorgenti del canale"
 
 #: ../../include/widgets.php:554 ../../include/nav.php:202
-#: ../../include/apps.php:134 ../../mod/admin.php:1064
-#: ../../mod/admin.php:1264
+#: ../../include/apps.php:134 ../../mod/admin.php:1076
+#: ../../mod/admin.php:1276
 msgid "Settings"
 msgstr "Impostazioni"
 
@@ -1434,130 +1682,150 @@ msgstr "Eventi della settimana"
 msgid "Month View"
 msgstr "Eventi del mese"
 
-#: ../../include/widgets.php:674 ../../mod/events.php:669
+#: ../../include/widgets.php:674 ../../mod/events.php:654
 msgid "Export"
 msgstr "Esporta"
 
-#: ../../include/widgets.php:675 ../../mod/events.php:672
+#: ../../include/widgets.php:675 ../../mod/events.php:657
 msgid "Import"
 msgstr "Importa"
 
-#: ../../include/widgets.php:749
+#: ../../include/widgets.php:685
+msgid "Events Tools"
+msgstr "Gestione eventi"
+
+#: ../../include/widgets.php:686
+msgid "Export Calendar"
+msgstr "Esporta calendario"
+
+#: ../../include/widgets.php:687
+msgid "Import Calendar"
+msgstr "Importa calendario"
+
+#: ../../include/widgets.php:761
 msgid "Chat Rooms"
 msgstr "Chat"
 
-#: ../../include/widgets.php:769
+#: ../../include/widgets.php:781
 msgid "Bookmarked Chatrooms"
 msgstr "Chat nei segnalibri"
 
-#: ../../include/widgets.php:789
+#: ../../include/widgets.php:801
 msgid "Suggested Chatrooms"
 msgstr "Chat suggerite"
 
-#: ../../include/widgets.php:916 ../../include/widgets.php:974
+#: ../../include/widgets.php:928 ../../include/widgets.php:986
 msgid "photo/image"
 msgstr "foto/immagine"
 
-#: ../../include/widgets.php:1069 ../../include/widgets.php:1071
+#: ../../include/widgets.php:1081 ../../include/widgets.php:1083
 msgid "Rate Me"
 msgstr "Valutami"
 
-#: ../../include/widgets.php:1075
+#: ../../include/widgets.php:1087
 msgid "View Ratings"
 msgstr "Vedi le valutazioni ricevute"
 
-#: ../../include/widgets.php:1086
+#: ../../include/widgets.php:1098
 msgid "Public Hubs"
 msgstr "Hub pubblici"
 
-#: ../../include/widgets.php:1134
+#: ../../include/widgets.php:1146
 msgid "Forums"
 msgstr "Forum"
 
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1175
 msgid "Tasks"
 msgstr "Attività"
 
-#: ../../include/widgets.php:1170
+#: ../../include/widgets.php:1184
 msgid "Documentation"
 msgstr "Guida"
 
-#: ../../include/widgets.php:1172
+#: ../../include/widgets.php:1186
 msgid "Project/Site Information"
 msgstr "Informazioni sul sito/progetto"
 
-#: ../../include/widgets.php:1173
+#: ../../include/widgets.php:1187
 msgid "For Members"
 msgstr "Per gli utenti"
 
-#: ../../include/widgets.php:1174
+#: ../../include/widgets.php:1188
 msgid "For Administrators"
 msgstr "Per gli amministratori"
 
-#: ../../include/widgets.php:1175
+#: ../../include/widgets.php:1189
 msgid "For Developers"
 msgstr "Per sviluppatori"
 
-#: ../../include/widgets.php:1200 ../../mod/admin.php:434
+#: ../../include/widgets.php:1214 ../../mod/admin.php:446
 msgid "Site"
 msgstr "Sito"
 
-#: ../../include/widgets.php:1201
+#: ../../include/widgets.php:1215
 msgid "Accounts"
 msgstr "Account"
 
-#: ../../include/widgets.php:1202 ../../mod/admin.php:965
+#: ../../include/widgets.php:1216 ../../mod/admin.php:977
 msgid "Channels"
 msgstr "Canali"
 
-#: ../../include/widgets.php:1203 ../../mod/admin.php:1062
-#: ../../mod/admin.php:1102
+#: ../../include/widgets.php:1217 ../../mod/admin.php:1074
+#: ../../mod/admin.php:1114
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../../include/widgets.php:1204 ../../mod/admin.php:1262
-#: ../../mod/admin.php:1296
+#: ../../include/widgets.php:1218 ../../mod/admin.php:1274
+#: ../../mod/admin.php:1308
 msgid "Themes"
 msgstr "Temi"
 
-#: ../../include/widgets.php:1205
+#: ../../include/widgets.php:1219
 msgid "Inspect queue"
 msgstr "Coda di attesa"
 
-#: ../../include/widgets.php:1206
+#: ../../include/widgets.php:1220
 msgid "Profile Config"
 msgstr "Configurazione del profilo"
 
-#: ../../include/widgets.php:1207
+#: ../../include/widgets.php:1221
 msgid "DB updates"
 msgstr "Aggiornamenti al DB"
 
-#: ../../include/widgets.php:1225 ../../include/widgets.php:1231
-#: ../../mod/admin.php:1381
+#: ../../include/widgets.php:1239 ../../include/widgets.php:1245
+#: ../../mod/admin.php:1393
 msgid "Logs"
 msgstr "Log"
 
-#: ../../include/widgets.php:1229 ../../include/nav.php:210
+#: ../../include/widgets.php:1243 ../../include/nav.php:210
 msgid "Admin"
 msgstr "Amministrazione"
 
-#: ../../include/widgets.php:1230
+#: ../../include/widgets.php:1244
 msgid "Plugin Features"
 msgstr "Plugin"
 
-#: ../../include/widgets.php:1232
+#: ../../include/widgets.php:1246
 msgid "User registrations waiting for confirmation"
 msgstr "Registrazioni in attesa"
 
-#: ../../include/widgets.php:1311 ../../mod/photos.php:753
-#: ../../mod/photos.php:1286
+#: ../../include/widgets.php:1324 ../../mod/photos.php:748
+#: ../../mod/photos.php:1283
 msgid "View Photo"
 msgstr "Guarda la foto"
 
-#: ../../include/widgets.php:1327 ../../mod/photos.php:782
+#: ../../include/widgets.php:1341 ../../mod/photos.php:779
 msgid "Edit Album"
 msgstr "Modifica album"
 
+#: ../../include/bb2diaspora.php:376
+msgid "Attachments:"
+msgstr "Allegati:"
+
+#: ../../include/bb2diaspora.php:467
+msgid "$Projectname event notification:"
+msgstr "Notifica evento $Projectname:"
+
 #: ../../include/bookmarks.php:35
 #, php-format
 msgid "%1$s's bookmarks"
@@ -2074,11 +2342,11 @@ msgid "YYYY-MM-DD or MM-DD"
 msgstr "AAAA-MM-GG oppure MM-GG"
 
 #: ../../include/datetime.php:236 ../../mod/appman.php:91
-#: ../../mod/appman.php:92 ../../mod/events.php:452 ../../mod/events.php:457
+#: ../../mod/appman.php:92 ../../mod/events.php:437 ../../mod/events.php:442
 msgid "Required"
 msgstr "Obbligatorio"
 
-#: ../../include/datetime.php:263 ../../boot.php:2289
+#: ../../include/datetime.php:263 ../../boot.php:2291
 msgid "never"
 msgstr "mai"
 
@@ -2158,29 +2426,14 @@ msgstr "Compleanno di %1$s"
 msgid "Happy Birthday %1$s"
 msgstr "Buon compleanno %1$s"
 
-#: ../../include/api.php:1302
+#: ../../include/api.php:1336
 msgid "Public Timeline"
 msgstr "Diario pubblico"
 
-#: ../../include/conversation.php:120 ../../include/text.php:1916
-#: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
-msgid "photo"
-msgstr "la foto"
-
 #: ../../include/conversation.php:126 ../../mod/like.php:113
 msgid "channel"
 msgstr "il canale"
 
-#: ../../include/conversation.php:148 ../../include/text.php:1922
-#: ../../mod/like.php:361 ../../mod/subthread.php:83
-msgid "status"
-msgstr "il messaggio di stato"
-
-#: ../../include/conversation.php:150 ../../include/text.php:1924
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr "il commento"
-
 #: ../../include/conversation.php:164 ../../mod/like.php:410
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -2201,52 +2454,48 @@ msgstr "%1$s adesso è connesso con %2$s"
 msgid "%1$s poked %2$s"
 msgstr "%1$s ha mandato un poke a %2$s"
 
-#: ../../include/conversation.php:243 ../../include/text.php:954
-msgid "poked"
-msgstr "ha ricevuto un poke"
-
 #: ../../include/conversation.php:260 ../../mod/mood.php:63
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s è %2$s"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1063
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Likes"
 msgstr "Mi piace"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1063
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Non mi piace"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Agree"
 msgstr "D'accordo"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Disagree"
 msgstr "Non d'accordo"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Abstain"
 msgstr "Astenuti"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Attending"
 msgstr "Partecipano"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Not attending"
 msgstr "Non partecipano"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Might attend"
 msgstr "Forse partecipano"
@@ -2301,8 +2550,8 @@ msgstr "Vedi nel contesto"
 
 #: ../../include/conversation.php:740 ../../include/conversation.php:1227
 #: ../../include/ItemObject.php:389 ../../mod/editwebpage.php:190
-#: ../../mod/photos.php:1029 ../../mod/editblock.php:150
-#: ../../mod/editlayout.php:148 ../../mod/editpost.php:129
+#: ../../mod/editblock.php:150 ../../mod/editlayout.php:148
+#: ../../mod/photos.php:1026 ../../mod/editpost.php:129
 msgid "Please wait"
 msgstr "Attendere"
 
@@ -2408,8 +2657,8 @@ msgstr "Non piace a %s."
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Visibile a <strong>tutti</strong>"
 
-#: ../../include/conversation.php:1155 ../../mod/mail.php:194
-#: ../../mod/mail.php:308
+#: ../../include/conversation.php:1155 ../../mod/mail.php:202
+#: ../../mod/mail.php:316
 msgid "Please enter a link URL:"
 msgstr "Inserisci l'indirizzo del link:"
 
@@ -2433,22 +2682,22 @@ msgstr "Salva nella cartella:"
 msgid "Where are you right now?"
 msgstr "Dove sei ora?"
 
-#: ../../include/conversation.php:1161 ../../mod/mail.php:195
-#: ../../mod/mail.php:309 ../../mod/editpost.php:56
+#: ../../include/conversation.php:1161 ../../mod/editpost.php:56
+#: ../../mod/mail.php:203 ../../mod/mail.php:317
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Scade il YYYY-MM-DD HH:MM"
 
 #: ../../include/conversation.php:1169 ../../include/page_widgets.php:40
 #: ../../include/ItemObject.php:706 ../../mod/editwebpage.php:212
-#: ../../mod/photos.php:1049 ../../mod/editblock.php:171
-#: ../../mod/webpages.php:188 ../../mod/editpost.php:149
-#: ../../mod/events.php:473
+#: ../../mod/editblock.php:171 ../../mod/webpages.php:188
+#: ../../mod/photos.php:1046 ../../mod/editpost.php:149
+#: ../../mod/events.php:458
 msgid "Preview"
 msgstr "Anteprima"
 
 #: ../../include/conversation.php:1192 ../../mod/blocks.php:154
-#: ../../mod/photos.php:1028 ../../mod/webpages.php:182
-#: ../../mod/layouts.php:184
+#: ../../mod/webpages.php:182 ../../mod/layouts.php:184
+#: ../../mod/photos.php:1025
 msgid "Share"
 msgstr "Condividi"
 
@@ -2502,7 +2751,7 @@ msgstr "carica foto"
 
 #: ../../include/conversation.php:1206 ../../mod/editwebpage.php:183
 #: ../../mod/editblock.php:143 ../../mod/editlayout.php:141
-#: ../../mod/mail.php:240 ../../mod/mail.php:369 ../../mod/editpost.php:119
+#: ../../mod/editpost.php:119 ../../mod/mail.php:248 ../../mod/mail.php:378
 msgid "Attach file"
 msgstr "Allega file"
 
@@ -2512,7 +2761,7 @@ msgstr "allega file"
 
 #: ../../include/conversation.php:1208 ../../mod/editwebpage.php:184
 #: ../../mod/editblock.php:144 ../../mod/editlayout.php:142
-#: ../../mod/mail.php:241 ../../mod/mail.php:370 ../../mod/editpost.php:120
+#: ../../mod/editpost.php:120 ../../mod/mail.php:249 ../../mod/mail.php:379
 msgid "Insert web link"
 msgstr "Inserisci un indirizzo web"
 
@@ -2573,7 +2822,7 @@ msgstr "Categorie (facoltative, lista separata da virgole)"
 
 #: ../../include/conversation.php:1228 ../../mod/editwebpage.php:191
 #: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
-#: ../../mod/editpost.php:130 ../../mod/events.php:474
+#: ../../mod/editpost.php:130 ../../mod/events.php:459
 msgid "Permission settings"
 msgstr "Permessi dei tuoi contatti"
 
@@ -2595,7 +2844,7 @@ msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
 
 #: ../../include/conversation.php:1252 ../../mod/editwebpage.php:217
 #: ../../mod/editblock.php:176 ../../mod/editlayout.php:173
-#: ../../mod/mail.php:245 ../../mod/mail.php:374 ../../mod/editpost.php:155
+#: ../../mod/editpost.php:155 ../../mod/mail.php:253 ../../mod/mail.php:383
 msgid "Set expiration date"
 msgstr "Data di scadenza"
 
@@ -2604,7 +2853,7 @@ msgid "Set publish date"
 msgstr "Data di uscita programmata"
 
 #: ../../include/conversation.php:1257 ../../include/ItemObject.php:709
-#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:157
+#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385
 msgid "Encrypt text"
 msgstr "Cifratura del messaggio"
 
@@ -2612,8 +2861,8 @@ msgstr "Cifratura del messaggio"
 msgid "OK"
 msgstr "OK"
 
-#: ../../include/conversation.php:1260 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../include/conversation.php:1260 ../../mod/fbrowser.php:77
+#: ../../mod/fbrowser.php:112 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
 #: ../../mod/settings.php:587 ../../mod/settings.php:613
 #: ../../mod/editpost.php:160
 msgid "Cancel"
@@ -2672,7 +2921,7 @@ msgstr "Spam"
 msgid "Posts flagged as SPAM"
 msgstr "Post marcati come spam"
 
-#: ../../include/conversation.php:1601 ../../mod/admin.php:973
+#: ../../include/conversation.php:1601 ../../mod/admin.php:985
 msgid "Channel"
 msgstr "Canale"
 
@@ -2693,10 +2942,6 @@ msgstr "Dettagli del profilo"
 msgid "Photos"
 msgstr "Foto"
 
-#: ../../include/conversation.php:1625 ../../include/photos.php:483
-msgid "Photo Albums"
-msgstr "Album foto"
-
 #: ../../include/conversation.php:1632
 msgid "Files and Storage"
 msgstr "Archivio file"
@@ -2724,13 +2969,13 @@ msgid "Manage Webpages"
 msgstr "Gestisci le pagine web"
 
 #: ../../include/conversation.php:1697 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1082
-#: ../../mod/photos.php:1094
+#: ../../include/ItemObject.php:187 ../../mod/photos.php:1079
+#: ../../mod/photos.php:1091
 msgid "View all"
 msgstr "Vedi tutto"
 
 #: ../../include/conversation.php:1724 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1091
+#: ../../mod/photos.php:1088
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -2828,8 +3073,8 @@ msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:79 ../../mod/id.php:15
-#: ../../mod/id.php:16 ../../mod/admin.php:805 ../../mod/admin.php:814
-#: ../../boot.php:1488
+#: ../../mod/id.php:16 ../../mod/admin.php:817 ../../mod/admin.php:826
+#: ../../boot.php:1490
 msgid "Email"
 msgstr "Email"
 
@@ -2857,23 +3102,6 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/zot.php:685
-msgid "Invalid data packet"
-msgstr "Dati ricevuti non validi"
-
-#: ../../include/zot.php:701
-msgid "Unable to verify channel signature"
-msgstr "Impossibile verificare la firma elettronica del canale"
-
-#: ../../include/zot.php:2265
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Impossibile verificare la firma elettronica del sito %s"
-
-#: ../../include/zot.php:3592
-msgid "invalid target signature"
-msgstr "la firma ricevuta non è valida"
-
 #: ../../include/bbcode.php:123 ../../include/bbcode.php:794
 #: ../../include/bbcode.php:797 ../../include/bbcode.php:802
 #: ../../include/bbcode.php:805 ../../include/bbcode.php:808
@@ -2944,7 +3172,7 @@ msgid_plural "%d invitations available"
 msgstr[0] "%d invito disponibile"
 msgstr[1] "%d inviti disponibili"
 
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:439
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:451
 msgid "Advanced"
 msgstr "Avanzate"
 
@@ -2997,46 +3225,22 @@ msgstr[1] "%d contatti in comune"
 msgid "show more"
 msgstr "mostra tutto"
 
-#: ../../include/dir_fns.php:139
-msgid "Directory Options"
-msgstr "Visibilità negli elenchi pubblici"
-
-#: ../../include/dir_fns.php:141
-msgid "Safe Mode"
-msgstr "Modalità SafeSearch"
-
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:106
-#: ../../mod/photos.php:626 ../../mod/admin.php:410 ../../mod/settings.php:577
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:462
-#: ../../mod/events.php:463 ../../mod/events.php:472 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490
-msgid "No"
-msgstr "No"
+#: ../../include/enotify.php:57 ../../include/network.php:1608
+msgid "$Projectname Notification"
+msgstr "Notifica $Projectname"
 
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/api.php:105 ../../mod/photos.php:626 ../../mod/admin.php:412
-#: ../../mod/settings.php:577 ../../mod/menu.php:96 ../../mod/menu.php:153
-#: ../../mod/events.php:462 ../../mod/events.php:463 ../../mod/events.php:472
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490
-msgid "Yes"
-msgstr "Si"
+#: ../../include/enotify.php:58 ../../include/network.php:1609
+msgid "$projectname"
+msgstr "$projectname"
 
-#: ../../include/dir_fns.php:142
-msgid "Public Forums Only"
-msgstr "Solo forum pubblici"
+#: ../../include/enotify.php:60 ../../include/network.php:1611
+msgid "Thank You,"
+msgstr "Grazie,"
 
-#: ../../include/dir_fns.php:143
-msgid "This Website Only"
-msgstr "Solo in questo sito"
+#: ../../include/enotify.php:62 ../../include/network.php:1613
+#, php-format
+msgid "%s Administrator"
+msgstr "L'amministratore di %s"
 
 #: ../../include/enotify.php:96
 #, php-format
@@ -3233,19 +3437,19 @@ msgstr "La risposta dal canale non è completa."
 msgid "Channel was deleted and no longer exists."
 msgstr "Il canale è stato rimosso e non esiste più."
 
-#: ../../include/follow.php:152 ../../include/follow.php:180
+#: ../../include/follow.php:152 ../../include/follow.php:181
 msgid "Protocol disabled."
 msgstr "Protocollo disabilitato."
 
-#: ../../include/follow.php:170
+#: ../../include/follow.php:171
 msgid "Channel discovery failed."
 msgstr "La ricerca del canale non ha avuto successo."
 
-#: ../../include/follow.php:196
+#: ../../include/follow.php:197
 msgid "local account not found."
 msgstr "l'account locale non è stato trovato."
 
-#: ../../include/follow.php:220
+#: ../../include/follow.php:221
 msgid "Cannot connect to yourself."
 msgstr "Non puoi connetterti a te stesso."
 
@@ -3257,7 +3461,23 @@ msgstr "Contenuti incorporati"
 msgid "Embedding disabled"
 msgstr "Disabilita la creazione di contenuti incorporati"
 
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1485
+#: ../../include/message.php:19
+msgid "No recipient provided."
+msgstr "Devi scegliere un destinatario."
+
+#: ../../include/message.php:24
+msgid "[no subject]"
+msgstr "[nessun titolo]"
+
+#: ../../include/message.php:44
+msgid "Unable to determine sender."
+msgstr "Impossibile determinare il mittente."
+
+#: ../../include/message.php:219
+msgid "Stored post could not be verified."
+msgstr "Non è stato possibile verificare il post."
+
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1487
 msgid "Logout"
 msgstr "Esci"
 
@@ -3313,7 +3533,7 @@ msgstr "I tuoi segnalibri"
 msgid "Your webpages"
 msgstr "Le tue pagine web"
 
-#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1486
+#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1488
 msgid "Login"
 msgstr "Accedi"
 
@@ -3338,7 +3558,7 @@ msgstr "Clicca per farti riconoscere dal tuo hub principale"
 msgid "Home Page"
 msgstr "Bacheca"
 
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1462
+#: ../../include/nav.php:149 ../../mod/register.php:226 ../../boot.php:1470
 msgid "Register"
 msgstr "Registrati"
 
@@ -3347,7 +3567,7 @@ msgid "Create an account"
 msgstr "Crea un account"
 
 #: ../../include/nav.php:154 ../../include/apps.php:142
-#: ../../mod/layouts.php:176 ../../mod/help.php:202 ../../mod/help.php:207
+#: ../../mod/layouts.php:176 ../../mod/help.php:204 ../../mod/help.php:209
 msgid "Help"
 msgstr "Guida"
 
@@ -3359,12 +3579,6 @@ msgstr "Guida e documentazione"
 msgid "Applications, utilities, links, games"
 msgstr "Applicazioni, utilità, link, giochi"
 
-#: ../../include/nav.php:159 ../../include/text.php:867
-#: ../../include/text.php:879 ../../include/apps.php:147
-#: ../../mod/search.php:40
-msgid "Search"
-msgstr "Cerca"
-
 #: ../../include/nav.php:159
 msgid "Search site @name, #tag, ?docs, content"
 msgstr "Cerca nel sito per @nome, #tag, ?guida o per contenuto"
@@ -3484,244 +3698,46 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "I controlli di sicurezza sono falliti. Probabilmente è accaduto perché la pagina è stata tenuta aperta troppo a lungo (ore?) prima di inviare il contenuto."
 
-#: ../../include/text.php:394
-msgid "prev"
-msgstr "prec"
-
-#: ../../include/text.php:396
-msgid "first"
-msgstr "inizio"
-
-#: ../../include/text.php:425
-msgid "last"
-msgstr "fine"
-
-#: ../../include/text.php:428
-msgid "next"
-msgstr "succ"
-
-#: ../../include/text.php:438
-msgid "older"
-msgstr "più recenti"
-
-#: ../../include/text.php:440
-msgid "newer"
-msgstr "più nuovi"
-
-#: ../../include/text.php:785
-msgid "No connections"
-msgstr "Nessun contatto"
-
-#: ../../include/text.php:797
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d contatto"
-msgstr[1] "%d contatti"
-
-#: ../../include/text.php:810 ../../mod/viewconnections.php:101
-msgid "View Connections"
-msgstr "Elenco contatti"
-
-#: ../../include/text.php:954
-msgid "poke"
-msgstr "poke"
-
-#: ../../include/text.php:955
-msgid "ping"
-msgstr "ping"
-
-#: ../../include/text.php:955
-msgid "pinged"
-msgstr "ha ricevuto un ping"
-
-#: ../../include/text.php:956
-msgid "prod"
-msgstr "spintone"
-
-#: ../../include/text.php:956
-msgid "prodded"
-msgstr "ha ricevuto uno spintone"
-
-#: ../../include/text.php:957
-msgid "slap"
-msgstr "schiaffo"
-
-#: ../../include/text.php:957
-msgid "slapped"
-msgstr "ha ricevuto uno schiaffo"
-
-#: ../../include/text.php:958
-msgid "finger"
-msgstr "finger"
-
-#: ../../include/text.php:958
-msgid "fingered"
-msgstr "ha ricevuto un finger"
-
-#: ../../include/text.php:959
-msgid "rebuff"
-msgstr "rifiuto"
-
-#: ../../include/text.php:959
-msgid "rebuffed"
-msgstr "ha ricevuto un rifiuto"
-
-#: ../../include/text.php:969
-msgid "happy"
-msgstr "felice"
-
-#: ../../include/text.php:970
-msgid "sad"
-msgstr "triste"
-
-#: ../../include/text.php:971
-msgid "mellow"
-msgstr "calmo"
-
-#: ../../include/text.php:972
-msgid "tired"
-msgstr "stanco"
-
-#: ../../include/text.php:973
-msgid "perky"
-msgstr "vivace"
-
-#: ../../include/text.php:974
-msgid "angry"
-msgstr "arrabbiato"
-
-#: ../../include/text.php:975
-msgid "stupified"
-msgstr "stordito"
-
-#: ../../include/text.php:976
-msgid "puzzled"
-msgstr "confuso"
-
-#: ../../include/text.php:977
-msgid "interested"
-msgstr "attento"
-
-#: ../../include/text.php:978
-msgid "bitter"
-msgstr "amaro"
-
-#: ../../include/text.php:979
-msgid "cheerful"
-msgstr "allegro"
-
-#: ../../include/text.php:980
-msgid "alive"
-msgstr "vivace"
-
-#: ../../include/text.php:981
-msgid "annoyed"
-msgstr "seccato"
-
-#: ../../include/text.php:982
-msgid "anxious"
-msgstr "ansioso"
-
-#: ../../include/text.php:983
-msgid "cranky"
-msgstr "irritabile"
-
-#: ../../include/text.php:984
-msgid "disturbed"
-msgstr "turbato"
-
-#: ../../include/text.php:985
-msgid "frustrated"
-msgstr "frustrato"
-
-#: ../../include/text.php:986
-msgid "depressed"
-msgstr "in depressione"
-
-#: ../../include/text.php:987
-msgid "motivated"
-msgstr "motivato"
-
-#: ../../include/text.php:988
-msgid "relaxed"
-msgstr "rilassato"
-
-#: ../../include/text.php:989
-msgid "surprised"
-msgstr "sorpreso"
-
-#: ../../include/text.php:1165
-msgid "May"
-msgstr "Mag"
-
-#: ../../include/text.php:1242 ../../include/text.php:1246
-msgid "Unknown Attachment"
-msgstr "Allegato non riconoscuto"
-
-#: ../../include/text.php:1248
-msgid "unknown"
-msgstr "sconosciuta"
-
-#: ../../include/text.php:1284
-msgid "remove category"
-msgstr "rimuovi la categoria"
-
-#: ../../include/text.php:1361
-msgid "remove from file"
-msgstr "rimuovi dal file"
-
-#: ../../include/text.php:1507 ../../include/text.php:1518
-msgid "Click to open/close"
-msgstr "Clicca per aprire/chiudere"
-
-#: ../../include/text.php:1692 ../../mod/events.php:638
-msgid "Link to Source"
-msgstr "Link al sito d'origine"
-
-#: ../../include/text.php:1713 ../../include/text.php:1785
-msgid "default"
-msgstr "predefinito"
-
-#: ../../include/text.php:1721
-msgid "Page layout"
-msgstr "Layout della pagina"
-
-#: ../../include/text.php:1721
-msgid "You can create your own with the layouts tool"
-msgstr "Puoi creare un tuo layout dalla configurazione delle pagine web"
-
-#: ../../include/text.php:1763
-msgid "Page content type"
-msgstr "Tipo di contenuto della pagina"
-
-#: ../../include/text.php:1797
-msgid "Select an alternate language"
-msgstr "Seleziona una lingua diversa"
-
-#: ../../include/text.php:1929
-msgid "activity"
-msgstr "l'attività"
+#: ../../include/dir_fns.php:139
+msgid "Directory Options"
+msgstr "Visibilità negli elenchi pubblici"
 
-#: ../../include/text.php:2224
-msgid "Design Tools"
-msgstr "Strumenti di design"
+#: ../../include/dir_fns.php:141
+msgid "Safe Mode"
+msgstr "Modalità SafeSearch"
 
-#: ../../include/text.php:2227 ../../mod/blocks.php:147
-msgid "Blocks"
-msgstr "Block"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:102
+#: ../../mod/admin.php:415 ../../mod/settings.php:577 ../../mod/photos.php:626
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:447
+#: ../../mod/events.php:448 ../../mod/events.php:457 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1492
+msgid "No"
+msgstr "No"
 
-#: ../../include/text.php:2228 ../../mod/menu.php:103
-msgid "Menus"
-msgstr "Menù"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/api.php:101 ../../mod/admin.php:417 ../../mod/settings.php:577
+#: ../../mod/photos.php:626 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1492
+msgid "Yes"
+msgstr "Sì"
 
-#: ../../include/text.php:2229 ../../mod/layouts.php:174
-msgid "Layouts"
-msgstr "Layout"
+#: ../../include/dir_fns.php:142
+msgid "Public Forums Only"
+msgstr "Solo forum pubblici"
 
-#: ../../include/text.php:2230
-msgid "Pages"
-msgstr "Pagine"
+#: ../../include/dir_fns.php:143
+msgid "This Website Only"
+msgstr "Solo in questo sito"
 
 #: ../../include/group.php:26
 msgid ""
@@ -3734,7 +3750,7 @@ msgstr "È stato ripristinato un insieme con lo stesso nome che era stato elimin
 msgid "Add new connections to this collection (privacy group)"
 msgstr "Aggiungi altri contatti a questo insieme (privacy di gruppo)"
 
-#: ../../include/group.php:251 ../../mod/admin.php:814
+#: ../../include/group.php:251 ../../mod/admin.php:826
 msgid "All Channels"
 msgstr "Tutti i canali"
 
@@ -3758,6 +3774,23 @@ msgstr "Nuovo insieme"
 msgid "Channels not in any collection"
 msgstr "Canali che non sono in un insieme"
 
+#: ../../include/zot.php:676
+msgid "Invalid data packet"
+msgstr "Dati ricevuti non validi"
+
+#: ../../include/zot.php:692
+msgid "Unable to verify channel signature"
+msgstr "Impossibile verificare la firma elettronica del canale"
+
+#: ../../include/zot.php:2268
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Impossibile verificare la firma elettronica del sito %s"
+
+#: ../../include/zot.php:3584
+msgid "invalid target signature"
+msgstr "la firma ricevuta non è valida"
+
 #: ../../include/page_widgets.php:6
 msgid "New Page"
 msgstr "Nuova pagina web"
@@ -3789,32 +3822,24 @@ msgstr "Creato"
 msgid "Edited"
 msgstr "Modificato"
 
+#: ../../include/network.php:630
+msgid "view full size"
+msgstr "guarda nelle dimensioni reali"
+
+#: ../../include/network.php:1655 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
+msgid "Administrator"
+msgstr "Amministratore"
+
+#: ../../include/network.php:1669
+msgid "No Subject"
+msgstr "Nessun titolo"
+
 #: ../../include/dba/dba_driver.php:141
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Non trovo le informazioni DNS per il database server '%s'"
 
-#: ../../include/photos.php:112
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "L'immagine supera il limite massimo di %lu bytes"
-
-#: ../../include/photos.php:119
-msgid "Image file is empty."
-msgstr "Il file dell'immagine è vuoto."
-
-#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
-msgid "Unable to process image"
-msgstr "Impossibile elaborare l'immagine"
-
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr "Impossibile salvare la foto."
-
-#: ../../include/photos.php:487
-msgid "Upload New Photos"
-msgstr "Carica nuove foto"
-
 #: ../../include/ItemObject.php:130
 msgid "Save to Folder"
 msgstr "Salva nella cartella"
@@ -3863,11 +3888,11 @@ msgstr "preferito"
 msgid "Add Tag"
 msgstr "Aggiungi un tag"
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:1026
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
 msgid "I like this (toggle)"
 msgstr "Attiva/disattiva Mi piace"
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:1027
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
 msgid "I don't like this (toggle)"
 msgstr "Attiva/disattiva Non mi piace"
 
@@ -3923,18 +3948,18 @@ msgstr "Aggiungi al calendario"
 msgid "Mark all seen"
 msgstr "Marca tutto come letto"
 
-#: ../../include/ItemObject.php:378 ../../mod/photos.php:1212
+#: ../../include/ItemObject.php:378 ../../mod/photos.php:1209
 msgctxt "noun"
 msgid "Likes"
 msgstr "Mi piace"
 
-#: ../../include/ItemObject.php:379 ../../mod/photos.php:1213
+#: ../../include/ItemObject.php:379 ../../mod/photos.php:1210
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "Non mi piace"
 
-#: ../../include/ItemObject.php:694 ../../mod/photos.php:1045
-#: ../../mod/photos.php:1163
+#: ../../include/ItemObject.php:694 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
 msgid "This is you"
 msgstr "Questo sei tu"
 
@@ -3950,78 +3975,6 @@ msgstr "Collegamento"
 msgid "Video"
 msgstr "Video"
 
-#: ../../include/account.php:27
-msgid "Not a valid email address"
-msgstr "Email non valida"
-
-#: ../../include/account.php:29
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Il dominio della tua email attualmente non è permesso su questo sito"
-
-#: ../../include/account.php:35
-msgid "Your email address is already registered at this site."
-msgstr "La tua email è già registrata su questo sito."
-
-#: ../../include/account.php:67
-msgid "An invitation is required."
-msgstr "È necessario un invito."
-
-#: ../../include/account.php:71
-msgid "Invitation could not be verified."
-msgstr "L'invito non può essere verificato."
-
-#: ../../include/account.php:121
-msgid "Please enter the required information."
-msgstr "Inserisci le informazioni richieste."
-
-#: ../../include/account.php:188
-msgid "Failed to store account information."
-msgstr "Non è stato possibile salvare le informazioni del tuo account."
-
-#: ../../include/account.php:248
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Registrazione di %s confermata"
-
-#: ../../include/account.php:314
-#, php-format
-msgid "Registration request at %s"
-msgstr "Richiesta di registrazione su %s"
-
-#: ../../include/account.php:338
-msgid "your registration password"
-msgstr "la password di registrazione"
-
-#: ../../include/account.php:341 ../../include/account.php:401
-#, php-format
-msgid "Registration details for %s"
-msgstr "Dettagli della registrazione di %s"
-
-#: ../../include/account.php:410
-msgid "Account approved."
-msgstr "Account approvato."
-
-#: ../../include/account.php:449
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrazione revocata per %s"
-
-#: ../../include/account.php:494
-msgid "Account verified. Please login."
-msgstr "Registrazione verificata. Adesso puoi effettuare login."
-
-#: ../../include/account.php:707 ../../include/account.php:709
-msgid "Click here to upgrade."
-msgstr "Clicca qui per aggiornare."
-
-#: ../../include/account.php:715
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Questa operazione supera i limiti del tuo abbonamento."
-
-#: ../../include/account.php:720
-msgid "This action is not available under your subscription plan."
-msgstr "Questa operazione non è prevista dal tuo abbonamento."
-
 #: ../../include/apps.php:128
 msgid "Site Admin"
 msgstr "Amministrazione sito"
@@ -4203,12 +4156,84 @@ msgstr "Repository di gruppo"
 msgid "Custom/Expert Mode"
 msgstr "Personalizzazione per esperti"
 
-#: ../../include/photo/photo_driver.php:719 ../../mod/photos.php:94
-#: ../../mod/photos.php:699 ../../mod/profile_photo.php:147
+#: ../../include/photo/photo_driver.php:719 ../../mod/profile_photo.php:147
 #: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:379
+#: ../../mod/photos.php:94 ../../mod/photos.php:699
 msgid "Profile Photos"
 msgstr "Foto del profilo"
 
+#: ../../include/account.php:27
+msgid "Not a valid email address"
+msgstr "Email non valida"
+
+#: ../../include/account.php:29
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Il dominio della tua email attualmente non è permesso su questo sito"
+
+#: ../../include/account.php:35
+msgid "Your email address is already registered at this site."
+msgstr "La tua email è già registrata su questo sito."
+
+#: ../../include/account.php:67
+msgid "An invitation is required."
+msgstr "È necessario un invito."
+
+#: ../../include/account.php:71
+msgid "Invitation could not be verified."
+msgstr "L'invito non può essere verificato."
+
+#: ../../include/account.php:121
+msgid "Please enter the required information."
+msgstr "Inserisci le informazioni richieste."
+
+#: ../../include/account.php:188
+msgid "Failed to store account information."
+msgstr "Non è stato possibile salvare le informazioni del tuo account."
+
+#: ../../include/account.php:248
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr "Registrazione di %s confermata"
+
+#: ../../include/account.php:314
+#, php-format
+msgid "Registration request at %s"
+msgstr "Richiesta di registrazione su %s"
+
+#: ../../include/account.php:338
+msgid "your registration password"
+msgstr "la password di registrazione"
+
+#: ../../include/account.php:341 ../../include/account.php:401
+#, php-format
+msgid "Registration details for %s"
+msgstr "Dettagli della registrazione di %s"
+
+#: ../../include/account.php:410
+msgid "Account approved."
+msgstr "Account approvato."
+
+#: ../../include/account.php:449
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registrazione revocata per %s"
+
+#: ../../include/account.php:494
+msgid "Account verified. Please login."
+msgstr "Registrazione verificata. Adesso puoi effettuare login."
+
+#: ../../include/account.php:707 ../../include/account.php:709
+msgid "Click here to upgrade."
+msgstr "Clicca qui per aggiornare."
+
+#: ../../include/account.php:715
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Questa operazione supera i limiti del tuo abbonamento."
+
+#: ../../include/account.php:720
+msgid "This action is not available under your subscription plan."
+msgstr "Questa operazione non è prevista dal tuo abbonamento."
+
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
 msgstr "Permesso negato."
@@ -4301,36 +4326,36 @@ msgstr "Tutti i canali connessi"
 msgid "Click on a channel to add or remove."
 msgstr "Clicca su un canale per aggiungerlo o rimuoverlo."
 
-#: ../../mod/item.php:173
+#: ../../mod/item.php:174
 msgid "Unable to locate original post."
 msgstr "Impossibile trovare il messaggio originale."
 
-#: ../../mod/item.php:417
+#: ../../mod/item.php:418
 msgid "Empty post discarded."
 msgstr "Il post vuoto è stato ignorato."
 
-#: ../../mod/item.php:457
+#: ../../mod/item.php:458
 msgid "Executable content type not permitted to this channel."
 msgstr "I contenuti eseguibili non sono permessi su questo canale."
 
-#: ../../mod/item.php:822
+#: ../../mod/item.php:823
 msgid "Duplicate post suppressed."
 msgstr "I post duplicati sono scartati."
 
-#: ../../mod/item.php:953
+#: ../../mod/item.php:954
 msgid "System error. Post not saved."
 msgstr "Errore di sistema. Post non salvato."
 
-#: ../../mod/item.php:1220
+#: ../../mod/item.php:1221
 msgid "Unable to obtain post information from database."
 msgstr "Impossibile caricare il post dal database."
 
-#: ../../mod/item.php:1227
+#: ../../mod/item.php:1228
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Hai raggiunto il limite massimo di %1$.0f post sulla pagina principale."
 
-#: ../../mod/item.php:1234
+#: ../../mod/item.php:1235
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web."
@@ -4410,7 +4435,8 @@ msgstr "Nessun risultato"
 msgid "OpenID protocol error. No ID returned."
 msgstr "Errore del protocollo OpenID. Nessun ID ricevuto in risposta."
 
-#: ../../mod/openid.php:72 ../../mod/openid.php:179 ../../mod/post.php:285
+#: ../../mod/openid.php:72 ../../mod/openid.php:179
+#: ../../Zotlabs/Zot/Auth.php:248
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Ciao %s. L'accesso tramite il tuo hub è avvenuto con successo."
@@ -4646,7 +4672,7 @@ msgstr "Elemento non valido."
 msgid "Channel not found."
 msgstr "Canale non trovato."
 
-#: ../../mod/page.php:89 ../../mod/display.php:110 ../../mod/help.php:214
+#: ../../mod/page.php:89 ../../mod/display.php:110 ../../mod/help.php:216
 #: ../../mod/block.php:75 ../../index.php:241
 msgid "Page not found."
 msgstr "Pagina non trovata."
@@ -4758,8 +4784,8 @@ msgstr "Maggiori informazioni sui ruoli"
 msgid "No ratings"
 msgstr "Nessuna valutazione"
 
-#: ../../mod/ratings.php:82 ../../mod/search.php:13 ../../mod/directory.php:59
-#: ../../mod/photos.php:490 ../../mod/display.php:13
+#: ../../mod/ratings.php:82 ../../mod/display.php:13
+#: ../../mod/directory.php:59 ../../mod/photos.php:490 ../../mod/search.php:13
 #: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr "Accesso pubblico negato."
@@ -4816,8 +4842,8 @@ msgstr "Leggi il file 'install/INSTALL.txt'."
 msgid "System check"
 msgstr "Verifica del sistema"
 
-#: ../../mod/setup.php:285 ../../mod/photos.php:914 ../../mod/events.php:668
-#: ../../mod/events.php:675
+#: ../../mod/setup.php:285 ../../mod/photos.php:911 ../../mod/events.php:653
+#: ../../mod/events.php:660
 msgid "Next"
 msgstr "Successivo"
 
@@ -5205,15 +5231,6 @@ msgstr "I miei segnalibri"
 msgid "My Connections Bookmarks"
 msgstr "I segnalibri dei miei contatti"
 
-#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:157
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../mod/home.php:75
-#, php-format
-msgid "Welcome to %s"
-msgstr "%s ti dà il benvenuto"
-
 #: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
 msgid "This setting requires special processing and editing has been blocked."
 msgstr "Questa impostazione è bloccata, richiede criteri di modifica speciali"
@@ -5318,7 +5335,7 @@ msgstr "Home page"
 msgid "Interests"
 msgstr "Interessi"
 
-#: ../../mod/profiles.php:457 ../../mod/admin.php:974
+#: ../../mod/profiles.php:457 ../../mod/admin.php:986
 msgid "Address"
 msgstr "Indirizzo"
 
@@ -5502,16 +5519,6 @@ msgstr "Aggiungi oggetti al profilo"
 msgid "Include desirable objects in your profile"
 msgstr "Aggiungi oggetti interessanti al tuo profilo"
 
-#: ../../mod/search.php:212
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "Elementi taggati con: %s"
-
-#: ../../mod/search.php:214
-#, php-format
-msgid "Search results for: %s"
-msgstr "Risultati ricerca: %s"
-
 #: ../../mod/connedit.php:75
 msgid "Could not access contact record."
 msgstr "Non è possibile accedere alle informazioni sul contatto."
@@ -5571,11 +5578,11 @@ msgstr "Attività recenti"
 msgid "View recent posts and comments"
 msgstr "Leggi i post recenti e i commenti"
 
-#: ../../mod/connedit.php:519 ../../mod/admin.php:811
+#: ../../mod/connedit.php:519 ../../mod/admin.php:823
 msgid "Unblock"
 msgstr "Sblocca"
 
-#: ../../mod/connedit.php:519 ../../mod/admin.php:810
+#: ../../mod/connedit.php:519 ../../mod/admin.php:822
 msgid "Block"
 msgstr "Blocca"
 
@@ -5731,7 +5738,7 @@ msgid ""
 " communication."
 msgstr "(%s) vorrebbe entrare in contatto con te. Per permettere la comunicazione è necessario che tu approvi."
 
-#: ../../mod/connedit.php:710 ../../mod/admin.php:807
+#: ../../mod/connedit.php:710 ../../mod/admin.php:819
 msgid "Approve"
 msgstr "Approva"
 
@@ -5904,19 +5911,19 @@ msgstr "ha aggiunto il tuo canale"
 msgid "posted an event"
 msgstr "ha creato un evento"
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
+#: ../../mod/api.php:74 ../../mod/api.php:98
 msgid "Authorize application connection"
 msgstr "Autorizza la app"
 
-#: ../../mod/api.php:77
+#: ../../mod/api.php:75
 msgid "Return to your app and insert this Securty Code:"
 msgstr "Torna alla app e inserisci questo codice di sicurezza:"
 
-#: ../../mod/api.php:89
+#: ../../mod/api.php:85
 msgid "Please login to continue."
 msgstr "Accedi al sito per continuare."
 
-#: ../../mod/api.php:104
+#: ../../mod/api.php:100
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
@@ -5942,7 +5949,7 @@ msgstr "Salva segnalibro"
 msgid "URL of bookmark"
 msgstr "URL del segnalibro"
 
-#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:465
+#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:450
 msgid "Description"
 msgstr "Descrizione"
 
@@ -6045,7 +6052,7 @@ msgstr "Rimuovi il tag"
 msgid "Select a tag to remove: "
 msgstr "Seleziona un tag da rimuovere: "
 
-#: ../../mod/tagrm.php:133 ../../mod/photos.php:954
+#: ../../mod/tagrm.php:133 ../../mod/photos.php:951
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -6156,7 +6163,7 @@ msgid ""
 "Password reset failed."
 msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non sarà reimpostata."
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1494
+#: ../../mod/lostpass.php:86 ../../boot.php:1496
 msgid "Password Reset"
 msgstr "Reimposta la password"
 
@@ -6314,156 +6321,75 @@ msgid ""
 "only once and leave this page open until finished."
 msgstr "Questa funzione potrebbe impiegare molto tempo a terminare. Per favore lanciala *una volta sola* e resta su questa pagina finché non avrà finito."
 
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr "Impossibile ottenere informazioni sul proprietario della pagina."
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr "Album non trovato."
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr "Elimina album"
+#: ../../mod/invite.php:25
+msgid "Total invitation limit exceeded."
+msgstr "Hai superato il numero massimo di inviti."
 
-#: ../../mod/photos.php:171 ../../mod/photos.php:1009
-msgid "Delete Photo"
-msgstr "Elimina foto"
+#: ../../mod/invite.php:49
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s: non è un indirizzo email valido."
 
-#: ../../mod/photos.php:501
-msgid "No photos selected"
-msgstr "Nessuna foto selezionata"
+#: ../../mod/invite.php:59
+msgid "Please join us on $Projectname"
+msgstr "Unisciti a noi su $Projectname"
 
-#: ../../mod/photos.php:550
-msgid "Access to this item is restricted."
-msgstr "Questo elemento non è visibile a tutti."
+#: ../../mod/invite.php:70
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Hai superato il numero massimo di inviti. Contatta l'amministratore se necessario."
 
-#: ../../mod/photos.php:589
+#: ../../mod/invite.php:75
 #, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile."
+msgid "%s : Message delivery failed."
+msgstr "%s: la consegna del messaggio è fallita."
 
-#: ../../mod/photos.php:592
+#: ../../mod/invite.php:79
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "Hai usato %1$.2f Mb del tuo spazio disponibile."
-
-#: ../../mod/photos.php:620
-msgid "Upload Photos"
-msgstr "Carica foto"
-
-#: ../../mod/photos.php:624
-msgid "Enter an album name"
-msgstr "Scegli il nome dell'album"
-
-#: ../../mod/photos.php:625
-msgid "or select an existing album (doubleclick)"
-msgstr "o seleziona un album esistente (doppio click)"
-
-#: ../../mod/photos.php:626
-msgid "Create a status post for this upload"
-msgstr "Pubblica sulla bacheca"
-
-#: ../../mod/photos.php:627
-msgid "Caption (optional):"
-msgstr "Titolo (facoltativo):"
-
-#: ../../mod/photos.php:628
-msgid "Description (optional):"
-msgstr "Descrizione (facoltativa):"
-
-#: ../../mod/photos.php:655
-msgid "Album name could not be decoded"
-msgstr "Non è stato possibile leggere il nome dell'album"
-
-#: ../../mod/photos.php:699 ../../mod/photos.php:1236
-#: ../../mod/photos.php:1253
-msgid "Contact Photos"
-msgstr "Foto dei contatti"
-
-#: ../../mod/photos.php:727
-msgid "Show Newest First"
-msgstr "Prima i più recenti"
-
-#: ../../mod/photos.php:729
-msgid "Show Oldest First"
-msgstr "Prima i più vecchi"
-
-#: ../../mod/photos.php:827
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Permesso negato. L'accesso a questo elemento può essere stato limitato."
-
-#: ../../mod/photos.php:829
-msgid "Photo not available"
-msgstr "Foto non disponibile"
-
-#: ../../mod/photos.php:887
-msgid "Use as profile photo"
-msgstr "Usa come foto del profilo"
-
-#: ../../mod/photos.php:894
-msgid "Private Photo"
-msgstr "Foto privata"
-
-#: ../../mod/photos.php:905 ../../mod/events.php:667 ../../mod/events.php:674
-msgid "Previous"
-msgstr "Precendente"
-
-#: ../../mod/photos.php:909
-msgid "View Full Size"
-msgstr "Vedi nelle dimensioni originali"
-
-#: ../../mod/photos.php:988
-msgid "Edit photo"
-msgstr "Modifica la foto"
-
-#: ../../mod/photos.php:990
-msgid "Rotate CW (right)"
-msgstr "Ruota (senso orario)"
-
-#: ../../mod/photos.php:991
-msgid "Rotate CCW (left)"
-msgstr "Ruota (senso antiorario)"
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d messaggio inviato."
+msgstr[1] "%d messaggi inviati."
 
-#: ../../mod/photos.php:994
-msgid "Enter a new album name"
-msgstr "Inserisci il nome del nuovo album"
+#: ../../mod/invite.php:98
+msgid "You have no more invitations available"
+msgstr "Non hai altri inviti disponibili"
 
-#: ../../mod/photos.php:995
-msgid "or select an existing one (doubleclick)"
-msgstr "o seleziona uno esistente (doppio click)"
+#: ../../mod/invite.php:129
+msgid "Send invitations"
+msgstr "Spedisci inviti"
 
-#: ../../mod/photos.php:998
-msgid "Caption"
-msgstr "Didascalia"
+#: ../../mod/invite.php:130
+msgid "Enter email addresses, one per line:"
+msgstr "Inserisci gli indirizzi email, uno per riga:"
 
-#: ../../mod/photos.php:1000
-msgid "Add a Tag"
-msgstr "Aggiungi tag"
+#: ../../mod/invite.php:131 ../../mod/mail.php:246
+msgid "Your message:"
+msgstr "Il tuo messaggio:"
 
-#: ../../mod/photos.php:1004
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Esempio: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../mod/invite.php:132
+msgid "Please join my community on $Projectname."
+msgstr "Entra nella mia comunità su $Projectname."
 
-#: ../../mod/photos.php:1007
-msgid "Flag as adult in album view"
-msgstr "Marca come 'per adulti'"
+#: ../../mod/invite.php:134
+msgid "You will need to supply this invitation code: "
+msgstr "Dovrai fornire questo codice di invito:"
 
-#: ../../mod/photos.php:1199
-msgid "In This Photo:"
-msgstr "In questa foto:"
+#: ../../mod/invite.php:135
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Registrati su qualsiasi server $Projectname (sono tutti interconnessi)"
 
-#: ../../mod/photos.php:1204
-msgid "Map"
-msgstr "Mappa"
+#: ../../mod/invite.php:137
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Inserisci il mio indirizzo $Projectname nel riquadro di ricerca del sito."
 
-#: ../../mod/photos.php:1292
-msgid "View Album"
-msgstr "Guarda l'album"
+#: ../../mod/invite.php:138
+msgid "or visit "
+msgstr "oppure visita "
 
-#: ../../mod/photos.php:1315
-msgid "Recent Photos"
-msgstr "Foto recenti"
+#: ../../mod/invite.php:140
+msgid "3. Click [Connect]"
+msgstr "3. Clicca su [Aggiungi]"
 
 #: ../../mod/probe.php:24 ../../mod/probe.php:30
 #, php-format
@@ -6734,807 +6660,817 @@ msgstr "Impossibile proseguire. Devi prima accettare le Condizioni d'Uso del ser
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: ../../mod/register.php:117
+#: ../../mod/register.php:119
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "La registrazione è terminata correttamente. Per continuare controlla l'email che ti è stata inviata."
 
-#: ../../mod/register.php:123
+#: ../../mod/register.php:125
 msgid "Your registration is pending approval by the site owner."
 msgstr "La tua richiesta è in attesa di approvazione da parte dell'amministratore di questo hub."
 
-#: ../../mod/register.php:126
+#: ../../mod/register.php:128
 msgid "Your registration can not be processed."
 msgstr "La tua registrazione non puo' essere processata."
 
-#: ../../mod/register.php:163
+#: ../../mod/register.php:165
 msgid "Registration on this site/hub is by approval only."
 msgstr "La registrazione su questo hub è soggetta ad approvazione."
 
-#: ../../mod/register.php:164
+#: ../../mod/register.php:166
 msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
 msgstr "<a href=\"pubsites\">Registrati su un altro hub affiliato</a>"
 
-#: ../../mod/register.php:174
+#: ../../mod/register.php:176
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Questo hub ha superato il numero di registrazioni giornaliere consentite. Prova di nuovo domani."
 
-#: ../../mod/register.php:185
+#: ../../mod/register.php:187
 msgid "Terms of Service"
 msgstr "Condizioni d'Uso"
 
-#: ../../mod/register.php:191
+#: ../../mod/register.php:193
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Accetto le %s di questo sito"
 
-#: ../../mod/register.php:193
+#: ../../mod/register.php:195
 #, php-format
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr "Ho più di 13 anni e accetto le %s di questo sito"
 
-#: ../../mod/register.php:207 ../../mod/admin.php:436
+#: ../../mod/register.php:209 ../../mod/admin.php:448
 msgid "Registration"
 msgstr "Registrazione"
 
-#: ../../mod/register.php:212
+#: ../../mod/register.php:214
 msgid "Membership on this site is by invitation only."
 msgstr "Per registrarsi su questo hub è necessario un invito."
 
-#: ../../mod/register.php:213
+#: ../../mod/register.php:215
 msgid "Please enter your invitation code"
 msgstr "Inserisci il codice dell'invito"
 
-#: ../../mod/register.php:216
+#: ../../mod/register.php:218
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
 
-#: ../../mod/register.php:217
+#: ../../mod/register.php:219
 msgid "Choose a password"
 msgstr "Scegli una password"
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:220
 msgid "Please re-enter your password"
 msgstr "Ripeti la password per verifica"
 
-#: ../../mod/admin.php:52
+#: ../../mod/admin.php:54
 msgid "Theme settings updated."
 msgstr "Le impostazioni del tema sono state aggiornate."
 
-#: ../../mod/admin.php:160
+#: ../../mod/admin.php:162
 msgid "# Accounts"
 msgstr "# account"
 
-#: ../../mod/admin.php:161
+#: ../../mod/admin.php:163
 msgid "# blocked accounts"
 msgstr "# account bloccati"
 
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:164
 msgid "# expired accounts"
 msgstr "# account scaduti"
 
-#: ../../mod/admin.php:163
+#: ../../mod/admin.php:165
 msgid "# expiring accounts"
 msgstr "# account in scadenza"
 
-#: ../../mod/admin.php:174
+#: ../../mod/admin.php:176
 msgid "# Channels"
 msgstr "# canali"
 
-#: ../../mod/admin.php:175
+#: ../../mod/admin.php:177
 msgid "# primary"
 msgstr "# primari"
 
-#: ../../mod/admin.php:176
+#: ../../mod/admin.php:178
 msgid "# clones"
 msgstr "# cloni"
 
-#: ../../mod/admin.php:182
+#: ../../mod/admin.php:184
 msgid "Message queues"
 msgstr "Coda messaggi in uscita"
 
-#: ../../mod/admin.php:198 ../../mod/admin.php:433 ../../mod/admin.php:532
-#: ../../mod/admin.php:800 ../../mod/admin.php:964 ../../mod/admin.php:1061
-#: ../../mod/admin.php:1101 ../../mod/admin.php:1261 ../../mod/admin.php:1295
-#: ../../mod/admin.php:1380
+#: ../../mod/admin.php:200 ../../mod/admin.php:445 ../../mod/admin.php:545
+#: ../../mod/admin.php:812 ../../mod/admin.php:976 ../../mod/admin.php:1073
+#: ../../mod/admin.php:1113 ../../mod/admin.php:1273 ../../mod/admin.php:1307
+#: ../../mod/admin.php:1392
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: ../../mod/admin.php:199
+#: ../../mod/admin.php:201
 msgid "Summary"
 msgstr "Riepilogo"
 
-#: ../../mod/admin.php:202
+#: ../../mod/admin.php:204
 msgid "Registered accounts"
 msgstr "Account creati"
 
-#: ../../mod/admin.php:203 ../../mod/admin.php:536
+#: ../../mod/admin.php:205 ../../mod/admin.php:549
 msgid "Pending registrations"
 msgstr "Registrazioni da approvare"
 
-#: ../../mod/admin.php:204
+#: ../../mod/admin.php:206
 msgid "Registered channels"
 msgstr "Canali creati"
 
-#: ../../mod/admin.php:205 ../../mod/admin.php:537
+#: ../../mod/admin.php:207 ../../mod/admin.php:550
 msgid "Active plugins"
 msgstr "Plugin attivi"
 
-#: ../../mod/admin.php:206
+#: ../../mod/admin.php:208
 msgid "Version"
 msgstr "Versione"
 
-#: ../../mod/admin.php:324
+#: ../../mod/admin.php:329
 msgid "Site settings updated."
 msgstr "Impostazioni del sito salvate correttamente."
 
-#: ../../mod/admin.php:361 ../../mod/settings.php:793
+#: ../../mod/admin.php:366 ../../mod/settings.php:793
 msgid "mobile"
 msgstr "mobile"
 
-#: ../../mod/admin.php:363
+#: ../../mod/admin.php:368
 msgid "experimental"
 msgstr "sperimentale"
 
-#: ../../mod/admin.php:365
+#: ../../mod/admin.php:370
 msgid "unsupported"
 msgstr "non supportato"
 
-#: ../../mod/admin.php:411
+#: ../../mod/admin.php:416
 msgid "Yes - with approval"
 msgstr "Sì - con approvazione"
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:422
 msgid "My site is not a public server"
 msgstr "Non è un server pubblico"
 
-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:423
 msgid "My site has paid access only"
 msgstr "È un servizio a pagamento"
 
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:424
 msgid "My site has free access only"
 msgstr "È un servizio gratuito"
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:425
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "È un servizio gratuito con opzioni aggiuntive a pagamento"
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:449
 msgid "File upload"
 msgstr "Caricamento file"
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:450
 msgid "Policies"
 msgstr "Politiche"
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
 msgid "Site name"
 msgstr "Nome del sito"
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
 msgid "Banner/Logo"
 msgstr "Banner o logo"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid "Administrator Information"
 msgstr "Informazioni sull'amministratore"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Informazioni per contattare gli amministratori del sito. Saranno mostrate sulla pagina di informazioni. È consentito il BBcode"
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:458
 msgid "System language"
 msgstr "Lingua di sistema"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
 msgid "System theme"
 msgstr "Tema di sistema"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Il tema di sistema può essere cambiato dai profili dei singoli utenti - <a href='#' id='cnftheme'>Cambia le impostazioni del tema</a>"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:460
 msgid "Mobile system theme"
 msgstr "Tema di sistema per dispositivi mobili"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:460
 msgid "Theme for mobile devices"
 msgstr "Tema per i dispositivi mobili"
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid "Allow Feeds as Connections"
 msgstr "Permetti di aggiungere i feed come contatti"
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid "(Heavy system resource usage)"
 msgstr "(Uso intenso delle risorse di sistema!)"
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid "Maximum image size"
 msgstr "Dimensione massima immagini"
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Massima dimensione in byte delle immagini caricate. Il default è 0, cioè nessun limite."
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
 msgid "Does this site allow new member registration?"
 msgstr "Questo sito permette a nuovi utenti di registrarsi?"
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:465
+msgid "Invitation only"
+msgstr "Solo con invito"
+
+#: ../../mod/admin.php:465
+msgid ""
+"Only allow new member registrations with an invitation code. Above register "
+"policy must be set to Yes."
+msgstr "La registrazione è permessa solo a chi possiede un codice di invito. Funziona solo se la possibilità di registrarsi è impostata a 'Sì'."
+
+#: ../../mod/admin.php:466
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Come descriveresti il tipo di servizio proposto da questo server?"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:467
 msgid "Register text"
 msgstr "Testo di registrazione"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:467
 msgid "Will be displayed prominently on the registration page."
 msgstr "Sarà mostrato ben visibile nella pagina di registrazione."
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:468
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Homepage del sito da mostrare ai navigatori (predefinito: modulo di login)"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:468
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "esempio: 'public' per mostrare i contenuti pubblici degli utenti, 'page/sys/home' per mostrare la pagina web definita come 'home' oppure 'include:home.html' per mostrare il contenuto di un file."
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:469
 msgid "Preserve site homepage URL"
 msgstr "Conserva l'URL della homepage"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:469
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Presenta la homepage del sito in un frame all'indirizzo attuale invece di un redirect."
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:470
 msgid "Accounts abandoned after x days"
 msgstr "Account abbandonati dopo X giorni"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:470
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Eviterà di sprecare risorse di sistema controllando se i siti esterni hanno account abbandonati. Immettere 0 per non imporre nessun limite di tempo."
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:471
 msgid "Allowed friend domains"
 msgstr "Domini fidati e consentiti"
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:471
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Elenco separato da virgola dei domini che possono stabilire amicizie con questo sito. Sono accettati caratteri jolly. Lascia vuoto per accettare connessioni da qualsiasi dominio."
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:472
 msgid "Allowed email domains"
 msgstr "Domini email consentiti"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:472
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Elenco separato da virgola dei domini permessi come indirizzi email in fase di registrazione. Sono accettati caratteri jolly. Lascia vuoto per accettare qualsiasi dominio email"
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:473
 msgid "Not allowed email domains"
 msgstr "Domini email non consentiti"
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:473
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Elenco separato da virgola dei domini permessi come indirizzi email in fase di registrazione a questo sito. Sono accettati caratteri jolly. Lascalo vuoto per accettare qualsiasi dominio."
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:474
 msgid "Block public"
 msgstr "Blocca pagine pubbliche"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:474
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Seleziona per impedire di vedere le pagine personali di questo sito a chi non ha effettuato l'accesso."
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:475
 msgid "Verify Email Addresses"
 msgstr "Verifica l'indirizzo email"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:475
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Attiva per richiedere la verifica degli indirizzi email dei nuovi utenti (consigliato)."
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:476
 msgid "Force publish"
 msgstr "Forza la publicazione del profilo"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:476
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Seleziona per pubblicare sui directory server <strong>tutti</strong> i profili registrati su questo sito."
 
-#: ../../mod/admin.php:464
-msgid "Disable discovery tab"
-msgstr "Disabilita la funzione 'scopri'"
+#: ../../mod/admin.php:477
+msgid "Import Public Streams"
+msgstr "Suggerisci contenuti pubblici della rete Hubzilla"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:477
 msgid ""
-"Remove the tab in the network view with public content pulled from sources "
-"chosen for this site."
-msgstr "Nell'area della rete personale non comparirà più la scheda con i contenuti acquisiti da altri siti."
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
+msgstr "Suggerisci e visualizza i contenuti pubblici presenti su altri siti Hubzilla. Attenzione: i contenuti saranno importati senza moderazione e potrebbero essere inappropriati."
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:478
 msgid "login on Homepage"
 msgstr "Mostra il login sulla homepage"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:478
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Presenta il modulo di login ai visitatori sulla homepage in mancanza di altri contenuti."
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:480
 msgid "Directory Server URL"
 msgstr "URL del directory server"
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:480
 msgid "Default directory server"
 msgstr "Directory server predefinito"
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:482
 msgid "Proxy user"
 msgstr "Utente proxy"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:483
 msgid "Proxy URL"
 msgstr "URL proxy"
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:484
 msgid "Network timeout"
 msgstr "Timeout rete"
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:484
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Valore in secondi. Imposta a 0 per illimitato (sconsigliato)."
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:485
 msgid "Delivery interval"
 msgstr "Recapito ritardato"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:485
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Numero di secondi di cui può essere ritardato il recapito, per ridurre il carico di sistema. Consigliati: 4-5 secondi per hosting condiviso, 2-3 per i VPS, 0-1 per grandi server dedicati."
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:486
 msgid "Deliveries per process"
 msgstr "Tentativi di recapito per processo"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:486
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Numero di tentativi di recapito da tentare per ciascun processo. Può essere modificato per migliorare le performance di sistema. Raccomandato: 1-5"
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:487
 msgid "Poll interval"
 msgstr "Intervallo di polling"
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:487
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Numero di secondi di cui può essere ritardato il polling in background, per ridurre il carico del sistema. Se 0, verrà usato lo stesso valore del 'Recapito ritardato'."
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:488
 msgid "Maximum Load Average"
 msgstr "Carico massimo medio"
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:488
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Carico di sistema massimo perché i processi di recapito e polling siano ritardati - il valore predefinito è 50."
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:489
 msgid "Expiration period in days for imported (matrix/network) content"
 msgstr "Scadenza dei contenuti importati da altri siti (in giorni)"
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:489
 msgid "0 for no expiration of imported content"
 msgstr "0 per non avere scadenza"
 
-#: ../../mod/admin.php:524
+#: ../../mod/admin.php:537
 msgid "No server found"
 msgstr "Server non trovato"
 
-#: ../../mod/admin.php:531 ../../mod/admin.php:814
+#: ../../mod/admin.php:544 ../../mod/admin.php:826
 msgid "ID"
 msgstr "ID"
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:544
 msgid "for channel"
 msgstr "per il canale"
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:544
 msgid "on server"
 msgstr "sul server"
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:544
 msgid "Status"
 msgstr "Stato"
 
-#: ../../mod/admin.php:533
+#: ../../mod/admin.php:546
 msgid "Server"
 msgstr "Server"
 
-#: ../../mod/admin.php:550
+#: ../../mod/admin.php:563
 msgid "Update has been marked successful"
 msgstr "L'aggiornamento è stato marcato come eseguito."
 
-#: ../../mod/admin.php:560
+#: ../../mod/admin.php:573
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Fallita l'esecuzione di %s. Maggiori informazioni sui log di sistema."
 
-#: ../../mod/admin.php:563
+#: ../../mod/admin.php:576
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "L'aggiornamento %s è terminato correttamente."
 
-#: ../../mod/admin.php:567
+#: ../../mod/admin.php:580
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "L'aggiornamento %s non ha dato risposta. Impossibile determinare se è terminato correttamente."
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:583
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Impossibile trovare la funzione di aggiornamento %s"
 
-#: ../../mod/admin.php:586
+#: ../../mod/admin.php:599
 msgid "No failed updates."
 msgstr "Nessun aggiornamento fallito."
 
-#: ../../mod/admin.php:590
+#: ../../mod/admin.php:603
 msgid "Failed Updates"
 msgstr "Aggiornamenti falliti."
 
-#: ../../mod/admin.php:592
+#: ../../mod/admin.php:605
 msgid "Mark success (if update was manually applied)"
 msgstr "Marca come eseguito (se applicato manualmente)."
 
-#: ../../mod/admin.php:593
+#: ../../mod/admin.php:606
 msgid "Attempt to execute this update step automatically"
 msgstr "Tenta di eseguire in automatico questo passaggio dell'aggiornamento."
 
-#: ../../mod/admin.php:625
+#: ../../mod/admin.php:637
 msgid "Queue Statistics"
 msgstr "Statistiche della coda"
 
-#: ../../mod/admin.php:626
+#: ../../mod/admin.php:638
 msgid "Total Entries"
 msgstr "Totale"
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:639
 msgid "Priority"
 msgstr "Priorità"
 
-#: ../../mod/admin.php:628
+#: ../../mod/admin.php:640
 msgid "Destination URL"
 msgstr "URL di destinazione"
 
-#: ../../mod/admin.php:629
+#: ../../mod/admin.php:641
 msgid "Mark hub permanently offline"
 msgstr "Questo hub è definitivamente offline"
 
-#: ../../mod/admin.php:630
+#: ../../mod/admin.php:642
 msgid "Empty queue for this hub"
 msgstr "Svuota la coda per questo hub"
 
-#: ../../mod/admin.php:631
+#: ../../mod/admin.php:643
 msgid "Last known contact"
 msgstr "Ultimo scambio dati"
 
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:679
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "Modificato il blocco su %s account"
 msgstr[1] "Modificato il blocco verso %s"
 
-#: ../../mod/admin.php:675
+#: ../../mod/admin.php:687
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s account eliminato"
 msgstr[1] "%s account eliminati"
 
-#: ../../mod/admin.php:711
+#: ../../mod/admin.php:723
 msgid "Account not found"
 msgstr "Account non trovato"
 
-#: ../../mod/admin.php:723
+#: ../../mod/admin.php:735
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Account '%s' eliminato"
 
-#: ../../mod/admin.php:731
+#: ../../mod/admin.php:743
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Aggiunto un blocco verso '%s'"
 
-#: ../../mod/admin.php:739
+#: ../../mod/admin.php:751
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Rimosso il blocco verso '%s'"
 
-#: ../../mod/admin.php:801 ../../mod/admin.php:813
+#: ../../mod/admin.php:813 ../../mod/admin.php:825
 msgid "Users"
 msgstr "Utenti"
 
-#: ../../mod/admin.php:803 ../../mod/admin.php:967
+#: ../../mod/admin.php:815 ../../mod/admin.php:979
 msgid "select all"
 msgstr "seleziona tutti"
 
-#: ../../mod/admin.php:804
+#: ../../mod/admin.php:816
 msgid "User registrations waiting for confirm"
 msgstr "Richieste di registrazione in attesa di conferma"
 
-#: ../../mod/admin.php:805
+#: ../../mod/admin.php:817
 msgid "Request date"
 msgstr "Data richiesta"
 
-#: ../../mod/admin.php:806
+#: ../../mod/admin.php:818
 msgid "No registrations."
 msgstr "Nessuna registrazione."
 
-#: ../../mod/admin.php:808
+#: ../../mod/admin.php:820
 msgid "Deny"
 msgstr "Nega"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Register date"
 msgstr "Data registrazione"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Expires"
 msgstr "Con scadenza"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Service Class"
 msgstr "Classe dell'account"
 
-#: ../../mod/admin.php:816
+#: ../../mod/admin.php:828
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Gli account selezionati saranno eliminati!\\n\\nTutto ciò che hanno caricato o pubblicato su questo sito sarà eliminato definitivamente!\\n\\nVuoi confermare?"
 
-#: ../../mod/admin.php:817
+#: ../../mod/admin.php:829
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "L'account {0} sarà eliminato!\\n\\nTutto ciò che ha caricato o pubblicato su questo sito sarà eliminato definitivamente!\\n\\nVuoi confermare?"
 
-#: ../../mod/admin.php:853
+#: ../../mod/admin.php:865
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "Censura modificata per %s canale"
 msgstr[1] "Censura modificata per %s canali"
 
-#: ../../mod/admin.php:862
+#: ../../mod/admin.php:874
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "%s canale permette/non permette codice nei contenuti"
 msgstr[1] "%s canali permettono/non permettono codice nei contenuti"
 
-#: ../../mod/admin.php:869
+#: ../../mod/admin.php:881
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s canale è stato rimosso"
 msgstr[1] "%s canali sono stati rimossi"
 
-#: ../../mod/admin.php:889
+#: ../../mod/admin.php:901
 msgid "Channel not found"
 msgstr "Canale non trovato"
 
-#: ../../mod/admin.php:900
+#: ../../mod/admin.php:912
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Il canale '%s' è stato rimosso"
 
-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:924
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Applicata una censura al canale '%s'"
 
-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:924
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Rimossa la censura dal canale '%s'"
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:935
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Il canale '%s' permette codice nei contenuti"
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:935
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Il canale '%s' non permette codice nei contenuti"
 
-#: ../../mod/admin.php:969
+#: ../../mod/admin.php:981
 msgid "Censor"
 msgstr "Applica una censura"
 
-#: ../../mod/admin.php:970
+#: ../../mod/admin.php:982
 msgid "Uncensor"
 msgstr "Rimuovi la censura"
 
-#: ../../mod/admin.php:971
+#: ../../mod/admin.php:983
 msgid "Allow Code"
 msgstr "Permetti codice nei contenuti"
 
-#: ../../mod/admin.php:972
+#: ../../mod/admin.php:984
 msgid "Disallow Code"
 msgstr "Non permettere codice nei contenuti"
 
-#: ../../mod/admin.php:974
+#: ../../mod/admin.php:986
 msgid "UID"
 msgstr "UID"
 
-#: ../../mod/admin.php:976
+#: ../../mod/admin.php:988
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "I canali selezionati saranno rimossi!\\n\\nTutto ciò che è stato pubblicato su questo server tramite questi canali sarà irreversibilmente eliminato!\\n\\nVuoi confermare?"
 
-#: ../../mod/admin.php:977
+#: ../../mod/admin.php:989
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Il canale {0} sarà rimosso!\\n\\nTutto ciò che è stato pubblicato su questo server tramite questo canale sarà irreversibilmente eliminato!\\n\\nVuoi confermare?"
 
-#: ../../mod/admin.php:1017
+#: ../../mod/admin.php:1029
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s non attivo."
 
-#: ../../mod/admin.php:1021
+#: ../../mod/admin.php:1033
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s attivo."
 
-#: ../../mod/admin.php:1031 ../../mod/admin.php:1234
+#: ../../mod/admin.php:1043 ../../mod/admin.php:1246
 msgid "Disable"
 msgstr "Disattiva"
 
-#: ../../mod/admin.php:1034 ../../mod/admin.php:1236
+#: ../../mod/admin.php:1046 ../../mod/admin.php:1248
 msgid "Enable"
 msgstr "Attiva"
 
-#: ../../mod/admin.php:1063 ../../mod/admin.php:1263
+#: ../../mod/admin.php:1075 ../../mod/admin.php:1275
 msgid "Toggle"
 msgstr "Attiva/disattiva"
 
-#: ../../mod/admin.php:1071 ../../mod/admin.php:1273
+#: ../../mod/admin.php:1083 ../../mod/admin.php:1285
 msgid "Author: "
 msgstr "Autore:"
 
-#: ../../mod/admin.php:1072 ../../mod/admin.php:1274
+#: ../../mod/admin.php:1084 ../../mod/admin.php:1286
 msgid "Maintainer: "
 msgstr "Gestore:"
 
-#: ../../mod/admin.php:1199
+#: ../../mod/admin.php:1211
 msgid "No themes found."
 msgstr "Nessun tema trovato."
 
-#: ../../mod/admin.php:1255
+#: ../../mod/admin.php:1267
 msgid "Screenshot"
 msgstr "Istantanea dello schermo"
 
-#: ../../mod/admin.php:1301
+#: ../../mod/admin.php:1313
 msgid "[Experimental]"
 msgstr "[Sperimentale]"
 
-#: ../../mod/admin.php:1302
+#: ../../mod/admin.php:1314
 msgid "[Unsupported]"
 msgstr "[Non supportato]"
 
-#: ../../mod/admin.php:1326
+#: ../../mod/admin.php:1338
 msgid "Log settings updated."
 msgstr "Impostazioni di log aggiornate."
 
-#: ../../mod/admin.php:1383
+#: ../../mod/admin.php:1395
 msgid "Clear"
 msgstr "Pulisci"
 
-#: ../../mod/admin.php:1389
+#: ../../mod/admin.php:1401
 msgid "Debugging"
 msgstr "Debugging"
 
-#: ../../mod/admin.php:1390
+#: ../../mod/admin.php:1402
 msgid "Log file"
 msgstr "File di log"
 
-#: ../../mod/admin.php:1390
+#: ../../mod/admin.php:1402
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr "Deve essere scrivibile dal web server. La posizione è relativa alla cartella dove è installato Hubzilla."
 
-#: ../../mod/admin.php:1391
+#: ../../mod/admin.php:1403
 msgid "Log level"
 msgstr "Livello di log"
 
-#: ../../mod/admin.php:1437
+#: ../../mod/admin.php:1449
 msgid "New Profile Field"
 msgstr "Nuovo campo del profilo"
 
-#: ../../mod/admin.php:1438 ../../mod/admin.php:1458
+#: ../../mod/admin.php:1450 ../../mod/admin.php:1470
 msgid "Field nickname"
 msgstr "Nome breve del campo"
 
-#: ../../mod/admin.php:1438 ../../mod/admin.php:1458
+#: ../../mod/admin.php:1450 ../../mod/admin.php:1470
 msgid "System name of field"
 msgstr "Nome di sistema del campo"
 
-#: ../../mod/admin.php:1439 ../../mod/admin.php:1459
+#: ../../mod/admin.php:1451 ../../mod/admin.php:1471
 msgid "Input type"
 msgstr "Tipo di dati"
 
-#: ../../mod/admin.php:1440 ../../mod/admin.php:1460
+#: ../../mod/admin.php:1452 ../../mod/admin.php:1472
 msgid "Field Name"
 msgstr "Nome del campo"
 
-#: ../../mod/admin.php:1440 ../../mod/admin.php:1460
+#: ../../mod/admin.php:1452 ../../mod/admin.php:1472
 msgid "Label on profile pages"
 msgstr "Etichetta da mostrare sulla pagina del profilo"
 
-#: ../../mod/admin.php:1441 ../../mod/admin.php:1461
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "Help text"
 msgstr "Testo di aiuto"
 
-#: ../../mod/admin.php:1441 ../../mod/admin.php:1461
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "Additional info (optional)"
 msgstr "Informazioni aggiuntive (facoltative)"
 
-#: ../../mod/admin.php:1451
+#: ../../mod/admin.php:1463
 msgid "Field definition not found"
 msgstr "Impossibile trovare la definizione del campo"
 
-#: ../../mod/admin.php:1457
+#: ../../mod/admin.php:1469
 msgid "Edit Profile Field"
 msgstr "Modifica campo del profilo"
 
@@ -8127,7 +8063,7 @@ msgstr "Attiva Firefox Share per $Projectname"
 
 #: ../../mod/settings.php:1115
 msgid "Start calendar week on monday"
-msgstr "La settimana inizia di lunedì"
+msgstr "La settimana inizia il lunedì"
 
 #: ../../mod/webpages.php:191
 msgid "Page Title"
@@ -8253,92 +8189,14 @@ msgstr "Quando possibile, riduci il numero di cloni del tuo canale effettuando i
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Usa questo modulo per abbandonare un canale su un hub che non è più funzionante."
 
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr "Impossibile associare un destinatario."
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr "Impossibile comunicare con il canale richiesto."
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr "Impossibile verificare il canale richiesto."
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito."
-
-#: ../../mod/mail.php:132
-msgid "Messages"
-msgstr "Messaggi"
-
-#: ../../mod/mail.php:167
-msgid "Message recalled."
-msgstr "Messaggio revocato."
-
-#: ../../mod/mail.php:180
-msgid "Conversation removed."
-msgstr "Conversazione rimossa."
-
-#: ../../mod/mail.php:223
-msgid "Requested channel is not in this network"
-msgstr "Il canale cercato non è in questa rete"
-
-#: ../../mod/mail.php:231
-msgid "Send Private Message"
-msgstr "Invia un messaggio privato"
-
-#: ../../mod/mail.php:232 ../../mod/mail.php:361
-msgid "To:"
-msgstr "A:"
-
-#: ../../mod/mail.php:235 ../../mod/mail.php:363
-msgid "Subject:"
-msgstr "Oggetto:"
-
-#: ../../mod/mail.php:238 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr "Il tuo messaggio:"
-
-#: ../../mod/mail.php:242
-msgid "Send"
-msgstr "Invia"
-
-#: ../../mod/mail.php:333
-msgid "Delete message"
-msgstr "Elimina il messaggio"
-
-#: ../../mod/mail.php:334
-msgid "Delivery report"
-msgstr "Rapporto di trasmissione"
-
-#: ../../mod/mail.php:335
-msgid "Recall message"
-msgstr "Revoca il messaggio"
-
-#: ../../mod/mail.php:337
-msgid "Message has been recalled."
-msgstr "Il messaggio è stato revocato."
-
-#: ../../mod/mail.php:354
-msgid "Delete Conversation"
-msgstr "Elimina la conversazione"
-
-#: ../../mod/mail.php:356
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente."
-
-#: ../../mod/mail.php:360
-msgid "Send Reply"
-msgstr "Invia la risposta"
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:61
+msgid "$Projectname"
+msgstr "$Projectname"
 
-#: ../../mod/mail.php:365
+#: ../../mod/home.php:75
 #, php-format
-msgid "Your message for %s (%s):"
-msgstr "Il tuo messaggio per %s (%s):"
+msgid "Welcome to %s"
+msgstr "%s ti dà il benvenuto"
 
 #: ../../mod/regmod.php:11
 msgid "Please login."
@@ -8368,71 +8226,157 @@ msgstr "Permessi insufficienti. Sarà visualizzata la pagina del profilo."
 msgid "Item not available."
 msgstr "Elemento non disponibile."
 
-#: ../../mod/invite.php:25
-msgid "Total invitation limit exceeded."
-msgstr "Hai superato il numero massimo di inviti."
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr "Impossibile ottenere informazioni sul proprietario della pagina."
 
-#: ../../mod/invite.php:49
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s: non è un indirizzo email valido."
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr "Album non trovato."
 
-#: ../../mod/invite.php:76
-msgid "Please join us on $Projectname"
-msgstr "Unisciti a noi su $Projectname"
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr "Elimina album"
 
-#: ../../mod/invite.php:87
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Hai superato il numero massimo di inviti. Contatta l'amministratore se necessario."
+#: ../../mod/photos.php:171 ../../mod/photos.php:1006
+msgid "Delete Photo"
+msgstr "Elimina foto"
+
+#: ../../mod/photos.php:501
+msgid "No photos selected"
+msgstr "Nessuna foto selezionata"
+
+#: ../../mod/photos.php:550
+msgid "Access to this item is restricted."
+msgstr "Questo elemento non è visibile a tutti."
 
-#: ../../mod/invite.php:92
+#: ../../mod/photos.php:589
 #, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s: la consegna del messaggio è fallita."
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile."
 
-#: ../../mod/invite.php:96
+#: ../../mod/photos.php:592
 #, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d messaggio inviato."
-msgstr[1] "%d messaggi inviati."
+msgid "%1$.2f MB photo storage used."
+msgstr "Hai usato %1$.2f Mb del tuo spazio disponibile."
 
-#: ../../mod/invite.php:115
-msgid "You have no more invitations available"
-msgstr "Non hai altri inviti disponibili"
+#: ../../mod/photos.php:620
+msgid "Upload Photos"
+msgstr "Carica foto"
 
-#: ../../mod/invite.php:129
-msgid "Send invitations"
-msgstr "Spedisci inviti"
+#: ../../mod/photos.php:624
+msgid "Enter an album name"
+msgstr "Scegli il nome dell'album"
 
-#: ../../mod/invite.php:130
-msgid "Enter email addresses, one per line:"
-msgstr "Inserisci gli indirizzi email, uno per riga:"
+#: ../../mod/photos.php:625
+msgid "or select an existing album (doubleclick)"
+msgstr "o seleziona un album esistente (doppio click)"
 
-#: ../../mod/invite.php:132
-msgid "Please join my community on $Projectname."
-msgstr "Entra nella mia comunità su $Projectname."
+#: ../../mod/photos.php:626
+msgid "Create a status post for this upload"
+msgstr "Pubblica sulla bacheca"
 
-#: ../../mod/invite.php:134
-msgid "You will need to supply this invitation code: "
-msgstr "Dovrai fornire questo codice di invito:"
+#: ../../mod/photos.php:627
+msgid "Caption (optional):"
+msgstr "Titolo (facoltativo):"
 
-#: ../../mod/invite.php:135
-msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Registrati su qualsiasi server $Projectname (sono tutti interconnessi)"
+#: ../../mod/photos.php:628
+msgid "Description (optional):"
+msgstr "Descrizione (facoltativa):"
 
-#: ../../mod/invite.php:137
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Inserisci il mio indirizzo $Projectname nel riquadro di ricerca del sito."
+#: ../../mod/photos.php:655
+msgid "Album name could not be decoded"
+msgstr "Non è stato possibile leggere il nome dell'album"
 
-#: ../../mod/invite.php:138
-msgid "or visit "
-msgstr "oppure visita "
+#: ../../mod/photos.php:699 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1250
+msgid "Contact Photos"
+msgstr "Foto dei contatti"
 
-#: ../../mod/invite.php:140
-msgid "3. Click [Connect]"
-msgstr "3. Clicca su [Aggiungi]"
+#: ../../mod/photos.php:722
+msgid "Show Newest First"
+msgstr "Prima i più recenti"
+
+#: ../../mod/photos.php:724
+msgid "Show Oldest First"
+msgstr "Prima i più vecchi"
+
+#: ../../mod/photos.php:824
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permesso negato. L'accesso a questo elemento può essere stato limitato."
+
+#: ../../mod/photos.php:826
+msgid "Photo not available"
+msgstr "Foto non disponibile"
+
+#: ../../mod/photos.php:884
+msgid "Use as profile photo"
+msgstr "Usa come foto del profilo"
+
+#: ../../mod/photos.php:891
+msgid "Private Photo"
+msgstr "Foto privata"
+
+#: ../../mod/photos.php:902 ../../mod/events.php:652 ../../mod/events.php:659
+msgid "Previous"
+msgstr "Precendente"
+
+#: ../../mod/photos.php:906
+msgid "View Full Size"
+msgstr "Vedi nelle dimensioni originali"
+
+#: ../../mod/photos.php:985
+msgid "Edit photo"
+msgstr "Modifica la foto"
+
+#: ../../mod/photos.php:987
+msgid "Rotate CW (right)"
+msgstr "Ruota (senso orario)"
+
+#: ../../mod/photos.php:988
+msgid "Rotate CCW (left)"
+msgstr "Ruota (senso antiorario)"
+
+#: ../../mod/photos.php:991
+msgid "Enter a new album name"
+msgstr "Inserisci il nome del nuovo album"
+
+#: ../../mod/photos.php:992
+msgid "or select an existing one (doubleclick)"
+msgstr "o seleziona uno esistente (doppio click)"
+
+#: ../../mod/photos.php:995
+msgid "Caption"
+msgstr "Didascalia"
+
+#: ../../mod/photos.php:997
+msgid "Add a Tag"
+msgstr "Aggiungi tag"
+
+#: ../../mod/photos.php:1001
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Esempio: @bob, @Barbara_Jensen, @jim@example.com"
+
+#: ../../mod/photos.php:1004
+msgid "Flag as adult in album view"
+msgstr "Marca come 'per adulti'"
+
+#: ../../mod/photos.php:1196
+msgid "In This Photo:"
+msgstr "In questa foto:"
+
+#: ../../mod/photos.php:1201
+msgid "Map"
+msgstr "Mappa"
+
+#: ../../mod/photos.php:1289
+msgid "View Album"
+msgstr "Guarda l'album"
+
+#: ../../mod/photos.php:1300 ../../mod/photos.php:1313
+#: ../../mod/photos.php:1314
+msgid "Recent Photos"
+msgstr "Foto recenti"
 
 #: ../../mod/lockview.php:37
 msgid "Remote privacy information not available."
@@ -8583,6 +8527,16 @@ msgstr "Scadenza dei messaggi della chat (minuti)"
 msgid "%1$s's Chatrooms"
 msgstr "Le chat di %1$s"
 
+#: ../../mod/search.php:212
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Elementi taggati con: %s"
+
+#: ../../mod/search.php:214
+#, php-format
+msgid "Search results for: %s"
+msgstr "Risultati ricerca: %s"
+
 #: ../../mod/viewsrc.php:40
 msgid "Source of Item"
 msgstr "Sorgente"
@@ -8676,22 +8630,6 @@ msgstr "Cerca tra i contatti"
 msgid "Finding: "
 msgstr "Ricerca: "
 
-#: ../../mod/help.php:147
-msgid "Documentation Search"
-msgstr "Ricerca nella guida"
-
-#: ../../mod/help.php:184 ../../mod/help.php:190 ../../mod/help.php:196
-msgid "Help:"
-msgstr "Guida:"
-
-#: ../../mod/help.php:211 ../../index.php:238
-msgid "Not Found"
-msgstr "Non disponibile"
-
-#: ../../mod/help.php:235
-msgid "$Projectname Documentation"
-msgstr "Guida di $Projectname"
-
 #: ../../mod/manage.php:130
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
@@ -8823,72 +8761,165 @@ msgstr "Titolo del menù come comparirà a tutti"
 msgid "Allow bookmarks"
 msgstr "Permetti l'invio di segnalibri"
 
-#: ../../mod/post.php:234
+#: ../../mod/mail.php:34
+msgid "Unable to lookup recipient."
+msgstr "Impossibile associare un destinatario."
+
+#: ../../mod/mail.php:42
+msgid "Unable to communicate with requested channel."
+msgstr "Impossibile comunicare con il canale richiesto."
+
+#: ../../mod/mail.php:49
+msgid "Cannot verify requested channel."
+msgstr "Impossibile verificare il canale richiesto."
+
+#: ../../mod/mail.php:75
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito."
+
+#: ../../mod/mail.php:140
+msgid "Messages"
+msgstr "Messaggi"
+
+#: ../../mod/mail.php:175
+msgid "Message recalled."
+msgstr "Messaggio revocato."
+
+#: ../../mod/mail.php:188
+msgid "Conversation removed."
+msgstr "Conversazione rimossa."
+
+#: ../../mod/mail.php:231
+msgid "Requested channel is not in this network"
+msgstr "Il canale cercato non è in questa rete"
+
+#: ../../mod/mail.php:239
+msgid "Send Private Message"
+msgstr "Invia un messaggio privato"
+
+#: ../../mod/mail.php:240 ../../mod/mail.php:370
+msgid "To:"
+msgstr "A:"
+
+#: ../../mod/mail.php:243 ../../mod/mail.php:372
+msgid "Subject:"
+msgstr "Oggetto:"
+
+#: ../../mod/mail.php:250
+msgid "Send"
+msgstr "Invia"
+
+#: ../../mod/mail.php:342
+msgid "Delete message"
+msgstr "Elimina il messaggio"
+
+#: ../../mod/mail.php:343
+msgid "Delivery report"
+msgstr "Rapporto di trasmissione"
+
+#: ../../mod/mail.php:344
+msgid "Recall message"
+msgstr "Revoca il messaggio"
+
+#: ../../mod/mail.php:346
+msgid "Message has been recalled."
+msgstr "Il messaggio è stato revocato."
+
+#: ../../mod/mail.php:363
+msgid "Delete Conversation"
+msgstr "Elimina la conversazione"
+
+#: ../../mod/mail.php:365
 msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "L'autenticazione tramite il tuo hub non è disponibile. Puoi provare a disconnetterti per tentare di nuovo."
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente."
+
+#: ../../mod/mail.php:369
+msgid "Send Reply"
+msgstr "Invia la risposta"
+
+#: ../../mod/mail.php:374
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Il tuo messaggio per %s (%s):"
+
+#: ../../mod/help.php:148
+msgid "Documentation Search"
+msgstr "Ricerca nella guida"
+
+#: ../../mod/help.php:186 ../../mod/help.php:192 ../../mod/help.php:198
+msgid "Help:"
+msgstr "Guida:"
+
+#: ../../mod/help.php:213 ../../index.php:238
+msgid "Not Found"
+msgstr "Non disponibile"
+
+#: ../../mod/help.php:237
+msgid "$Projectname Documentation"
+msgstr "Guida di $Projectname"
 
 #: ../../mod/service_limits.php:19
 msgid "No service class restrictions found."
 msgstr "Non esistono restrizioni su questa classe di account."
 
-#: ../../mod/siteinfo.php:111
+#: ../../mod/siteinfo.php:15
 #, php-format
 msgid "Version %s"
 msgstr "Versione %s"
 
-#: ../../mod/siteinfo.php:132
+#: ../../mod/siteinfo.php:36
 msgid "Installed plugins/addons/apps:"
 msgstr "App e componenti installati:"
 
-#: ../../mod/siteinfo.php:145
+#: ../../mod/siteinfo.php:49
 msgid "No installed plugins/addons/apps"
 msgstr "Nessuna app o componente installato"
 
-#: ../../mod/siteinfo.php:158
+#: ../../mod/siteinfo.php:62
 msgid ""
 "This is a hub of $Projectname - a global cooperative network of "
 "decentralized privacy enhanced websites."
 msgstr "Questo è un hub di $Projectname - una rete cooperativa e decentralizzata di siti ad elevata privacy. "
 
-#: ../../mod/siteinfo.php:160
+#: ../../mod/siteinfo.php:64
 msgid "Tag: "
 msgstr "Tag: "
 
-#: ../../mod/siteinfo.php:162
+#: ../../mod/siteinfo.php:66
 msgid "Last background fetch: "
 msgstr "Ultima acquisizione:"
 
-#: ../../mod/siteinfo.php:164
+#: ../../mod/siteinfo.php:68
 msgid "Current load average: "
 msgstr "Carico medio attuale:"
 
-#: ../../mod/siteinfo.php:167
+#: ../../mod/siteinfo.php:71
 msgid "Running at web location"
 msgstr "In esecuzione sull'indirizzo web"
 
-#: ../../mod/siteinfo.php:168
+#: ../../mod/siteinfo.php:72
 msgid ""
 "Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
 "about $Projectname."
 msgstr "Visita <a href=\"http://hubzilla.org\">hubzilla.org</a> per maggiori informazioni su $Projectname."
 
-#: ../../mod/siteinfo.php:169
+#: ../../mod/siteinfo.php:73
 msgid "Bug reports and issues: please visit"
 msgstr "Per segnalare bug e problemi: visita"
 
-#: ../../mod/siteinfo.php:171
+#: ../../mod/siteinfo.php:75
 msgid "$projectname issues"
 msgstr "Problematiche note su $projectname"
 
-#: ../../mod/siteinfo.php:172
+#: ../../mod/siteinfo.php:76
 msgid ""
 "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
 "com"
 msgstr "Per consigli, ringraziamenti, ecc. - scrivi a \"redmatrix\" at librelist - dot com"
 
-#: ../../mod/siteinfo.php:174
+#: ../../mod/siteinfo.php:78
 msgid "Site Administrators"
 msgstr "Amministratori del sito"
 
@@ -8922,77 +8953,105 @@ msgstr "Sono necessari il titolo e l'ora d'inizio dell'evento."
 msgid "Event not found."
 msgstr "Evento non trovato."
 
-#: ../../mod/events.php:452
-msgid "Event Title"
-msgstr "Titolo dell'evento"
+#: ../../mod/events.php:437
+msgid "Edit event titel"
+msgstr "Modifica il titolo dell'evento"
 
-#: ../../mod/events.php:454
+#: ../../mod/events.php:437
+msgid "Event titel"
+msgstr "Titolo evento"
+
+#: ../../mod/events.php:439
 msgid "Categories (comma-separated list)"
 msgstr "Categorie (separate da virgola)"
 
-#: ../../mod/events.php:455
+#: ../../mod/events.php:440
+msgid "Edit Category"
+msgstr "Modifica la categoria"
+
+#: ../../mod/events.php:440
 msgid "Category"
 msgstr "Categoria"
 
-#: ../../mod/events.php:458
+#: ../../mod/events.php:443
+msgid "Edit start date and time"
+msgstr "Modifica data/ora di inizio"
+
+#: ../../mod/events.php:443
 msgid "Start date and time"
 msgstr "Data e ora di inizio"
 
-#: ../../mod/events.php:459 ../../mod/events.php:462
+#: ../../mod/events.php:444 ../../mod/events.php:447
 msgid "Finish date and time are not known or not relevant"
 msgstr "La data e l'ora di inizio non sono necessarie"
 
-#: ../../mod/events.php:461
+#: ../../mod/events.php:446
+msgid "Edit finish date and time"
+msgstr "Modifica data/ora di fine"
+
+#: ../../mod/events.php:446
 msgid "Finish date and time"
 msgstr "Data e ora di fine"
 
-#: ../../mod/events.php:463 ../../mod/events.php:464
+#: ../../mod/events.php:448 ../../mod/events.php:449
 msgid "Adjust for viewer timezone"
 msgstr "Adatta al fuso orario di chi legge"
 
-#: ../../mod/events.php:463
+#: ../../mod/events.php:448
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Importante per eventi che avvengono online ma con un certo fuso orario."
 
-#: ../../mod/events.php:470 ../../mod/events.php:472
+#: ../../mod/events.php:450
+msgid "Edit Description"
+msgstr "Modifica la descrizione"
+
+#: ../../mod/events.php:452
+msgid "Edit Location"
+msgstr "Modifica il luogo"
+
+#: ../../mod/events.php:455 ../../mod/events.php:457
 msgid "Share this event"
 msgstr "Condividi questo evento"
 
-#: ../../mod/events.php:477
+#: ../../mod/events.php:462
 msgid "Advanced Options"
 msgstr "Opzioni avanzate"
 
-#: ../../mod/events.php:589
+#: ../../mod/events.php:574
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../mod/events.php:611
+#: ../../mod/events.php:596
 msgid "Edit event"
 msgstr "Modifica l'evento"
 
-#: ../../mod/events.php:613
+#: ../../mod/events.php:598
 msgid "Delete event"
 msgstr "Elimina l'evento"
 
-#: ../../mod/events.php:647
+#: ../../mod/events.php:632
 msgid "calendar"
 msgstr "calendario"
 
-#: ../../mod/events.php:666
-msgid "New Event"
-msgstr "Nuovo evento"
+#: ../../mod/events.php:651
+msgid "Edit Event"
+msgstr "Modifica l'evento"
+
+#: ../../mod/events.php:651
+msgid "Create Event"
+msgstr "Crea un evento"
 
-#: ../../mod/events.php:676
+#: ../../mod/events.php:661
 msgid "Today"
 msgstr "Oggi"
 
-#: ../../mod/events.php:707
+#: ../../mod/events.php:692
 msgid "Event removed"
 msgstr "Evento eliminato"
 
-#: ../../mod/events.php:710
+#: ../../mod/events.php:695
 msgid "Failed to remove event"
 msgstr "Impossibile eliminare l'evento"
 
@@ -9289,51 +9348,57 @@ msgstr "Dimensione foto dell'autore della conversazione"
 msgid "Set size of followup author photos"
 msgstr "Dimensione foto dei partecipanti alla conversazione"
 
-#: ../../boot.php:1291
+#: ../../Zotlabs/Zot/Auth.php:140
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "L'autenticazione tramite il tuo hub non è disponibile. Puoi provare a disconnetterti per tentare di nuovo."
+
+#: ../../boot.php:1299
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "%s: aggiornamento fallito. Controlla i log di errore."
 
-#: ../../boot.php:1294
+#: ../../boot.php:1302
 #, php-format
 msgid "Update Error at %s"
 msgstr "Errore di aggiornamento su %s"
 
-#: ../../boot.php:1461
+#: ../../boot.php:1469
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Registrati per accedere ai servizi e alle applicazioni di Hubzilla"
 
-#: ../../boot.php:1489
+#: ../../boot.php:1491
 msgid "Password"
 msgstr "Password"
 
-#: ../../boot.php:1490
+#: ../../boot.php:1492
 msgid "Remember me"
 msgstr "Resta connesso"
 
-#: ../../boot.php:1493
+#: ../../boot.php:1495
 msgid "Forgot your password?"
 msgstr "Hai dimenticato la password?"
 
-#: ../../boot.php:2113
+#: ../../boot.php:2115
 msgid "toggle mobile"
 msgstr "attiva/disattiva versione mobile"
 
-#: ../../boot.php:2248
+#: ../../boot.php:2250
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Il certificato SSL del sito non è valido. Si prega di intervenire."
 
-#: ../../boot.php:2251
+#: ../../boot.php:2253
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Errore SSL su %s"
 
-#: ../../boot.php:2288
+#: ../../boot.php:2290
 msgid "Cron/Scheduled tasks not running."
 msgstr "Processi cron non avviati."
 
-#: ../../boot.php:2292
+#: ../../boot.php:2294
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron non è stato eseguito %s"
diff --git a/view/it/hstrings.php b/view/it/hstrings.php
index ff8ee82a5..fcc70dce7 100644
--- a/view/it/hstrings.php
+++ b/view/it/hstrings.php
@@ -19,8 +19,100 @@ $a->strings["Cannot create a duplicate channel identifier on this system. Import
 $a->strings["Unable to create a unique channel address. Import failed."] = "Impossibile creare un indirizzo univoco per il canale. L'import è fallito.";
 $a->strings["Channel clone failed. Import failed."] = "Impossibile clonare il canale. L'importazione è fallita.";
 $a->strings["Cloned channel not found. Import failed."] = "Impossibile trovare il canale clonato. L'importazione è fallita.";
-$a->strings["parent"] = "cartella superiore";
+$a->strings["prev"] = "prec";
+$a->strings["first"] = "inizio";
+$a->strings["last"] = "fine";
+$a->strings["next"] = "succ";
+$a->strings["older"] = "più recenti";
+$a->strings["newer"] = "più nuovi";
+$a->strings["No connections"] = "Nessun contatto";
+$a->strings["%d Connection"] = array(
+	0 => "%d contatto",
+	1 => "%d contatti",
+);
+$a->strings["View Connections"] = "Elenco contatti";
+$a->strings["Search"] = "Cerca";
+$a->strings["Save"] = "Salva";
+$a->strings["poke"] = "poke";
+$a->strings["poked"] = "ha ricevuto un poke";
+$a->strings["ping"] = "ping";
+$a->strings["pinged"] = "ha ricevuto un ping";
+$a->strings["prod"] = "spintone";
+$a->strings["prodded"] = "ha ricevuto uno spintone";
+$a->strings["slap"] = "schiaffo";
+$a->strings["slapped"] = "ha ricevuto uno schiaffo";
+$a->strings["finger"] = "finger";
+$a->strings["fingered"] = "ha ricevuto un finger";
+$a->strings["rebuff"] = "rifiuto";
+$a->strings["rebuffed"] = "ha ricevuto un rifiuto";
+$a->strings["happy"] = "felice";
+$a->strings["sad"] = "triste";
+$a->strings["mellow"] = "calmo";
+$a->strings["tired"] = "stanco";
+$a->strings["perky"] = "vivace";
+$a->strings["angry"] = "arrabbiato";
+$a->strings["stupified"] = "stordito";
+$a->strings["puzzled"] = "confuso";
+$a->strings["interested"] = "attento";
+$a->strings["bitter"] = "amaro";
+$a->strings["cheerful"] = "allegro";
+$a->strings["alive"] = "vivace";
+$a->strings["annoyed"] = "seccato";
+$a->strings["anxious"] = "ansioso";
+$a->strings["cranky"] = "irritabile";
+$a->strings["disturbed"] = "turbato";
+$a->strings["frustrated"] = "frustrato";
+$a->strings["depressed"] = "in depressione";
+$a->strings["motivated"] = "motivato";
+$a->strings["relaxed"] = "rilassato";
+$a->strings["surprised"] = "sorpreso";
+$a->strings["Monday"] = "lunedì";
+$a->strings["Tuesday"] = "martedì";
+$a->strings["Wednesday"] = "mercoledì";
+$a->strings["Thursday"] = "giovedì";
+$a->strings["Friday"] = "venerdì";
+$a->strings["Saturday"] = "sabato";
+$a->strings["Sunday"] = "domenica";
+$a->strings["January"] = "gennaio";
+$a->strings["February"] = "febbraio";
+$a->strings["March"] = "marzo";
+$a->strings["April"] = "aprile";
+$a->strings["May"] = "Mag";
+$a->strings["June"] = "giugno";
+$a->strings["July"] = "luglio";
+$a->strings["August"] = "agosto";
+$a->strings["September"] = "settembre";
+$a->strings["October"] = "ottobre";
+$a->strings["November"] = "novembre";
+$a->strings["December"] = "dicembre";
+$a->strings["Unknown Attachment"] = "Allegato non riconoscuto";
+$a->strings["Size"] = "Dimensione";
+$a->strings["unknown"] = "sconosciuta";
+$a->strings["remove category"] = "rimuovi la categoria";
+$a->strings["remove from file"] = "rimuovi dal file";
+$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
+$a->strings["Starts:"] = "Inizio:";
+$a->strings["Finishes:"] = "Fine:";
+$a->strings["Location:"] = "Luogo:";
+$a->strings["Click to open/close"] = "Clicca per aprire/chiudere";
+$a->strings["Link to Source"] = "Link al sito d'origine";
+$a->strings["default"] = "predefinito";
+$a->strings["Page layout"] = "Layout della pagina";
+$a->strings["You can create your own with the layouts tool"] = "Puoi creare un tuo layout dalla configurazione delle pagine web";
+$a->strings["Page content type"] = "Tipo di contenuto della pagina";
+$a->strings["Select an alternate language"] = "Seleziona una lingua diversa";
+$a->strings["photo"] = "la foto";
+$a->strings["event"] = "l'evento";
+$a->strings["status"] = "il messaggio di stato";
+$a->strings["comment"] = "il commento";
+$a->strings["activity"] = "l'attività";
+$a->strings["Design Tools"] = "Strumenti di design";
+$a->strings["Blocks"] = "Block";
+$a->strings["Menus"] = "Menù";
+$a->strings["Layouts"] = "Layout";
+$a->strings["Pages"] = "Pagine";
 $a->strings["Collection"] = "Cartella";
+$a->strings["parent"] = "cartella superiore";
 $a->strings["Principal"] = "Principale";
 $a->strings["Addressbook"] = "Rubrica";
 $a->strings["Calendar"] = "Calendario";
@@ -34,7 +126,6 @@ $a->strings["Create"] = "Crea";
 $a->strings["Upload"] = "Carica";
 $a->strings["Name"] = "Nome";
 $a->strings["Type"] = "Tipo";
-$a->strings["Size"] = "Dimensione";
 $a->strings["Last Modified"] = "Ultima modifica";
 $a->strings["Edit"] = "Modifica";
 $a->strings["Delete"] = "Elimina";
@@ -81,18 +172,7 @@ $a->strings["about a year"] = "circa un anno";
 $a->strings["%d years"] = "%d anni";
 $a->strings[" "] = " ";
 $a->strings["timeago.numbers"] = "timeago.numbers";
-$a->strings["January"] = "gennaio";
-$a->strings["February"] = "febbraio";
-$a->strings["March"] = "marzo";
-$a->strings["April"] = "aprile";
 $a->strings["__ctx:long__ May"] = "maggio";
-$a->strings["June"] = "giugno";
-$a->strings["July"] = "luglio";
-$a->strings["August"] = "agosto";
-$a->strings["September"] = "settembre";
-$a->strings["October"] = "ottobre";
-$a->strings["November"] = "novembre";
-$a->strings["December"] = "dicembre";
 $a->strings["Jan"] = "Gen";
 $a->strings["Feb"] = "Feb";
 $a->strings["Mar"] = "Mar";
@@ -105,13 +185,6 @@ $a->strings["Sep"] = "Set";
 $a->strings["Oct"] = "Ott";
 $a->strings["Nov"] = "Nov";
 $a->strings["Dec"] = "Dic";
-$a->strings["Sunday"] = "domenica";
-$a->strings["Monday"] = "lunedì";
-$a->strings["Tuesday"] = "martedì";
-$a->strings["Wednesday"] = "mercoledì";
-$a->strings["Thursday"] = "giovedì";
-$a->strings["Friday"] = "venerdì";
-$a->strings["Saturday"] = "sabato";
 $a->strings["Sun"] = "Dom";
 $a->strings["Mon"] = "Lun";
 $a->strings["Tue"] = "Mar";
@@ -143,23 +216,7 @@ $a->strings["Collection is empty."] = "L'insieme di canali è vuoto.";
 $a->strings["Collection: %s"] = "Insieme: %s";
 $a->strings["Connection: %s"] = "Contatto: %s";
 $a->strings["Connection not found."] = "Contatto non trovato.";
-$a->strings["No recipient provided."] = "Devi scegliere un destinatario.";
-$a->strings["[no subject]"] = "[nessun titolo]";
-$a->strings["Unable to determine sender."] = "Impossibile determinare il mittente.";
-$a->strings["Stored post could not be verified."] = "Non è stato possibile verificare il post.";
-$a->strings["view full size"] = "guarda nelle dimensioni reali";
-$a->strings["\$Projectname Notification"] = "Notifica \$Projectname";
-$a->strings["\$projectname"] = "\$projectname";
-$a->strings["Thank You,"] = "Grazie,";
-$a->strings["%s Administrator"] = "L'amministratore di %s";
-$a->strings["Administrator"] = "Amministratore";
-$a->strings["No Subject"] = "Nessun titolo";
-$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
-$a->strings["Starts:"] = "Inizio:";
-$a->strings["Finishes:"] = "Fine:";
-$a->strings["Location:"] = "Luogo:";
 $a->strings["This event has been added to your calendar."] = "Questo evento è stato aggiunto al tuo calendario";
-$a->strings["event"] = "l'evento";
 $a->strings["Not specified"] = "Non specificato";
 $a->strings["Needs Action"] = "Necessita di un intervento";
 $a->strings["Completed"] = "Completato";
@@ -239,6 +296,14 @@ $a->strings["like"] = "mi piace";
 $a->strings["likes"] = "gli piace";
 $a->strings["dislike"] = "non mi piace";
 $a->strings["dislikes"] = "non gli piace";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "L'immagine supera il limite massimo di %lu bytes";
+$a->strings["Image file is empty."] = "Il file dell'immagine è vuoto.";
+$a->strings["Unable to process image"] = "Impossibile elaborare l'immagine";
+$a->strings["Photo storage failed."] = "Impossibile salvare la foto.";
+$a->strings["a new photo"] = "una nuova foto";
+$a->strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha pubblicato %2\$s su %3\$s";
+$a->strings["Photo Albums"] = "Album foto";
+$a->strings["Upload New Photos"] = "Carica nuove foto";
 $a->strings["Visible to your default audience"] = "Visibile secondo le impostazioni predefinite";
 $a->strings["Show"] = "Mostra";
 $a->strings["Don't show"] = "Non mostrare";
@@ -265,8 +330,6 @@ $a->strings["Path not found."] = "Percorso del file non trovato.";
 $a->strings["mkdir failed."] = "mkdir fallito.";
 $a->strings["database storage failed."] = "scrittura su database fallita.";
 $a->strings["Empty path"] = "La posizione è vuota";
-$a->strings["Attachments:"] = "Allegati:";
-$a->strings["\$Projectname event notification:"] = "Notifica evento \$Projectname:";
 $a->strings["created a new post"] = "Ha creato un nuovo post";
 $a->strings["commented on %s's post"] = "ha commentato il post di %s";
 $a->strings["Apps"] = "App";
@@ -282,7 +345,6 @@ $a->strings["Add New Connection"] = "Aggiungi un contatto";
 $a->strings["Enter the channel address"] = "Scrivi l'indirizzo del canale";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Per esempio: mario@pippo.it oppure http://pluto.com/barbara";
 $a->strings["Notes"] = "Note";
-$a->strings["Save"] = "Salva";
 $a->strings["Remove term"] = "Rimuovi termine";
 $a->strings["Saved Searches"] = "Ricerche salvate";
 $a->strings["add"] = "aggiungi";
@@ -321,6 +383,9 @@ $a->strings["Week View"] = "Eventi della settimana";
 $a->strings["Month View"] = "Eventi del mese";
 $a->strings["Export"] = "Esporta";
 $a->strings["Import"] = "Importa";
+$a->strings["Events Tools"] = "Gestione eventi";
+$a->strings["Export Calendar"] = "Esporta calendario";
+$a->strings["Import Calendar"] = "Importa calendario";
 $a->strings["Chat Rooms"] = "Chat";
 $a->strings["Bookmarked Chatrooms"] = "Chat nei segnalibri";
 $a->strings["Suggested Chatrooms"] = "Chat suggerite";
@@ -349,6 +414,8 @@ $a->strings["Plugin Features"] = "Plugin";
 $a->strings["User registrations waiting for confirmation"] = "Registrazioni in attesa";
 $a->strings["View Photo"] = "Guarda la foto";
 $a->strings["Edit Album"] = "Modifica album";
+$a->strings["Attachments:"] = "Allegati:";
+$a->strings["\$Projectname event notification:"] = "Notifica evento \$Projectname:";
 $a->strings["%1\$s's bookmarks"] = "I segnalibri di %1\$s";
 $a->strings["General Features"] = "Funzionalità di base";
 $a->strings["Content Expiration"] = "Scadenza";
@@ -493,15 +560,11 @@ $a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d
 $a->strings["%1\$s's birthday"] = "Compleanno di %1\$s";
 $a->strings["Happy Birthday %1\$s"] = "Buon compleanno %1\$s";
 $a->strings["Public Timeline"] = "Diario pubblico";
-$a->strings["photo"] = "la foto";
 $a->strings["channel"] = "il canale";
-$a->strings["status"] = "il messaggio di stato";
-$a->strings["comment"] = "il commento";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s";
 $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s adesso è connesso con %2\$s";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s ha mandato un poke a %2\$s";
-$a->strings["poked"] = "ha ricevuto un poke";
 $a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s è %2\$s";
 $a->strings["__ctx:title__ Likes"] = "Mi piace";
 $a->strings["__ctx:title__ Dislikes"] = "Non mi piace";
@@ -614,7 +677,6 @@ $a->strings["Status Messages and Posts"] = "Post e messaggi di stato";
 $a->strings["About"] = "Informazioni";
 $a->strings["Profile Details"] = "Dettagli del profilo";
 $a->strings["Photos"] = "Foto";
-$a->strings["Photo Albums"] = "Album foto";
 $a->strings["Files and Storage"] = "Archivio file";
 $a->strings["Chatrooms"] = "Chat";
 $a->strings["Bookmarks"] = "Segnalibri";
@@ -669,10 +731,6 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
-$a->strings["Invalid data packet"] = "Dati ricevuti non validi";
-$a->strings["Unable to verify channel signature"] = "Impossibile verificare la firma elettronica del canale";
-$a->strings["Unable to verify site signature for %s"] = "Impossibile verificare la firma elettronica del sito %s";
-$a->strings["invalid target signature"] = "la firma ricevuta non è valida";
 $a->strings["Image/photo"] = "Immagine";
 $a->strings["Encrypted content"] = "Contenuto cifrato";
 $a->strings["Install %s element: "] = "Installa l'elemento %s:";
@@ -705,12 +763,10 @@ $a->strings["%d connection in common"] = array(
 	1 => "%d contatti in comune",
 );
 $a->strings["show more"] = "mostra tutto";
-$a->strings["Directory Options"] = "Visibilità negli elenchi pubblici";
-$a->strings["Safe Mode"] = "Modalità SafeSearch";
-$a->strings["No"] = "No";
-$a->strings["Yes"] = "Si";
-$a->strings["Public Forums Only"] = "Solo forum pubblici";
-$a->strings["This Website Only"] = "Solo in questo sito";
+$a->strings["\$Projectname Notification"] = "Notifica \$Projectname";
+$a->strings["\$projectname"] = "\$projectname";
+$a->strings["Thank You,"] = "Grazie,";
+$a->strings["%s Administrator"] = "L'amministratore di %s";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla] Nuovo messaggio su %s";
 $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s  ti ha mandato un messaggio privato su %3\$s.";
@@ -757,6 +813,10 @@ $a->strings["local account not found."] = "l'account locale non è stato trovato
 $a->strings["Cannot connect to yourself."] = "Non puoi connetterti a te stesso.";
 $a->strings["Embedded content"] = "Contenuti incorporati";
 $a->strings["Embedding disabled"] = "Disabilita la creazione di contenuti incorporati";
+$a->strings["No recipient provided."] = "Devi scegliere un destinatario.";
+$a->strings["[no subject]"] = "[nessun titolo]";
+$a->strings["Unable to determine sender."] = "Impossibile determinare il mittente.";
+$a->strings["Stored post could not be verified."] = "Non è stato possibile verificare il post.";
 $a->strings["Logout"] = "Esci";
 $a->strings["End this session"] = "Chiudi questa sessione";
 $a->strings["Home"] = "Bacheca";
@@ -782,7 +842,6 @@ $a->strings["Create an account"] = "Crea un account";
 $a->strings["Help"] = "Guida";
 $a->strings["Help and documentation"] = "Guida e documentazione";
 $a->strings["Applications, utilities, links, games"] = "Applicazioni, utilità, link, giochi";
-$a->strings["Search"] = "Cerca";
 $a->strings["Search site @name, #tag, ?docs, content"] = "Cerca nel sito per @nome, #tag, ?guida o per contenuto";
 $a->strings["Directory"] = "Elenchi pubblici dei canali";
 $a->strings["Channel Directory"] = "Elenchi pubblici dei canali";
@@ -812,68 +871,12 @@ $a->strings["Site Setup and Configuration"] = "Installazione e configurazione de
 $a->strings["@name, #tag, ?doc, content"] = "@nome, #tag, ?guida, contenuto";
 $a->strings["Please wait..."] = "Attendere...";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "I controlli di sicurezza sono falliti. Probabilmente è accaduto perché la pagina è stata tenuta aperta troppo a lungo (ore?) prima di inviare il contenuto.";
-$a->strings["prev"] = "prec";
-$a->strings["first"] = "inizio";
-$a->strings["last"] = "fine";
-$a->strings["next"] = "succ";
-$a->strings["older"] = "più recenti";
-$a->strings["newer"] = "più nuovi";
-$a->strings["No connections"] = "Nessun contatto";
-$a->strings["%d Connection"] = array(
-	0 => "%d contatto",
-	1 => "%d contatti",
-);
-$a->strings["View Connections"] = "Elenco contatti";
-$a->strings["poke"] = "poke";
-$a->strings["ping"] = "ping";
-$a->strings["pinged"] = "ha ricevuto un ping";
-$a->strings["prod"] = "spintone";
-$a->strings["prodded"] = "ha ricevuto uno spintone";
-$a->strings["slap"] = "schiaffo";
-$a->strings["slapped"] = "ha ricevuto uno schiaffo";
-$a->strings["finger"] = "finger";
-$a->strings["fingered"] = "ha ricevuto un finger";
-$a->strings["rebuff"] = "rifiuto";
-$a->strings["rebuffed"] = "ha ricevuto un rifiuto";
-$a->strings["happy"] = "felice";
-$a->strings["sad"] = "triste";
-$a->strings["mellow"] = "calmo";
-$a->strings["tired"] = "stanco";
-$a->strings["perky"] = "vivace";
-$a->strings["angry"] = "arrabbiato";
-$a->strings["stupified"] = "stordito";
-$a->strings["puzzled"] = "confuso";
-$a->strings["interested"] = "attento";
-$a->strings["bitter"] = "amaro";
-$a->strings["cheerful"] = "allegro";
-$a->strings["alive"] = "vivace";
-$a->strings["annoyed"] = "seccato";
-$a->strings["anxious"] = "ansioso";
-$a->strings["cranky"] = "irritabile";
-$a->strings["disturbed"] = "turbato";
-$a->strings["frustrated"] = "frustrato";
-$a->strings["depressed"] = "in depressione";
-$a->strings["motivated"] = "motivato";
-$a->strings["relaxed"] = "rilassato";
-$a->strings["surprised"] = "sorpreso";
-$a->strings["May"] = "Mag";
-$a->strings["Unknown Attachment"] = "Allegato non riconoscuto";
-$a->strings["unknown"] = "sconosciuta";
-$a->strings["remove category"] = "rimuovi la categoria";
-$a->strings["remove from file"] = "rimuovi dal file";
-$a->strings["Click to open/close"] = "Clicca per aprire/chiudere";
-$a->strings["Link to Source"] = "Link al sito d'origine";
-$a->strings["default"] = "predefinito";
-$a->strings["Page layout"] = "Layout della pagina";
-$a->strings["You can create your own with the layouts tool"] = "Puoi creare un tuo layout dalla configurazione delle pagine web";
-$a->strings["Page content type"] = "Tipo di contenuto della pagina";
-$a->strings["Select an alternate language"] = "Seleziona una lingua diversa";
-$a->strings["activity"] = "l'attività";
-$a->strings["Design Tools"] = "Strumenti di design";
-$a->strings["Blocks"] = "Block";
-$a->strings["Menus"] = "Menù";
-$a->strings["Layouts"] = "Layout";
-$a->strings["Pages"] = "Pagine";
+$a->strings["Directory Options"] = "Visibilità negli elenchi pubblici";
+$a->strings["Safe Mode"] = "Modalità SafeSearch";
+$a->strings["No"] = "No";
+$a->strings["Yes"] = "Sì";
+$a->strings["Public Forums Only"] = "Solo forum pubblici";
+$a->strings["This Website Only"] = "Solo in questo sito";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "È stato ripristinato un insieme con lo stesso nome che era stato eliminato in precedenza. I permessi già presenti <strong>potrebbero</strong> rimanere validi per i nuovi canali. Se non vuoi che ciò accada, devi creare un altro insieme con un nome diverso.";
 $a->strings["Add new connections to this collection (privacy group)"] = "Aggiungi altri contatti a questo insieme (privacy di gruppo)";
 $a->strings["All Channels"] = "Tutti i canali";
@@ -882,6 +885,10 @@ $a->strings["Collections"] = "Insiemi di canali";
 $a->strings["Edit collection"] = "Modifica l'insieme di canali";
 $a->strings["Add new collection"] = "Nuovo insieme";
 $a->strings["Channels not in any collection"] = "Canali che non sono in un insieme";
+$a->strings["Invalid data packet"] = "Dati ricevuti non validi";
+$a->strings["Unable to verify channel signature"] = "Impossibile verificare la firma elettronica del canale";
+$a->strings["Unable to verify site signature for %s"] = "Impossibile verificare la firma elettronica del sito %s";
+$a->strings["invalid target signature"] = "la firma ricevuta non è valida";
 $a->strings["New Page"] = "Nuova pagina web";
 $a->strings["View"] = "Guarda";
 $a->strings["Actions"] = "Azioni";
@@ -889,12 +896,10 @@ $a->strings["Page Link"] = "Link alla pagina";
 $a->strings["Title"] = "Titolo";
 $a->strings["Created"] = "Creato";
 $a->strings["Edited"] = "Modificato";
+$a->strings["view full size"] = "guarda nelle dimensioni reali";
+$a->strings["Administrator"] = "Amministratore";
+$a->strings["No Subject"] = "Nessun titolo";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'";
-$a->strings["Image exceeds website size limit of %lu bytes"] = "L'immagine supera il limite massimo di %lu bytes";
-$a->strings["Image file is empty."] = "Il file dell'immagine è vuoto.";
-$a->strings["Unable to process image"] = "Impossibile elaborare l'immagine";
-$a->strings["Photo storage failed."] = "Impossibile salvare la foto.";
-$a->strings["Upload New Photos"] = "Carica nuove foto";
 $a->strings["Save to Folder"] = "Salva nella cartella";
 $a->strings["I will attend"] = "Parteciperò";
 $a->strings["I will not attend"] = "Non parteciperò";
@@ -930,23 +935,6 @@ $a->strings["This is you"] = "Questo sei tu";
 $a->strings["Image"] = "Immagine";
 $a->strings["Insert Link"] = "Collegamento";
 $a->strings["Video"] = "Video";
-$a->strings["Not a valid email address"] = "Email non valida";
-$a->strings["Your email domain is not among those allowed on this site"] = "Il dominio della tua email attualmente non è permesso su questo sito";
-$a->strings["Your email address is already registered at this site."] = "La tua email è già registrata su questo sito.";
-$a->strings["An invitation is required."] = "È necessario un invito.";
-$a->strings["Invitation could not be verified."] = "L'invito non può essere verificato.";
-$a->strings["Please enter the required information."] = "Inserisci le informazioni richieste.";
-$a->strings["Failed to store account information."] = "Non è stato possibile salvare le informazioni del tuo account.";
-$a->strings["Registration confirmation for %s"] = "Registrazione di %s confermata";
-$a->strings["Registration request at %s"] = "Richiesta di registrazione su %s";
-$a->strings["your registration password"] = "la password di registrazione";
-$a->strings["Registration details for %s"] = "Dettagli della registrazione di %s";
-$a->strings["Account approved."] = "Account approvato.";
-$a->strings["Registration revoked for %s"] = "Registrazione revocata per %s";
-$a->strings["Account verified. Please login."] = "Registrazione verificata. Adesso puoi effettuare login.";
-$a->strings["Click here to upgrade."] = "Clicca qui per aggiornare.";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione supera i limiti del tuo abbonamento.";
-$a->strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento.";
 $a->strings["Site Admin"] = "Amministrazione sito";
 $a->strings["Address Book"] = "Rubrica";
 $a->strings["Mood"] = "Umore";
@@ -992,6 +980,23 @@ $a->strings["Celebrity/Soapbox"] = "Pagina per fan";
 $a->strings["Group Repository"] = "Repository di gruppo";
 $a->strings["Custom/Expert Mode"] = "Personalizzazione per esperti";
 $a->strings["Profile Photos"] = "Foto del profilo";
+$a->strings["Not a valid email address"] = "Email non valida";
+$a->strings["Your email domain is not among those allowed on this site"] = "Il dominio della tua email attualmente non è permesso su questo sito";
+$a->strings["Your email address is already registered at this site."] = "La tua email è già registrata su questo sito.";
+$a->strings["An invitation is required."] = "È necessario un invito.";
+$a->strings["Invitation could not be verified."] = "L'invito non può essere verificato.";
+$a->strings["Please enter the required information."] = "Inserisci le informazioni richieste.";
+$a->strings["Failed to store account information."] = "Non è stato possibile salvare le informazioni del tuo account.";
+$a->strings["Registration confirmation for %s"] = "Registrazione di %s confermata";
+$a->strings["Registration request at %s"] = "Richiesta di registrazione su %s";
+$a->strings["your registration password"] = "la password di registrazione";
+$a->strings["Registration details for %s"] = "Dettagli della registrazione di %s";
+$a->strings["Account approved."] = "Account approvato.";
+$a->strings["Registration revoked for %s"] = "Registrazione revocata per %s";
+$a->strings["Account verified. Please login."] = "Registrazione verificata. Adesso puoi effettuare login.";
+$a->strings["Click here to upgrade."] = "Clicca qui per aggiornare.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione supera i limiti del tuo abbonamento.";
+$a->strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento.";
 $a->strings["Permission Denied."] = "Permesso negato.";
 $a->strings["File not found."] = "File non trovato.";
 $a->strings["Edit file permissions"] = "Modifica i permessi del file";
@@ -1211,8 +1216,6 @@ $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for t
 $a->strings["Bookmark added"] = "Segnalibro aggiunto";
 $a->strings["My Bookmarks"] = "I miei segnalibri";
 $a->strings["My Connections Bookmarks"] = "I segnalibri dei miei contatti";
-$a->strings["\$Projectname"] = "\$Projectname";
-$a->strings["Welcome to %s"] = "%s ti dà il benvenuto";
 $a->strings["This setting requires special processing and editing has been blocked."] = "Questa impostazione è bloccata, richiede criteri di modifica speciali";
 $a->strings["Configuration Editor"] = "Editor di configurazione";
 $a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Attenzione: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare.";
@@ -1284,8 +1287,6 @@ $a->strings["Age: "] = "Età:";
 $a->strings["Edit/Manage Profiles"] = "Modifica/gestisci i profili";
 $a->strings["Add profile things"] = "Aggiungi oggetti al profilo";
 $a->strings["Include desirable objects in your profile"] = "Aggiungi oggetti interessanti al tuo profilo";
-$a->strings["Items tagged with: %s"] = "Elementi taggati con: %s";
-$a->strings["Search results for: %s"] = "Risultati ricerca: %s";
 $a->strings["Could not access contact record."] = "Non è possibile accedere alle informazioni sul contatto.";
 $a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato.";
 $a->strings["Connection updated."] = "Contatto aggiornato.";
@@ -1474,43 +1475,25 @@ $a->strings["For either option, please choose whether to make this hub your new
 $a->strings["Make this hub my primary location"] = "Rendi questo hub il mio indirizzo primario";
 $a->strings["Import existing posts if possible (experimental - limited by available memory"] = "Importa i contenuti pubblicati, se possibile (sperimentale)";
 $a->strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Questa funzione potrebbe impiegare molto tempo a terminare. Per favore lanciala *una volta sola* e resta su questa pagina finché non avrà finito.";
-$a->strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina.";
-$a->strings["Album not found."] = "Album non trovato.";
-$a->strings["Delete Album"] = "Elimina album";
-$a->strings["Delete Photo"] = "Elimina foto";
-$a->strings["No photos selected"] = "Nessuna foto selezionata";
-$a->strings["Access to this item is restricted."] = "Questo elemento non è visibile a tutti.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile.";
-$a->strings["%1$.2f MB photo storage used."] = "Hai usato %1$.2f Mb del tuo spazio disponibile.";
-$a->strings["Upload Photos"] = "Carica foto";
-$a->strings["Enter an album name"] = "Scegli il nome dell'album";
-$a->strings["or select an existing album (doubleclick)"] = "o seleziona un album esistente (doppio click)";
-$a->strings["Create a status post for this upload"] = "Pubblica sulla bacheca";
-$a->strings["Caption (optional):"] = "Titolo (facoltativo):";
-$a->strings["Description (optional):"] = "Descrizione (facoltativa):";
-$a->strings["Album name could not be decoded"] = "Non è stato possibile leggere il nome dell'album";
-$a->strings["Contact Photos"] = "Foto dei contatti";
-$a->strings["Show Newest First"] = "Prima i più recenti";
-$a->strings["Show Oldest First"] = "Prima i più vecchi";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Permesso negato. L'accesso a questo elemento può essere stato limitato.";
-$a->strings["Photo not available"] = "Foto non disponibile";
-$a->strings["Use as profile photo"] = "Usa come foto del profilo";
-$a->strings["Private Photo"] = "Foto privata";
-$a->strings["Previous"] = "Precendente";
-$a->strings["View Full Size"] = "Vedi nelle dimensioni originali";
-$a->strings["Edit photo"] = "Modifica la foto";
-$a->strings["Rotate CW (right)"] = "Ruota (senso orario)";
-$a->strings["Rotate CCW (left)"] = "Ruota (senso antiorario)";
-$a->strings["Enter a new album name"] = "Inserisci il nome del nuovo album";
-$a->strings["or select an existing one (doubleclick)"] = "o seleziona uno esistente (doppio click)";
-$a->strings["Caption"] = "Didascalia";
-$a->strings["Add a Tag"] = "Aggiungi tag";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Esempio: @bob, @Barbara_Jensen, @jim@example.com";
-$a->strings["Flag as adult in album view"] = "Marca come 'per adulti'";
-$a->strings["In This Photo:"] = "In questa foto:";
-$a->strings["Map"] = "Mappa";
-$a->strings["View Album"] = "Guarda l'album";
-$a->strings["Recent Photos"] = "Foto recenti";
+$a->strings["Total invitation limit exceeded."] = "Hai superato il numero massimo di inviti.";
+$a->strings["%s : Not a valid email address."] = "%s: non è un indirizzo email valido.";
+$a->strings["Please join us on \$Projectname"] = "Unisciti a noi su \$Projectname";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Hai superato il numero massimo di inviti. Contatta l'amministratore se necessario.";
+$a->strings["%s : Message delivery failed."] = "%s: la consegna del messaggio è fallita.";
+$a->strings["%d message sent."] = array(
+	0 => "%d messaggio inviato.",
+	1 => "%d messaggi inviati.",
+);
+$a->strings["You have no more invitations available"] = "Non hai altri inviti disponibili";
+$a->strings["Send invitations"] = "Spedisci inviti";
+$a->strings["Enter email addresses, one per line:"] = "Inserisci gli indirizzi email, uno per riga:";
+$a->strings["Your message:"] = "Il tuo messaggio:";
+$a->strings["Please join my community on \$Projectname."] = "Entra nella mia comunità su \$Projectname.";
+$a->strings["You will need to supply this invitation code: "] = "Dovrai fornire questo codice di invito:";
+$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registrati su qualsiasi server \$Projectname (sono tutti interconnessi)";
+$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Inserisci il mio indirizzo \$Projectname nel riquadro di ricerca del sito.";
+$a->strings["or visit "] = "oppure visita ";
+$a->strings["3. Click [Connect]"] = "3. Clicca su [Aggiungi]";
 $a->strings["Fetching URL returns error: %1\$s"] = "La chiamata all'URL restituisce questo errore: %1\$s";
 $a->strings["Image uploaded but image cropping failed."] = "L'immagine è stata caricata, ma il non è stato possibile ritagliarla.";
 $a->strings["Image resize failed."] = "Il ridimensionamento dell'immagine è fallito.";
@@ -1630,6 +1613,8 @@ $a->strings["(Heavy system resource usage)"] = "(Uso intenso delle risorse di si
 $a->strings["Maximum image size"] = "Dimensione massima immagini";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Massima dimensione in byte delle immagini caricate. Il default è 0, cioè nessun limite.";
 $a->strings["Does this site allow new member registration?"] = "Questo sito permette a nuovi utenti di registrarsi?";
+$a->strings["Invitation only"] = "Solo con invito";
+$a->strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "La registrazione è permessa solo a chi possiede un codice di invito. Funziona solo se la possibilità di registrarsi è impostata a 'Sì'.";
 $a->strings["Which best describes the types of account offered by this hub?"] = "Come descriveresti il tipo di servizio proposto da questo server?";
 $a->strings["Register text"] = "Testo di registrazione";
 $a->strings["Will be displayed prominently on the registration page."] = "Sarà mostrato ben visibile nella pagina di registrazione.";
@@ -1651,8 +1636,8 @@ $a->strings["Verify Email Addresses"] = "Verifica l'indirizzo email";
 $a->strings["Check to verify email addresses used in account registration (recommended)."] = "Attiva per richiedere la verifica degli indirizzi email dei nuovi utenti (consigliato).";
 $a->strings["Force publish"] = "Forza la publicazione del profilo";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Seleziona per pubblicare sui directory server <strong>tutti</strong> i profili registrati su questo sito.";
-$a->strings["Disable discovery tab"] = "Disabilita la funzione 'scopri'";
-$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Nell'area della rete personale non comparirà più la scheda con i contenuti acquisiti da altri siti.";
+$a->strings["Import Public Streams"] = "Suggerisci contenuti pubblici della rete Hubzilla";
+$a->strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Suggerisci e visualizza i contenuti pubblici presenti su altri siti Hubzilla. Attenzione: i contenuti saranno importati senza moderazione e potrebbero essere inappropriati.";
 $a->strings["login on Homepage"] = "Mostra il login sulla homepage";
 $a->strings["Present a login box to visitors on the home page if no other content has been configured."] = "Presenta il modulo di login ai visitatori sulla homepage in mancanza di altri contenuti.";
 $a->strings["Directory Server URL"] = "URL del directory server";
@@ -1912,7 +1897,7 @@ $a->strings["Default file upload folder"] = "Cartella predefinita per i file car
 $a->strings["Personal menu to display in your channel pages"] = "Menu personale da mostrare sulle pagine del tuo canale";
 $a->strings["Remove this channel."] = "Elimina questo canale.";
 $a->strings["Firefox Share \$Projectname provider"] = "Attiva Firefox Share per \$Projectname";
-$a->strings["Start calendar week on monday"] = "La settimana inizia di lunedì";
+$a->strings["Start calendar week on monday"] = "La settimana inizia il lunedì";
 $a->strings["Page Title"] = "Titolo della pagina";
 $a->strings["App installed."] = "App installata";
 $a->strings["Malformed app."] = "L'app contiene errori";
@@ -1943,27 +1928,8 @@ $a->strings["Sync now"] = "Sincronizza ora";
 $a->strings["Please wait several minutes between consecutive operations."] = "Si raccomanda di attendere alcuni minuti prima di effettuare una nuova sincronizzazione.";
 $a->strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Quando possibile, riduci il numero di cloni del tuo canale effettuando il login sul relativo hub e rimuovendoli.";
 $a->strings["Use this form to drop the location if the hub is no longer operating."] = "Usa questo modulo per abbandonare un canale su un hub che non è più funzionante.";
-$a->strings["Unable to lookup recipient."] = "Impossibile associare un destinatario.";
-$a->strings["Unable to communicate with requested channel."] = "Impossibile comunicare con il canale richiesto.";
-$a->strings["Cannot verify requested channel."] = "Impossibile verificare il canale richiesto.";
-$a->strings["Selected channel has private message restrictions. Send failed."] = "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito.";
-$a->strings["Messages"] = "Messaggi";
-$a->strings["Message recalled."] = "Messaggio revocato.";
-$a->strings["Conversation removed."] = "Conversazione rimossa.";
-$a->strings["Requested channel is not in this network"] = "Il canale cercato non è in questa rete";
-$a->strings["Send Private Message"] = "Invia un messaggio privato";
-$a->strings["To:"] = "A:";
-$a->strings["Subject:"] = "Oggetto:";
-$a->strings["Your message:"] = "Il tuo messaggio:";
-$a->strings["Send"] = "Invia";
-$a->strings["Delete message"] = "Elimina il messaggio";
-$a->strings["Delivery report"] = "Rapporto di trasmissione";
-$a->strings["Recall message"] = "Revoca il messaggio";
-$a->strings["Message has been recalled."] = "Il messaggio è stato revocato.";
-$a->strings["Delete Conversation"] = "Elimina la conversazione";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente.";
-$a->strings["Send Reply"] = "Invia la risposta";
-$a->strings["Your message for %s (%s):"] = "Il tuo messaggio per %s (%s):";
+$a->strings["\$Projectname"] = "\$Projectname";
+$a->strings["Welcome to %s"] = "%s ti dà il benvenuto";
 $a->strings["Please login."] = "Effettua l'accesso.";
 $a->strings["Xchan Lookup"] = "Ricerca canale";
 $a->strings["Lookup xchan beginning with (or webbie): "] = "Cerca un canale (o un webbie) che inizia per:";
@@ -1971,24 +1937,43 @@ $a->strings["Not found."] = "Non trovato.";
 $a->strings["You must be logged in to see this page."] = "Devi aver effettuato l'accesso per vedere questa pagina.";
 $a->strings["Insufficient permissions.  Request redirected to profile page."] = "Permessi insufficienti. Sarà visualizzata la pagina del profilo.";
 $a->strings["Item not available."] = "Elemento non disponibile.";
-$a->strings["Total invitation limit exceeded."] = "Hai superato il numero massimo di inviti.";
-$a->strings["%s : Not a valid email address."] = "%s: non è un indirizzo email valido.";
-$a->strings["Please join us on \$Projectname"] = "Unisciti a noi su \$Projectname";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Hai superato il numero massimo di inviti. Contatta l'amministratore se necessario.";
-$a->strings["%s : Message delivery failed."] = "%s: la consegna del messaggio è fallita.";
-$a->strings["%d message sent."] = array(
-	0 => "%d messaggio inviato.",
-	1 => "%d messaggi inviati.",
-);
-$a->strings["You have no more invitations available"] = "Non hai altri inviti disponibili";
-$a->strings["Send invitations"] = "Spedisci inviti";
-$a->strings["Enter email addresses, one per line:"] = "Inserisci gli indirizzi email, uno per riga:";
-$a->strings["Please join my community on \$Projectname."] = "Entra nella mia comunità su \$Projectname.";
-$a->strings["You will need to supply this invitation code: "] = "Dovrai fornire questo codice di invito:";
-$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registrati su qualsiasi server \$Projectname (sono tutti interconnessi)";
-$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Inserisci il mio indirizzo \$Projectname nel riquadro di ricerca del sito.";
-$a->strings["or visit "] = "oppure visita ";
-$a->strings["3. Click [Connect]"] = "3. Clicca su [Aggiungi]";
+$a->strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina.";
+$a->strings["Album not found."] = "Album non trovato.";
+$a->strings["Delete Album"] = "Elimina album";
+$a->strings["Delete Photo"] = "Elimina foto";
+$a->strings["No photos selected"] = "Nessuna foto selezionata";
+$a->strings["Access to this item is restricted."] = "Questo elemento non è visibile a tutti.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile.";
+$a->strings["%1$.2f MB photo storage used."] = "Hai usato %1$.2f Mb del tuo spazio disponibile.";
+$a->strings["Upload Photos"] = "Carica foto";
+$a->strings["Enter an album name"] = "Scegli il nome dell'album";
+$a->strings["or select an existing album (doubleclick)"] = "o seleziona un album esistente (doppio click)";
+$a->strings["Create a status post for this upload"] = "Pubblica sulla bacheca";
+$a->strings["Caption (optional):"] = "Titolo (facoltativo):";
+$a->strings["Description (optional):"] = "Descrizione (facoltativa):";
+$a->strings["Album name could not be decoded"] = "Non è stato possibile leggere il nome dell'album";
+$a->strings["Contact Photos"] = "Foto dei contatti";
+$a->strings["Show Newest First"] = "Prima i più recenti";
+$a->strings["Show Oldest First"] = "Prima i più vecchi";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permesso negato. L'accesso a questo elemento può essere stato limitato.";
+$a->strings["Photo not available"] = "Foto non disponibile";
+$a->strings["Use as profile photo"] = "Usa come foto del profilo";
+$a->strings["Private Photo"] = "Foto privata";
+$a->strings["Previous"] = "Precendente";
+$a->strings["View Full Size"] = "Vedi nelle dimensioni originali";
+$a->strings["Edit photo"] = "Modifica la foto";
+$a->strings["Rotate CW (right)"] = "Ruota (senso orario)";
+$a->strings["Rotate CCW (left)"] = "Ruota (senso antiorario)";
+$a->strings["Enter a new album name"] = "Inserisci il nome del nuovo album";
+$a->strings["or select an existing one (doubleclick)"] = "o seleziona uno esistente (doppio click)";
+$a->strings["Caption"] = "Didascalia";
+$a->strings["Add a Tag"] = "Aggiungi tag";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Esempio: @bob, @Barbara_Jensen, @jim@example.com";
+$a->strings["Flag as adult in album view"] = "Marca come 'per adulti'";
+$a->strings["In This Photo:"] = "In questa foto:";
+$a->strings["Map"] = "Mappa";
+$a->strings["View Album"] = "Guarda l'album";
+$a->strings["Recent Photos"] = "Foto recenti";
 $a->strings["Remote privacy information not available."] = "Le informazioni remote sulla privacy non sono disponibili.";
 $a->strings["Visible to:"] = "Visibile a:";
 $a->strings["Export Channel"] = "Esporta il canale";
@@ -2020,6 +2005,8 @@ $a->strings["New Chatroom"] = "Nuova chat";
 $a->strings["Chatroom Name"] = "Nome della chat";
 $a->strings["Expiration of chats (minutes)"] = "Scadenza dei messaggi della chat (minuti)";
 $a->strings["%1\$s's Chatrooms"] = "Le chat di %1\$s";
+$a->strings["Items tagged with: %s"] = "Elementi taggati con: %s";
+$a->strings["Search results for: %s"] = "Risultati ricerca: %s";
 $a->strings["Source of Item"] = "Sorgente";
 $a->strings["Share content from Firefox to \$Projectname"] = "Condividi i contenuti su \$Projectname da Firefox";
 $a->strings["Activate the Firefox \$Projectname provider"] = "Attiva Firefox Share per \$Projectname";
@@ -2043,10 +2030,6 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
 $a->strings["Edit connection"] = "Modifica il contatto";
 $a->strings["Search your connections"] = "Cerca tra i contatti";
 $a->strings["Finding: "] = "Ricerca: ";
-$a->strings["Documentation Search"] = "Ricerca nella guida";
-$a->strings["Help:"] = "Guida:";
-$a->strings["Not Found"] = "Non disponibile";
-$a->strings["\$Projectname Documentation"] = "Guida di \$Projectname";
 $a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Hai creato %1$.0f dei %2$.0f canali permessi.";
 $a->strings["Create a new channel"] = "Crea un nuovo canale";
 $a->strings["Current Channel"] = "Canale attuale";
@@ -2079,7 +2062,30 @@ $a->strings["Must be unique, only seen by you"] = "Deve essere unico, lo vedrai
 $a->strings["Menu title"] = "Titolo del menù";
 $a->strings["Menu title as seen by others"] = "Titolo del menù come comparirà a tutti";
 $a->strings["Allow bookmarks"] = "Permetti l'invio di segnalibri";
-$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "L'autenticazione tramite il tuo hub non è disponibile. Puoi provare a disconnetterti per tentare di nuovo.";
+$a->strings["Unable to lookup recipient."] = "Impossibile associare un destinatario.";
+$a->strings["Unable to communicate with requested channel."] = "Impossibile comunicare con il canale richiesto.";
+$a->strings["Cannot verify requested channel."] = "Impossibile verificare il canale richiesto.";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito.";
+$a->strings["Messages"] = "Messaggi";
+$a->strings["Message recalled."] = "Messaggio revocato.";
+$a->strings["Conversation removed."] = "Conversazione rimossa.";
+$a->strings["Requested channel is not in this network"] = "Il canale cercato non è in questa rete";
+$a->strings["Send Private Message"] = "Invia un messaggio privato";
+$a->strings["To:"] = "A:";
+$a->strings["Subject:"] = "Oggetto:";
+$a->strings["Send"] = "Invia";
+$a->strings["Delete message"] = "Elimina il messaggio";
+$a->strings["Delivery report"] = "Rapporto di trasmissione";
+$a->strings["Recall message"] = "Revoca il messaggio";
+$a->strings["Message has been recalled."] = "Il messaggio è stato revocato.";
+$a->strings["Delete Conversation"] = "Elimina la conversazione";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente.";
+$a->strings["Send Reply"] = "Invia la risposta";
+$a->strings["Your message for %s (%s):"] = "Il tuo messaggio per %s (%s):";
+$a->strings["Documentation Search"] = "Ricerca nella guida";
+$a->strings["Help:"] = "Guida:";
+$a->strings["Not Found"] = "Non disponibile";
+$a->strings["\$Projectname Documentation"] = "Guida di \$Projectname";
 $a->strings["No service class restrictions found."] = "Non esistono restrizioni su questa classe di account.";
 $a->strings["Version %s"] = "Versione %s";
 $a->strings["Installed plugins/addons/apps:"] = "App e componenti installati:";
@@ -2101,21 +2107,28 @@ $a->strings["Event can not end before it has started."] = "Un evento non può te
 $a->strings["Unable to generate preview."] = "Impossibile creare un'anteprima.";
 $a->strings["Event title and start time are required."] = "Sono necessari il titolo e l'ora d'inizio dell'evento.";
 $a->strings["Event not found."] = "Evento non trovato.";
-$a->strings["Event Title"] = "Titolo dell'evento";
+$a->strings["Edit event titel"] = "Modifica il titolo dell'evento";
+$a->strings["Event titel"] = "Titolo evento";
 $a->strings["Categories (comma-separated list)"] = "Categorie (separate da virgola)";
+$a->strings["Edit Category"] = "Modifica la categoria";
 $a->strings["Category"] = "Categoria";
+$a->strings["Edit start date and time"] = "Modifica data/ora di inizio";
 $a->strings["Start date and time"] = "Data e ora di inizio";
 $a->strings["Finish date and time are not known or not relevant"] = "La data e l'ora di inizio non sono necessarie";
+$a->strings["Edit finish date and time"] = "Modifica data/ora di fine";
 $a->strings["Finish date and time"] = "Data e ora di fine";
 $a->strings["Adjust for viewer timezone"] = "Adatta al fuso orario di chi legge";
 $a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante per eventi che avvengono online ma con un certo fuso orario.";
+$a->strings["Edit Description"] = "Modifica la descrizione";
+$a->strings["Edit Location"] = "Modifica il luogo";
 $a->strings["Share this event"] = "Condividi questo evento";
 $a->strings["Advanced Options"] = "Opzioni avanzate";
 $a->strings["l, F j"] = "l j F";
 $a->strings["Edit event"] = "Modifica l'evento";
 $a->strings["Delete event"] = "Elimina l'evento";
 $a->strings["calendar"] = "calendario";
-$a->strings["New Event"] = "Nuovo evento";
+$a->strings["Edit Event"] = "Modifica l'evento";
+$a->strings["Create Event"] = "Crea un evento";
 $a->strings["Today"] = "Oggi";
 $a->strings["Event removed"] = "Evento eliminato";
 $a->strings["Failed to remove event"] = "Impossibile eliminare l'evento";
@@ -2192,6 +2205,7 @@ $a->strings["Left align page content"] = "Allinea a sinistra il contenuto della
 $a->strings["Set minimum opacity of nav bar - to hide it"] = "Opacità minima della barra di navigazione - per nasconderla";
 $a->strings["Set size of conversation author photo"] = "Dimensione foto dell'autore della conversazione";
 $a->strings["Set size of followup author photos"] = "Dimensione foto dei partecipanti alla conversazione";
+$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "L'autenticazione tramite il tuo hub non è disponibile. Puoi provare a disconnetterti per tentare di nuovo.";
 $a->strings["Update %s failed. See error logs."] = "%s: aggiornamento fallito. Controlla i log di errore.";
 $a->strings["Update Error at %s"] = "Errore di aggiornamento su %s";
 $a->strings["Create an account to access services and applications within the Hubzilla"] = "Registrati per accedere ai servizi e alle applicazioni di Hubzilla";
diff --git a/view/js/acl.js b/view/js/acl.js
index ed8af478a..6d94b4987 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -39,18 +39,18 @@ function ACL(backend_url, preset) {
 // no longer called only on submit - call to update whenever a change occurs to the acl list. 
 
 ACL.prototype.on_submit = function() {
-	aclfileds = $("#acl-fields").html("");
+	aclfields = $("#acl-fields").html("");
 	$(that.allow_gid).each(function(i,v) {
-		aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
+		aclfields.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
 	});
 	$(that.allow_cid).each(function(i,v) {
-		aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
+		aclfields.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
 	});
 	$(that.deny_gid).each(function(i,v) {
-		aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
+		aclfields.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
 	});
 	$(that.deny_cid).each(function(i,v) {
-		aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
+		aclfields.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
 	});
 
 	//areYouSure jquery plugin: recheck the form here
diff --git a/view/js/main.js b/view/js/main.js
index ca7d50b90..d670b704a 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -758,9 +758,9 @@ function pageUpdate() {
 	});
 }
 
-function justifyPhotos() {
+function justifyPhotos(id) {
 	justifiedGalleryActive = true;
-	$('#photo-album-contents').justifiedGallery({
+	$('#' + id).justifiedGallery({
 		selector: '> a, > div:not(.spinner, #page-end)',
 		margins: 3,
 		border: 0,
@@ -775,9 +775,9 @@ function justifyPhotos() {
 	}).on('jg.complete', function(e){ justifiedGalleryActive = false; });
 }
 
-function justifyPhotosAjax() {
+function justifyPhotosAjax(id) {
 	justifiedGalleryActive = true;
-	$('#photo-album-contents').justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; });
+	$('#' + id).justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; });
 }
 
 function notify_popup_loader(notifyType) {
diff --git a/view/js/mod_mitem.js b/view/js/mod_mitem.js
deleted file mode 100644
index e883763df..000000000
--- a/view/js/mod_mitem.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * JavaScript used by mod/mitem.
- */
-$(document).ready(function() {
-	$("a#settings-default-perms-menu").colorbox({
-		'inline' : true,
-		'transition' : 'elastic'
-	});
-
-	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-		var selstr;
-		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-			selstr = $(this).text();
-			$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
-			$('#jot-public').hide();
-		});
-		if(selstr === null) {
-			$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
-			$('#jot-public').show();
-		}
-	}).trigger('change');
-});
\ No newline at end of file
diff --git a/view/nb-no/hmessages.po b/view/nb-no/hmessages.po
index c71820ed7..e8a631eb6 100644
--- a/view/nb-no/hmessages.po
+++ b/view/nb-no/hmessages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-26 22:48-0700\n"
-"PO-Revision-Date: 2015-09-30 20:54+0000\n"
+"POT-Creation-Date: 2015-12-18 00:03-0800\n"
+"PO-Revision-Date: 2015-12-20 13:37+0000\n"
 "Last-Translator: Haakon Meland Eriksen <haakon.eriksen@far.no>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/Friendica/red-matrix/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,492 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../include/Import/import_diaspora.php:17
-msgid "No username found in import file."
-msgstr "Ingen brukernavn ble funnet i importfilen."
+#: ../../include/Contact.php:101 ../../include/identity.php:947
+#: ../../include/widgets.php:137 ../../include/widgets.php:175
+#: ../../include/conversation.php:953 ../../mod/match.php:64
+#: ../../mod/directory.php:318 ../../mod/suggest.php:52
+msgid "Connect"
+msgstr "Koble"
+
+#: ../../include/Contact.php:118
+msgid "New window"
+msgstr "Nytt vindu"
+
+#: ../../include/Contact.php:119
+msgid "Open the selected location in a different window or browser tab"
+msgstr "Ã…pne det valgte stedet i et annet vindu eller nettleser-fane"
+
+#: ../../include/Contact.php:237
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Brukeren '%s' er slettet"
+
+#: ../../include/chat.php:23
+msgid "Missing room name"
+msgstr "Mangler romnavn"
+
+#: ../../include/chat.php:32
+msgid "Duplicate room name"
+msgstr "Duplikat romnavn"
+
+#: ../../include/chat.php:82 ../../include/chat.php:90
+msgid "Invalid room specifier."
+msgstr "Ugyldig rom-spesifisering"
+
+#: ../../include/chat.php:122
+msgid "Room not found."
+msgstr "Rommet ble ikke funnet."
+
+#: ../../include/chat.php:133 ../../include/items.php:4405
+#: ../../include/photos.php:29 ../../include/attach.php:140
+#: ../../include/attach.php:188 ../../include/attach.php:251
+#: ../../include/attach.php:265 ../../include/attach.php:272
+#: ../../include/attach.php:337 ../../include/attach.php:351
+#: ../../include/attach.php:358 ../../include/attach.php:436
+#: ../../include/attach.php:888 ../../include/attach.php:959
+#: ../../include/attach.php:1111 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/group.php:9 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:1050 ../../mod/common.php:35
+#: ../../mod/achievements.php:30 ../../mod/rate.php:111
+#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/id.php:71
+#: ../../mod/like.php:177 ../../mod/page.php:31 ../../mod/page.php:86
+#: ../../mod/mood.php:112 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/setup.php:227
+#: ../../mod/bookmarks.php:48 ../../mod/poke.php:133
+#: ../../mod/profiles.php:198 ../../mod/profiles.php:584
+#: ../../mod/connedit.php:352 ../../mod/editwebpage.php:64
+#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
+#: ../../mod/editwebpage.php:125 ../../mod/profile.php:64
+#: ../../mod/profile.php:72 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/fsuggest.php:78 ../../mod/sources.php:66
+#: ../../mod/notifications.php:66 ../../mod/invite.php:13
+#: ../../mod/invite.php:87 ../../mod/profile_photo.php:341
+#: ../../mod/profile_photo.php:354 ../../mod/thing.php:271
+#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/editblock.php:65
+#: ../../mod/network.php:12 ../../mod/pdledit.php:21 ../../mod/register.php:72
+#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
+#: ../../mod/settings.php:568 ../../mod/webpages.php:69
+#: ../../mod/appman.php:66 ../../mod/layouts.php:69 ../../mod/layouts.php:76
+#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/regmod.php:17
+#: ../../mod/channel.php:100 ../../mod/channel.php:214
+#: ../../mod/channel.php:254 ../../mod/photos.php:70 ../../mod/editpost.php:13
+#: ../../mod/chat.php:94 ../../mod/chat.php:99 ../../mod/viewsrc.php:14
+#: ../../mod/authtest.php:13 ../../mod/connections.php:29
+#: ../../mod/manage.php:6 ../../mod/menu.php:74 ../../mod/mail.php:126
+#: ../../mod/service_limits.php:7 ../../mod/suggest.php:26
+#: ../../mod/events.php:260 ../../mod/message.php:16 ../../mod/block.php:22
+#: ../../mod/block.php:72 ../../mod/mitem.php:111 ../../mod/sharedwithme.php:7
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../index.php:182 ../../index.php:365
+msgid "Permission denied."
+msgstr "Tillatelse avslått."
+
+#: ../../include/chat.php:143
+msgid "Room is full"
+msgstr "Rommet er fullt"
+
+#: ../../include/import.php:23
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Kan ikke lage en kopi av kanal-identifikatoren på dette systemet. Import mislyktes."
 
-#: ../../include/Import/import_diaspora.php:42 ../../include/import.php:44
+#: ../../include/import.php:44 ../../include/Import/import_diaspora.php:42
 msgid "Unable to create a unique channel address. Import failed."
 msgstr "Klarte ikke å lage en unik kanaladresse. Import mislyktes."
 
-#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:480
-msgid "Import completed."
-msgstr "Import ferdig."
+#: ../../include/import.php:70
+msgid "Channel clone failed. Import failed."
+msgstr "Kanalkloning mislyktes. Import mislyktes."
 
-#: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:265
-msgid "parent"
-msgstr "opp et nivå"
+#: ../../include/import.php:80 ../../mod/import.php:139
+msgid "Cloned channel not found. Import failed."
+msgstr "Klonet kanal ble ikke funnet. Import mislyktes."
+
+#: ../../include/text.php:394
+msgid "prev"
+msgstr "forrige"
+
+#: ../../include/text.php:396
+msgid "first"
+msgstr "første"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2497
+#: ../../include/text.php:425
+msgid "last"
+msgstr "siste"
+
+#: ../../include/text.php:428
+msgid "next"
+msgstr "neste"
+
+#: ../../include/text.php:438
+msgid "older"
+msgstr "eldre"
+
+#: ../../include/text.php:440
+msgid "newer"
+msgstr "nyere"
+
+#: ../../include/text.php:785
+msgid "No connections"
+msgstr "Ingen forbindelser"
+
+#: ../../include/text.php:797
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d forbindelse"
+msgstr[1] "%d forbindelser"
+
+#: ../../include/text.php:810 ../../mod/viewconnections.php:101
+msgid "View Connections"
+msgstr "Vis forbindelser"
+
+#: ../../include/text.php:867 ../../include/text.php:879
+#: ../../include/nav.php:159 ../../include/apps.php:147
+#: ../../mod/search.php:40
+msgid "Search"
+msgstr "Søk"
+
+#: ../../include/text.php:868 ../../include/text.php:880
+#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:100 ../../mod/admin.php:1454 ../../mod/admin.php:1474
+#: ../../mod/filer.php:49
+msgid "Save"
+msgstr "Lagre"
+
+#: ../../include/text.php:954
+msgid "poke"
+msgstr "prikk"
+
+#: ../../include/text.php:954 ../../include/conversation.php:243
+msgid "poked"
+msgstr "prikket"
+
+#: ../../include/text.php:955
+msgid "ping"
+msgstr "varsle"
+
+#: ../../include/text.php:955
+msgid "pinged"
+msgstr "varslet"
+
+#: ../../include/text.php:956
+msgid "prod"
+msgstr "oppildne"
+
+#: ../../include/text.php:956
+msgid "prodded"
+msgstr "oppildnet"
+
+#: ../../include/text.php:957
+msgid "slap"
+msgstr "daske"
+
+#: ../../include/text.php:957
+msgid "slapped"
+msgstr "dasket"
+
+#: ../../include/text.php:958
+msgid "finger"
+msgstr "fingre"
+
+#: ../../include/text.php:958
+msgid "fingered"
+msgstr "fingret"
+
+#: ../../include/text.php:959
+msgid "rebuff"
+msgstr "tilbakevise"
+
+#: ../../include/text.php:959
+msgid "rebuffed"
+msgstr "tilbakeviste"
+
+#: ../../include/text.php:969
+msgid "happy"
+msgstr "glad"
+
+#: ../../include/text.php:970
+msgid "sad"
+msgstr "trist"
+
+#: ../../include/text.php:971
+msgid "mellow"
+msgstr "dempet"
+
+#: ../../include/text.php:972
+msgid "tired"
+msgstr "trøtt"
+
+#: ../../include/text.php:973
+msgid "perky"
+msgstr "oppkvikket"
+
+#: ../../include/text.php:974
+msgid "angry"
+msgstr "sint"
+
+#: ../../include/text.php:975
+msgid "stupified"
+msgstr "sløvet"
+
+#: ../../include/text.php:976
+msgid "puzzled"
+msgstr "forundret"
+
+#: ../../include/text.php:977
+msgid "interested"
+msgstr "interessert"
+
+#: ../../include/text.php:978
+msgid "bitter"
+msgstr "bitter"
+
+#: ../../include/text.php:979
+msgid "cheerful"
+msgstr "munter"
+
+#: ../../include/text.php:980
+msgid "alive"
+msgstr "levende"
+
+#: ../../include/text.php:981
+msgid "annoyed"
+msgstr "irritert"
+
+#: ../../include/text.php:982
+msgid "anxious"
+msgstr "nervøs"
+
+#: ../../include/text.php:983
+msgid "cranky"
+msgstr "gretten"
+
+#: ../../include/text.php:984
+msgid "disturbed"
+msgstr "foruroliget"
+
+#: ../../include/text.php:985
+msgid "frustrated"
+msgstr "frustrert"
+
+#: ../../include/text.php:986
+msgid "depressed"
+msgstr "lei seg"
+
+#: ../../include/text.php:987
+msgid "motivated"
+msgstr "motivert"
+
+#: ../../include/text.php:988
+msgid "relaxed"
+msgstr "avslappet"
+
+#: ../../include/text.php:989
+msgid "surprised"
+msgstr "overrasket"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "mandag"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "tirsdag"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "onsdag"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "torsdag"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "fredag"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "lørdag"
+
+#: ../../include/text.php:1161 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "søndag"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:45
+msgid "January"
+msgstr "januar"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:46
+msgid "February"
+msgstr "februar"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:47
+msgid "March"
+msgstr "mars"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:48
+msgid "April"
+msgstr "april"
+
+#: ../../include/text.php:1165
+msgid "May"
+msgstr "mai"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:50
+msgid "June"
+msgstr "juni"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:51
+msgid "July"
+msgstr "juli"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:52
+msgid "August"
+msgstr "august"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:53
+msgid "September"
+msgstr "september"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:54
+msgid "October"
+msgstr "oktober"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:55
+msgid "November"
+msgstr "november"
+
+#: ../../include/text.php:1165 ../../include/js_strings.php:56
+msgid "December"
+msgstr "desember"
+
+#: ../../include/text.php:1242 ../../include/text.php:1246
+msgid "Unknown Attachment"
+msgstr "Ukjent vedlegg"
+
+#: ../../include/text.php:1248 ../../include/RedDAV/RedBrowser.php:237
+#: ../../mod/sharedwithme.php:97
+msgid "Size"
+msgstr "Størrelse"
+
+#: ../../include/text.php:1248
+msgid "unknown"
+msgstr "ukjent"
+
+#: ../../include/text.php:1284
+msgid "remove category"
+msgstr "fjern kategori"
+
+#: ../../include/text.php:1361
+msgid "remove from file"
+msgstr "fjern fra fil"
+
+#: ../../include/text.php:1392 ../../include/event.php:22
+#: ../../include/bb2diaspora.php:465
+msgid "l F d, Y \\@ g:i A"
+msgstr "l F d, Y \\@ g:i A"
+
+#: ../../include/text.php:1396 ../../include/event.php:30
+#: ../../include/bb2diaspora.php:471
+msgid "Starts:"
+msgstr "Starter:"
+
+#: ../../include/text.php:1400 ../../include/event.php:40
+#: ../../include/bb2diaspora.php:479
+msgid "Finishes:"
+msgstr "Slutter:"
+
+#: ../../include/text.php:1407 ../../include/event.php:52
+#: ../../include/identity.php:998 ../../include/bb2diaspora.php:487
+#: ../../mod/directory.php:304
+msgid "Location:"
+msgstr "Plassering:"
+
+#: ../../include/text.php:1503 ../../include/text.php:1514
+msgid "Click to open/close"
+msgstr "Klikk for å åpne/lukke"
+
+#: ../../include/text.php:1698 ../../mod/events.php:623
+msgid "Link to Source"
+msgstr "Lenke til kilde"
+
+#: ../../include/text.php:1719 ../../include/text.php:1791
+msgid "default"
+msgstr "standard"
+
+#: ../../include/text.php:1727
+msgid "Page layout"
+msgstr "Sidens layout"
+
+#: ../../include/text.php:1727
+msgid "You can create your own with the layouts tool"
+msgstr "Du kan lage din egen med layout-verktøyet"
+
+#: ../../include/text.php:1769
+msgid "Page content type"
+msgstr "Sidens innholdstype"
+
+#: ../../include/text.php:1803
+msgid "Select an alternate language"
+msgstr "Velg et annet språk"
+
+#: ../../include/text.php:1922 ../../include/conversation.php:120
+#: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
+msgid "photo"
+msgstr "foto"
+
+#: ../../include/text.php:1925 ../../include/event.php:904
+#: ../../include/conversation.php:123 ../../mod/tagger.php:47
+#: ../../mod/like.php:363 ../../mod/events.php:249
+msgid "event"
+msgstr "hendelse"
+
+#: ../../include/text.php:1928 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:83
+msgid "status"
+msgstr "status"
+
+#: ../../include/text.php:1930 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr "kommentar"
+
+#: ../../include/text.php:1935
+msgid "activity"
+msgstr "aktivitet"
+
+#: ../../include/text.php:2230
+msgid "Design Tools"
+msgstr "Designverktøy"
+
+#: ../../include/text.php:2233 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr "Byggeklosser"
+
+#: ../../include/text.php:2234 ../../mod/menu.php:103
+msgid "Menus"
+msgstr "Menyer"
+
+#: ../../include/text.php:2235 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr "Layout"
+
+#: ../../include/text.php:2236
+msgid "Pages"
+msgstr "Sider"
+
+#: ../../include/text.php:2588 ../../include/RedDAV/RedBrowser.php:131
 msgid "Collection"
 msgstr "Samling"
 
+#: ../../include/RedDAV/RedBrowser.php:107
+#: ../../include/RedDAV/RedBrowser.php:239
+msgid "parent"
+msgstr "opp et nivå"
+
 #: ../../include/RedDAV/RedBrowser.php:134
 msgid "Principal"
 msgstr "Viktigste"
@@ -59,89 +524,92 @@ msgstr "Tidsplan innboks"
 msgid "Schedule Outbox"
 msgstr "Tidsplan utboks"
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1021
-#: ../../include/apps.php:355 ../../include/apps.php:410
-#: ../../mod/photos.php:720 ../../mod/photos.php:1159
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1330
+#: ../../include/conversation.php:1027 ../../include/apps.php:360
+#: ../../include/apps.php:415 ../../mod/photos.php:754
+#: ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../../include/RedDAV/RedBrowser.php:227
-#, php-format
-msgid "%1$s used"
-msgstr "%1$s brukt"
-
-#: ../../include/RedDAV/RedBrowser.php:232
-#, php-format
-msgid "%1$s used of %2$s (%3$s&#37;)"
-msgstr "%1$s brukt av %2$s (%3$s&#37;)"
-
-#: ../../include/RedDAV/RedBrowser.php:251 ../../include/conversation.php:1611
-#: ../../include/apps.php:135 ../../include/nav.php:93
-#: ../../mod/fbrowser.php:114
+#: ../../include/RedDAV/RedBrowser.php:226 ../../include/conversation.php:1629
+#: ../../include/nav.php:93 ../../include/apps.php:135
+#: ../../mod/fbrowser.php:109
 msgid "Files"
 msgstr "Filer"
 
-#: ../../include/RedDAV/RedBrowser.php:253
+#: ../../include/RedDAV/RedBrowser.php:227
 msgid "Total"
 msgstr "Totalt"
 
-#: ../../include/RedDAV/RedBrowser.php:255
+#: ../../include/RedDAV/RedBrowser.php:229
 msgid "Shared"
 msgstr "Delt"
 
-#: ../../include/RedDAV/RedBrowser.php:256
-#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/layouts.php:175
-#: ../../mod/menu.php:114 ../../mod/new_channel.php:121
-#: ../../mod/webpages.php:180 ../../mod/blocks.php:152
+#: ../../include/RedDAV/RedBrowser.php:230
+#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/blocks.php:152
+#: ../../mod/new_channel.php:121 ../../mod/webpages.php:180
+#: ../../mod/layouts.php:175 ../../mod/menu.php:114
 msgid "Create"
 msgstr "Lag"
 
-#: ../../include/RedDAV/RedBrowser.php:257
-#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:745
-#: ../../mod/photos.php:1278 ../../mod/profile_photo.php:450
+#: ../../include/RedDAV/RedBrowser.php:231
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1343
+#: ../../mod/profile_photo.php:453 ../../mod/photos.php:781
+#: ../../mod/photos.php:1316
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:948
-#: ../../mod/settings.php:585 ../../mod/settings.php:611
+#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:986
+#: ../../mod/settings.php:588 ../../mod/settings.php:614
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
 msgstr "Navn"
 
-#: ../../include/RedDAV/RedBrowser.php:262
+#: ../../include/RedDAV/RedBrowser.php:236
 msgid "Type"
 msgstr "Type"
 
-#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97
-msgid "Size"
-msgstr "Størrelse"
-
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98
+#: ../../include/RedDAV/RedBrowser.php:238 ../../mod/sharedwithme.php:98
 msgid "Last Modified"
 msgstr "Sist endret"
 
-#: ../../include/RedDAV/RedBrowser.php:266 ../../include/menu.php:108
+#: ../../include/RedDAV/RedBrowser.php:240 ../../include/menu.php:108
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../include/apps.php:254 ../../include/ItemObject.php:100
-#: ../../mod/layouts.php:183 ../../mod/editpost.php:113
-#: ../../mod/editblock.php:135 ../../mod/menu.php:108
-#: ../../mod/webpages.php:181 ../../mod/blocks.php:153 ../../mod/thing.php:257
-#: ../../mod/settings.php:645 ../../mod/connections.php:235
+#: ../../include/ItemObject.php:100 ../../include/apps.php:259
+#: ../../mod/blocks.php:153 ../../mod/editwebpage.php:176
+#: ../../mod/thing.php:257 ../../mod/editblock.php:135
+#: ../../mod/editlayout.php:134 ../../mod/settings.php:648
+#: ../../mod/webpages.php:181 ../../mod/layouts.php:183
+#: ../../mod/editpost.php:112 ../../mod/connections.php:235
 #: ../../mod/connections.php:248 ../../mod/connections.php:267
-#: ../../mod/editlayout.php:134 ../../mod/editwebpage.php:176
+#: ../../mod/menu.php:108
 msgid "Edit"
 msgstr "Endre"
 
-#: ../../include/RedDAV/RedBrowser.php:267 ../../include/conversation.php:662
-#: ../../include/apps.php:255 ../../include/ItemObject.php:120
-#: ../../mod/connedit.php:547 ../../mod/editblock.php:181
-#: ../../mod/admin.php:783 ../../mod/admin.php:942 ../../mod/photos.php:1090
-#: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258
-#: ../../mod/settings.php:646 ../../mod/editlayout.php:179
-#: ../../mod/editwebpage.php:223 ../../mod/group.php:173
+#: ../../include/RedDAV/RedBrowser.php:241 ../../include/conversation.php:657
+#: ../../include/ItemObject.php:120 ../../include/apps.php:260
+#: ../../mod/group.php:173 ../../mod/blocks.php:155 ../../mod/connedit.php:551
+#: ../../mod/editwebpage.php:223 ../../mod/thing.php:258
+#: ../../mod/editblock.php:181 ../../mod/admin.php:821 ../../mod/admin.php:980
+#: ../../mod/editlayout.php:179 ../../mod/settings.php:649
+#: ../../mod/webpages.php:183 ../../mod/photos.php:1126
 msgid "Delete"
 msgstr "Slett"
 
+#: ../../include/RedDAV/RedBrowser.php:282
+#, php-format
+msgid "You are using %1$s of your available file storage."
+msgstr "Du bruker %1$s av din tilgjengelige lagringsplass."
+
+#: ../../include/RedDAV/RedBrowser.php:287
+#, php-format
+msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
+msgstr "Du bruker %1$s av %2$s tilgjengelig lagringsplass (%3$s&#37;)"
+
+#: ../../include/RedDAV/RedBrowser.php:299
+msgid "WARNING:"
+msgstr "ADVARSEL:"
+
 #: ../../include/RedDAV/RedBrowser.php:302
 msgid "Create new folder"
 msgstr "Lag ny mappe"
@@ -150,292 +618,1216 @@ msgstr "Lag ny mappe"
 msgid "Upload file"
 msgstr "Last opp fil"
 
-#: ../../include/permissions.php:26
-msgid "Can view my normal stream and posts"
-msgstr "Kan se min normale strøm og innlegg"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
+msgstr "Slett dette elementet?"
 
-#: ../../include/permissions.php:27
-msgid "Can view my default channel profile"
-msgstr "Kan se min standard kanalprofil"
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:696
+#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
+msgid "Comment"
+msgstr "Kommentar"
 
-#: ../../include/permissions.php:28
-msgid "Can view my connections"
-msgstr "Kan se mine forbindelser"
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:413
+msgid "[+] show all"
+msgstr "[+] Vis alle"
 
-#: ../../include/permissions.php:29
-msgid "Can view my file storage and photos"
-msgstr "Kan se mine filer og bilder"
+#: ../../include/js_strings.php:8
+msgid "[-] show less"
+msgstr "[-] Vis mindre"
 
-#: ../../include/permissions.php:30
-msgid "Can view my webpages"
-msgstr "Kan se mine websider"
+#: ../../include/js_strings.php:9
+msgid "[+] expand"
+msgstr "[+] Utvid"
 
-#: ../../include/permissions.php:33
-msgid "Can send me their channel stream and posts"
-msgstr "Kan sende meg deres kanalstrøm og innlegg"
+#: ../../include/js_strings.php:10
+msgid "[-] collapse"
+msgstr "[-] Lukk"
 
-#: ../../include/permissions.php:34
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Kan lage innlegg på min kanalside (\"vegg\")"
+#: ../../include/js_strings.php:11
+msgid "Password too short"
+msgstr "Passordet er for kort"
 
-#: ../../include/permissions.php:35
-msgid "Can comment on or like my posts"
-msgstr "Kan kommentere på eller like mine innlegg"
+#: ../../include/js_strings.php:12
+msgid "Passwords do not match"
+msgstr "Passordene er ikke like"
 
-#: ../../include/permissions.php:36
-msgid "Can send me private mail messages"
-msgstr "Kan sende meg private meldinger"
+#: ../../include/js_strings.php:13 ../../mod/photos.php:41
+msgid "everybody"
+msgstr "alle"
 
-#: ../../include/permissions.php:37
-msgid "Can like/dislike stuff"
-msgstr "Kan like/ikke like forskjellige greier"
+#: ../../include/js_strings.php:14
+msgid "Secret Passphrase"
+msgstr "Hemmelig passordsetning"
 
-#: ../../include/permissions.php:37
-msgid "Profiles and things other than posts/comments"
-msgstr "Profiler og andre ting enn innlegg/kommentarer"
+#: ../../include/js_strings.php:15
+msgid "Passphrase hint"
+msgstr "Hint om passordsetning"
 
-#: ../../include/permissions.php:39
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Kan videresende til alle mine kanalkontakter via @navn i innlegg"
+#: ../../include/js_strings.php:16
+msgid "Notice: Permissions have changed but have not yet been submitted."
+msgstr "Varsel: Tillatelser har blitt endret, men de har ennå ikke blitt sendt inn."
 
-#: ../../include/permissions.php:39
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Avansert - nyttig for å lage forumkanaler for grupper"
+#: ../../include/js_strings.php:17
+msgid "close all"
+msgstr "Lukk alle"
 
-#: ../../include/permissions.php:40
-msgid "Can chat with me (when available)"
-msgstr "Kan chatte/sende lynmeldinger til meg (når tilgjengelig)"
+#: ../../include/js_strings.php:18
+msgid "Nothing new here"
+msgstr "Ikke noe nytt her"
 
-#: ../../include/permissions.php:41
-msgid "Can write to my file storage and photos"
-msgstr "Kan skrive til mitt lager for filer og bilder"
+#: ../../include/js_strings.php:19
+msgid "Rate This Channel (this is public)"
+msgstr "Vurder denne kanalen (dette er offentlig)"
 
-#: ../../include/permissions.php:42
-msgid "Can edit my webpages"
-msgstr "Kan endre mine websider"
+#: ../../include/js_strings.php:20 ../../mod/rate.php:157
+#: ../../mod/connedit.php:694
+msgid "Rating"
+msgstr "Vurdering"
 
-#: ../../include/permissions.php:44
-msgid "Can source my public posts in derived channels"
-msgstr "Kan bruke mine offentlige innlegg som kanalkilde i egne kanaler"
+#: ../../include/js_strings.php:21
+msgid "Describe (optional)"
+msgstr "Beskriv (valgfritt)"
 
-#: ../../include/permissions.php:44
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Litt avansert - svært nyttig i åpne fellesskap"
+#: ../../include/js_strings.php:22 ../../include/widgets.php:676
+#: ../../include/widgets.php:688 ../../include/ItemObject.php:697
+#: ../../mod/filestorage.php:156 ../../mod/group.php:81
+#: ../../mod/connect.php:93 ../../mod/rate.php:168 ../../mod/mood.php:135
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/pconfig.php:108
+#: ../../mod/poke.php:171 ../../mod/profiles.php:675
+#: ../../mod/connedit.php:715 ../../mod/fsuggest.php:108
+#: ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/import.php:527 ../../mod/invite.php:142 ../../mod/thing.php:313
+#: ../../mod/thing.php:359 ../../mod/import_items.php:122
+#: ../../mod/pdledit.php:58 ../../mod/admin.php:447 ../../mod/admin.php:814
+#: ../../mod/admin.php:978 ../../mod/admin.php:1115 ../../mod/admin.php:1309
+#: ../../mod/admin.php:1394 ../../mod/settings.php:586
+#: ../../mod/settings.php:698 ../../mod/settings.php:726
+#: ../../mod/settings.php:749 ../../mod/settings.php:834
+#: ../../mod/settings.php:1023 ../../mod/appman.php:99 ../../mod/locs.php:116
+#: ../../mod/xchan.php:11 ../../mod/photos.php:637 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1045 ../../mod/photos.php:1163 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/mail.php:380 ../../mod/events.php:461
+#: ../../mod/events.php:658 ../../mod/mitem.php:231
+#: ../../view/theme/redbasic/php/config.php:99
+msgid "Submit"
+msgstr "Send"
 
-#: ../../include/permissions.php:46
-msgid "Can administer my channel resources"
-msgstr "Kan administrere mine kanalressurser"
+#: ../../include/js_strings.php:23
+msgid "Please enter a link URL"
+msgstr "Vennligst skriv inn en lenke URL:"
 
-#: ../../include/permissions.php:46
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Ekstremt avansert. La dette være med mindre du vet hva du gjør"
+#: ../../include/js_strings.php:24
+msgid "Unsaved changes. Are you sure you wish to leave this page?"
+msgstr "Endringene er ikke lagret. Er du sikker på at du ønsker å forlate denne siden?"
 
-#: ../../include/permissions.php:867
-msgid "Social Networking"
-msgstr "Sosialt nettverk"
+#: ../../include/js_strings.php:25 ../../mod/pubsites.php:28
+#: ../../mod/profiles.php:464 ../../mod/events.php:452
+msgid "Location"
+msgstr "Plassering"
 
-#: ../../include/permissions.php:867 ../../include/permissions.php:868
-#: ../../include/permissions.php:869
-msgid "Mostly Public"
-msgstr "Ganske offentlig"
+#: ../../include/js_strings.php:27
+msgid "timeago.prefixAgo"
+msgstr "timeago.prefixAgo"
 
-#: ../../include/permissions.php:867 ../../include/permissions.php:868
-#: ../../include/permissions.php:869
-msgid "Restricted"
-msgstr "Begrenset"
+#: ../../include/js_strings.php:28
+msgid "timeago.prefixFromNow"
+msgstr "timeago.prefixFromNow"
 
-#: ../../include/permissions.php:867 ../../include/permissions.php:868
-msgid "Private"
-msgstr "Privat"
+#: ../../include/js_strings.php:29
+msgid "ago"
+msgstr "siden"
 
-#: ../../include/permissions.php:868
-msgid "Community Forum"
-msgstr "Forum for fellesskap"
+#: ../../include/js_strings.php:30
+msgid "from now"
+msgstr "fra nå"
 
-#: ../../include/permissions.php:869
-msgid "Feed Republish"
-msgstr "Republisering av strømmet innhold"
+#: ../../include/js_strings.php:31
+msgid "less than a minute"
+msgstr "mindre enn ett minutt"
 
-#: ../../include/permissions.php:870
-msgid "Special Purpose"
-msgstr "Spesiell bruk"
+#: ../../include/js_strings.php:32
+msgid "about a minute"
+msgstr "omtrent et minutt"
 
-#: ../../include/permissions.php:870
-msgid "Celebrity/Soapbox"
-msgstr "Kjendis/Talerstol"
+#: ../../include/js_strings.php:33
+#, php-format
+msgid "%d minutes"
+msgstr "%d minutter"
 
-#: ../../include/permissions.php:870
-msgid "Group Repository"
-msgstr "Gruppelager"
+#: ../../include/js_strings.php:34
+msgid "about an hour"
+msgstr "omtrent en time"
 
-#: ../../include/permissions.php:871 ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-#: ../../include/profile_selectors.php:61
-#: ../../include/profile_selectors.php:97
-msgid "Other"
-msgstr "Annen"
+#: ../../include/js_strings.php:35
+#, php-format
+msgid "about %d hours"
+msgstr "omtrent %d timer"
 
-#: ../../include/permissions.php:871
-msgid "Custom/Expert Mode"
-msgstr "Tilpasset/Ekspertmodus"
+#: ../../include/js_strings.php:36
+msgid "a day"
+msgstr "en dag"
 
-#: ../../include/chat.php:23
-msgid "Missing room name"
-msgstr "Mangler romnavn"
+#: ../../include/js_strings.php:37
+#, php-format
+msgid "%d days"
+msgstr "%d dager"
 
-#: ../../include/chat.php:32
-msgid "Duplicate room name"
-msgstr "Duplikat romnavn"
+#: ../../include/js_strings.php:38
+msgid "about a month"
+msgstr "omtrent en måned"
 
-#: ../../include/chat.php:82 ../../include/chat.php:90
-msgid "Invalid room specifier."
-msgstr "Ugyldig rom-spesifisering"
+#: ../../include/js_strings.php:39
+#, php-format
+msgid "%d months"
+msgstr "%d måneder"
 
-#: ../../include/chat.php:122
-msgid "Room not found."
-msgstr "Rommet ble ikke funnet."
+#: ../../include/js_strings.php:40
+msgid "about a year"
+msgstr "omtrent et år"
 
-#: ../../include/chat.php:133 ../../include/photos.php:26
-#: ../../include/attach.php:137 ../../include/attach.php:185
-#: ../../include/attach.php:248 ../../include/attach.php:262
-#: ../../include/attach.php:269 ../../include/attach.php:334
-#: ../../include/attach.php:348 ../../include/attach.php:355
-#: ../../include/attach.php:433 ../../include/attach.php:840
-#: ../../include/attach.php:911 ../../include/attach.php:1064
-#: ../../include/items.php:4342 ../../mod/achievements.php:30
-#: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
-#: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
-#: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
-#: ../../mod/mitem.php:111 ../../mod/connedit.php:348 ../../mod/mood.php:112
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
-#: ../../mod/poke.php:133 ../../mod/network.php:12 ../../mod/chat.php:91
-#: ../../mod/chat.php:96 ../../mod/message.php:16 ../../mod/channel.php:100
-#: ../../mod/channel.php:215 ../../mod/channel.php:255
-#: ../../mod/editpost.php:13 ../../mod/editblock.php:65 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:992 ../../mod/appman.php:66
-#: ../../mod/profile.php:64 ../../mod/profile.php:72 ../../mod/menu.php:74
-#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
-#: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/rate.php:110
-#: ../../mod/events.php:256 ../../mod/profile_photo.php:338
-#: ../../mod/profile_photo.php:351 ../../mod/mail.php:114
-#: ../../mod/webpages.php:69 ../../mod/register.php:72 ../../mod/blocks.php:69
-#: ../../mod/blocks.php:76 ../../mod/service_limits.php:7
-#: ../../mod/sources.php:66 ../../mod/regmod.php:17 ../../mod/thing.php:271
-#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/viewsrc.php:14
-#: ../../mod/settings.php:565 ../../mod/manage.php:6 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/connections.php:29
-#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
-#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
-#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
-#: ../../mod/group.php:9 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/locs.php:82
-#: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7
-#: ../../mod/suggest.php:26 ../../mod/profiles.php:188
-#: ../../mod/profiles.php:576 ../../index.php:178 ../../index.php:361
-msgid "Permission denied."
-msgstr "Tillatelse avslått."
+#: ../../include/js_strings.php:41
+#, php-format
+msgid "%d years"
+msgstr "%d år"
 
-#: ../../include/chat.php:143
-msgid "Room is full"
-msgstr "Rommet er fullt"
+#: ../../include/js_strings.php:42
+msgid " "
+msgstr " "
 
-#: ../../include/datetime.php:48
-msgid "Miscellaneous"
-msgstr "Forskjellig"
+#: ../../include/js_strings.php:43
+msgid "timeago.numbers"
+msgstr "timeago.numbers"
 
-#: ../../include/datetime.php:132
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "YYYY-MM-DD eller MM-DD"
+#: ../../include/js_strings.php:49
+msgctxt "long"
+msgid "May"
+msgstr "mai"
 
-#: ../../include/datetime.php:235 ../../mod/appman.php:91
-#: ../../mod/appman.php:92 ../../mod/events.php:689
-msgid "Required"
-msgstr "PÃ¥krevd"
+#: ../../include/js_strings.php:57
+msgid "Jan"
+msgstr "Jan"
 
-#: ../../include/datetime.php:262 ../../boot.php:2306
-msgid "never"
-msgstr "aldri"
+#: ../../include/js_strings.php:58
+msgid "Feb"
+msgstr "Feb"
 
-#: ../../include/datetime.php:268
-msgid "less than a second ago"
-msgstr "for mindre enn ett sekund siden"
+#: ../../include/js_strings.php:59
+msgid "Mar"
+msgstr "Mar"
 
-#: ../../include/datetime.php:271
-msgid "year"
-msgstr "Ã¥r"
+#: ../../include/js_strings.php:60
+msgid "Apr"
+msgstr "Apr"
 
-#: ../../include/datetime.php:271
-msgid "years"
-msgstr "Ã¥r"
+#: ../../include/js_strings.php:61
+msgctxt "short"
+msgid "May"
+msgstr "mai"
 
-#: ../../include/datetime.php:272
+#: ../../include/js_strings.php:62
+msgid "Jun"
+msgstr "Jun"
+
+#: ../../include/js_strings.php:63
+msgid "Jul"
+msgstr "Jul"
+
+#: ../../include/js_strings.php:64
+msgid "Aug"
+msgstr "Aug"
+
+#: ../../include/js_strings.php:65
+msgid "Sep"
+msgstr "Sep"
+
+#: ../../include/js_strings.php:66
+msgid "Oct"
+msgstr "Okt"
+
+#: ../../include/js_strings.php:67
+msgid "Nov"
+msgstr "Nov"
+
+#: ../../include/js_strings.php:68
+msgid "Dec"
+msgstr "Des"
+
+#: ../../include/js_strings.php:76
+msgid "Sun"
+msgstr "Søn"
+
+#: ../../include/js_strings.php:77
+msgid "Mon"
+msgstr "Man"
+
+#: ../../include/js_strings.php:78
+msgid "Tue"
+msgstr "Tirs"
+
+#: ../../include/js_strings.php:79
+msgid "Wed"
+msgstr "Ons"
+
+#: ../../include/js_strings.php:80
+msgid "Thu"
+msgstr "Tors"
+
+#: ../../include/js_strings.php:81
+msgid "Fri"
+msgstr "Fre"
+
+#: ../../include/js_strings.php:82
+msgid "Sat"
+msgstr "Lør"
+
+#: ../../include/js_strings.php:83
+msgctxt "calendar"
+msgid "today"
+msgstr "idag"
+
+#: ../../include/js_strings.php:84
+msgctxt "calendar"
 msgid "month"
 msgstr "måned"
 
-#: ../../include/datetime.php:272
-msgid "months"
-msgstr "måneder"
-
-#: ../../include/datetime.php:273
+#: ../../include/js_strings.php:85
+msgctxt "calendar"
 msgid "week"
 msgstr "uke"
 
-#: ../../include/datetime.php:273
-msgid "weeks"
-msgstr "uker"
-
-#: ../../include/datetime.php:274
+#: ../../include/js_strings.php:86
+msgctxt "calendar"
 msgid "day"
 msgstr "dag"
 
-#: ../../include/datetime.php:274
-msgid "days"
-msgstr "dager"
+#: ../../include/js_strings.php:87
+msgctxt "calendar"
+msgid "All day"
+msgstr "Hele dagen"
 
-#: ../../include/datetime.php:275
-msgid "hour"
-msgstr "time"
+#: ../../include/Import/import_diaspora.php:17
+msgid "No username found in import file."
+msgstr "Ingen brukernavn ble funnet i importfilen."
 
-#: ../../include/datetime.php:275
-msgid "hours"
-msgstr "timer"
+#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:487
+msgid "Import completed."
+msgstr "Import ferdig."
 
-#: ../../include/datetime.php:276
-msgid "minute"
-msgstr "minutt"
+#: ../../include/comanche.php:34 ../../mod/admin.php:356
+msgid "Default"
+msgstr "Standard"
 
-#: ../../include/datetime.php:276
-msgid "minutes"
-msgstr "minutter"
+#: ../../include/items.php:423 ../../mod/group.php:68 ../../mod/like.php:280
+#: ../../mod/dreport.php:6 ../../mod/dreport.php:45 ../../mod/subthread.php:58
+#: ../../mod/import_items.php:114 ../../mod/profperm.php:23
+#: ../../index.php:364
+msgid "Permission denied"
+msgstr "Tillatelse avvist"
 
-#: ../../include/datetime.php:277
-msgid "second"
-msgstr "sekund"
+#: ../../include/items.php:1130 ../../include/items.php:1176
+msgid "(Unknown)"
+msgstr "(Ukjent)"
 
-#: ../../include/datetime.php:277
-msgid "seconds"
-msgstr "sekunder"
+#: ../../include/items.php:1373
+msgid "Visible to anybody on the internet."
+msgstr "Synlig for enhver på Internett."
+
+#: ../../include/items.php:1375
+msgid "Visible to you only."
+msgstr "Synlig bare for deg."
+
+#: ../../include/items.php:1377
+msgid "Visible to anybody in this network."
+msgstr "Synlig for enhver i dette nettverket."
 
-#: ../../include/datetime.php:285
+#: ../../include/items.php:1379
+msgid "Visible to anybody authenticated."
+msgstr "Synlig for enhver som er autentisert."
+
+#: ../../include/items.php:1381
 #, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr "%1$d %2$s siden"
+msgid "Visible to anybody on %s."
+msgstr "Synlig for alle på %s."
+
+#: ../../include/items.php:1383
+msgid "Visible to all connections."
+msgstr "Synlig for alle forbindelser."
+
+#: ../../include/items.php:1385
+msgid "Visible to approved connections."
+msgstr "Synlig for godkjente forbindelser."
 
-#: ../../include/datetime.php:519
+#: ../../include/items.php:1387
+msgid "Visible to specific connections."
+msgstr "Synlig for spesifikke forbindelser."
+
+#: ../../include/items.php:4326 ../../mod/filestorage.php:27
+#: ../../mod/display.php:36 ../../mod/thing.php:86 ../../mod/admin.php:129
+#: ../../mod/admin.php:1017 ../../mod/admin.php:1222 ../../mod/viewsrc.php:20
+msgid "Item not found."
+msgstr "Elementet ble ikke funnet."
+
+#: ../../include/items.php:4838 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Collection not found."
+msgstr "Samlingen ble ikke funnet."
+
+#: ../../include/items.php:4854
+msgid "Collection is empty."
+msgstr "Samlingen er tom."
+
+#: ../../include/items.php:4861
 #, php-format
-msgid "%1$s's birthday"
-msgstr "%1$s sin fødselsdag"
+msgid "Collection: %s"
+msgstr "Samling: %s"
 
-#: ../../include/datetime.php:520
+#: ../../include/items.php:4871 ../../mod/connedit.php:683
 #, php-format
-msgid "Happy Birthday %1$s"
-msgstr "Gratulerer med dagen, %1$s !"
+msgid "Connection: %s"
+msgstr "Forbindelse: %s"
+
+#: ../../include/items.php:4873
+msgid "Connection not found."
+msgstr "Forbindelsen ble ikke funnet."
+
+#: ../../include/event.php:768
+msgid "This event has been added to your calendar."
+msgstr "Denne hendelsen er lagt til i din kalender."
+
+#: ../../include/event.php:967
+msgid "Not specified"
+msgstr "Ikke spesifisert"
+
+#: ../../include/event.php:968
+msgid "Needs Action"
+msgstr "Trenger handling"
+
+#: ../../include/event.php:969
+msgid "Completed"
+msgstr "Ferdig"
+
+#: ../../include/event.php:970
+msgid "In Process"
+msgstr "Igang"
+
+#: ../../include/event.php:971
+msgid "Cancelled"
+msgstr "Avbrutt"
+
+#: ../../include/identity.php:32
+msgid "Unable to obtain identity information from database"
+msgstr "Klarer ikke å få tak i identitetsinformasjon fra databasen"
+
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr "Mangler navn"
+
+#: ../../include/identity.php:69
+msgid "Name too long"
+msgstr "Navnet er for langt"
+
+#: ../../include/identity.php:181
+msgid "No account identifier"
+msgstr "Ingen kontoidentifikator"
+
+#: ../../include/identity.php:193
+msgid "Nickname is required."
+msgstr "Kallenavn er påkrevd."
+
+#: ../../include/identity.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Reservert kallenavn. Vennligst velg et annet."
+
+#: ../../include/identity.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Kallenavnet inneholder tegn som ikke er støttet eller det er allerede i bruk på dette nettstedet."
+
+#: ../../include/identity.php:288
+msgid "Unable to retrieve created identity"
+msgstr "Klarer ikke å hente den lagede identiteten"
+
+#: ../../include/identity.php:346
+msgid "Default Profile"
+msgstr "Standardprofil"
+
+#: ../../include/identity.php:390 ../../include/identity.php:391
+#: ../../include/identity.php:398 ../../include/widgets.php:430
+#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:573
+#: ../../mod/settings.php:338 ../../mod/settings.php:342
+#: ../../mod/settings.php:343 ../../mod/settings.php:346
+#: ../../mod/settings.php:357
+msgid "Friends"
+msgstr "Venner"
+
+#: ../../include/identity.php:770
+msgid "Requested channel is not available."
+msgstr "Forespurt kanal er ikke tilgjengelig."
+
+#: ../../include/identity.php:816 ../../mod/filestorage.php:54
+#: ../../mod/connect.php:13 ../../mod/achievements.php:11
+#: ../../mod/blocks.php:29 ../../mod/hcard.php:8 ../../mod/editwebpage.php:28
+#: ../../mod/profile.php:16 ../../mod/editblock.php:29
+#: ../../mod/editlayout.php:27 ../../mod/webpages.php:29
+#: ../../mod/layouts.php:29
+msgid "Requested profile is not available."
+msgstr "Forespurt profil er ikke tilgjengelig."
+
+#: ../../include/identity.php:960 ../../mod/profiles.php:782
+msgid "Change profile photo"
+msgstr "Endre profilbilde"
+
+#: ../../include/identity.php:966
+msgid "Profiles"
+msgstr "Profiler"
+
+#: ../../include/identity.php:966
+msgid "Manage/edit profiles"
+msgstr "HÃ¥ndtere/endre profiler"
+
+#: ../../include/identity.php:967 ../../mod/profiles.php:783
+msgid "Create New Profile"
+msgstr "Lag ny profil"
+
+#: ../../include/identity.php:970 ../../include/nav.php:90
+msgid "Edit Profile"
+msgstr "Endre profil"
+
+#: ../../include/identity.php:982 ../../mod/profiles.php:794
+msgid "Profile Image"
+msgstr "Profilbilde"
+
+#: ../../include/identity.php:985
+msgid "visible to everybody"
+msgstr "synlig for alle"
+
+#: ../../include/identity.php:986 ../../mod/profiles.php:677
+#: ../../mod/profiles.php:798
+msgid "Edit visibility"
+msgstr "Endre synlighet"
+
+#: ../../include/identity.php:1002 ../../include/identity.php:1242
+msgid "Gender:"
+msgstr "Kjønn:"
+
+#: ../../include/identity.php:1003 ../../include/identity.php:1286
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../include/identity.php:1004 ../../include/identity.php:1297
+msgid "Homepage:"
+msgstr "Hjemmeside:"
+
+#: ../../include/identity.php:1005
+msgid "Online Now"
+msgstr "Online nå"
+
+#: ../../include/identity.php:1089 ../../include/identity.php:1167
+#: ../../mod/ping.php:318
+msgid "g A l F d"
+msgstr "g A l F d"
+
+#: ../../include/identity.php:1090 ../../include/identity.php:1168
+msgid "F d"
+msgstr "F d"
+
+#: ../../include/identity.php:1135 ../../include/identity.php:1207
+#: ../../mod/ping.php:341
+msgid "[today]"
+msgstr "[idag]"
+
+#: ../../include/identity.php:1146
+msgid "Birthday Reminders"
+msgstr "Fødselsdagspåminnnelser"
+
+#: ../../include/identity.php:1147
+msgid "Birthdays this week:"
+msgstr "Fødselsdager denne uken:"
+
+#: ../../include/identity.php:1200
+msgid "[No description]"
+msgstr "[Ingen beskrivelse]"
+
+#: ../../include/identity.php:1218
+msgid "Event Reminders"
+msgstr "Hendelsespåminnelser"
+
+#: ../../include/identity.php:1219
+msgid "Events this week:"
+msgstr "Hendelser denne uken:"
+
+#: ../../include/identity.php:1232 ../../include/identity.php:1349
+#: ../../include/apps.php:138 ../../mod/profperm.php:112
+msgid "Profile"
+msgstr "Profil"
+
+#: ../../include/identity.php:1240 ../../mod/settings.php:1029
+msgid "Full Name:"
+msgstr "Fullt navn:"
+
+#: ../../include/identity.php:1247
+msgid "Like this channel"
+msgstr "Lik denne kanalen"
+
+#: ../../include/identity.php:1258 ../../include/taxonomy.php:414
+#: ../../include/conversation.php:1721 ../../include/ItemObject.php:179
+#: ../../mod/photos.php:1083
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Liker"
+msgstr[1] "Liker"
+
+#: ../../include/identity.php:1271
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: ../../include/identity.php:1272
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/identity.php:1279
+msgid "Birthday:"
+msgstr "Fødselsdag:"
+
+#: ../../include/identity.php:1283 ../../mod/directory.php:299
+msgid "Age:"
+msgstr "Alder:"
+
+#: ../../include/identity.php:1292
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "for %1$d %2$s"
+
+#: ../../include/identity.php:1295 ../../mod/profiles.php:699
+msgid "Sexual Preference:"
+msgstr "Seksuell preferanse:"
+
+#: ../../include/identity.php:1299 ../../mod/profiles.php:701
+#: ../../mod/directory.php:315
+msgid "Hometown:"
+msgstr "Hjemby:"
+
+#: ../../include/identity.php:1301
+msgid "Tags:"
+msgstr "Merkelapper:"
+
+#: ../../include/identity.php:1303 ../../mod/profiles.php:702
+msgid "Political Views:"
+msgstr "Politiske synspunkter:"
+
+#: ../../include/identity.php:1305
+msgid "Religion:"
+msgstr "Religion:"
+
+#: ../../include/identity.php:1307 ../../mod/directory.php:317
+msgid "About:"
+msgstr "Om:"
+
+#: ../../include/identity.php:1309
+msgid "Hobbies/Interests:"
+msgstr "Hobbyer/interesser:"
+
+#: ../../include/identity.php:1311 ../../mod/profiles.php:705
+msgid "Likes:"
+msgstr "Liker:"
+
+#: ../../include/identity.php:1313 ../../mod/profiles.php:706
+msgid "Dislikes:"
+msgstr "Misliker:"
+
+#: ../../include/identity.php:1315
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktinformasjon og sosiale nettverk:"
+
+#: ../../include/identity.php:1317
+msgid "My other channels:"
+msgstr "Mine andre kanaler:"
+
+#: ../../include/identity.php:1319
+msgid "Musical interests:"
+msgstr "Musikkinteresse:"
+
+#: ../../include/identity.php:1321
+msgid "Books, literature:"
+msgstr "Bøker, litteratur:"
+
+#: ../../include/identity.php:1323
+msgid "Television:"
+msgstr "TV:"
+
+#: ../../include/identity.php:1325
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/dans/kultur/underholdning:"
+
+#: ../../include/identity.php:1327
+msgid "Love/Romance:"
+msgstr "Kjærlighet/romantikk:"
+
+#: ../../include/identity.php:1329
+msgid "Work/employment:"
+msgstr "Arbeid/sysselsetting:"
+
+#: ../../include/identity.php:1331
+msgid "School/education:"
+msgstr "Skole/utdannelse:"
+
+#: ../../include/identity.php:1351
+msgid "Like this thing"
+msgstr "Lik denne tingen"
+
+#: ../../include/taxonomy.php:240 ../../include/taxonomy.php:261
+msgid "Tags"
+msgstr "Merkelapper"
+
+#: ../../include/taxonomy.php:282 ../../include/widgets.php:36
+#: ../../include/contact_widgets.php:95
+msgid "Categories"
+msgstr "Kategorier"
+
+#: ../../include/taxonomy.php:305
+msgid "Keywords"
+msgstr "Nøkkelord"
+
+#: ../../include/taxonomy.php:326
+msgid "have"
+msgstr "har"
+
+#: ../../include/taxonomy.php:326
+msgid "has"
+msgstr "har"
+
+#: ../../include/taxonomy.php:327
+msgid "want"
+msgstr "ønsker"
+
+#: ../../include/taxonomy.php:327
+msgid "wants"
+msgstr "ønsker"
+
+#: ../../include/taxonomy.php:328 ../../include/ItemObject.php:254
+msgid "like"
+msgstr "liker"
+
+#: ../../include/taxonomy.php:328
+msgid "likes"
+msgstr "liker"
+
+#: ../../include/taxonomy.php:329 ../../include/ItemObject.php:255
+msgid "dislike"
+msgstr "misliker"
+
+#: ../../include/taxonomy.php:329
+msgid "dislikes"
+msgstr "misliker"
+
+#: ../../include/photos.php:112
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Bilde overstiger nettstedets størrelsesbegrensning på %lu bytes"
+
+#: ../../include/photos.php:119
+msgid "Image file is empty."
+msgstr "Bildefilen er tom."
+
+#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
+msgid "Unable to process image"
+msgstr "Kan ikke behandle bildet"
+
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr "Bildelagring mislyktes."
+
+#: ../../include/photos.php:297
+msgid "a new photo"
+msgstr "et nytt bilde"
+
+#: ../../include/photos.php:301
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s la inn %2$s til %3$s"
+
+#: ../../include/photos.php:506 ../../include/conversation.php:1625
+msgid "Photo Albums"
+msgstr "Fotoalbum"
+
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Last opp nye bilder"
+
+#: ../../include/acl_selectors.php:240
+msgid "Visible to your default audience"
+msgstr "Synlig for ditt standard publikum"
+
+#: ../../include/acl_selectors.php:241
+msgid "Show"
+msgstr "Vis"
+
+#: ../../include/acl_selectors.php:242
+msgid "Don't show"
+msgstr "Ikke vis"
+
+#: ../../include/acl_selectors.php:247
+msgid "Other networks and post services"
+msgstr "Andre nettverk og innleggstjenester"
+
+#: ../../include/acl_selectors.php:249 ../../mod/filestorage.php:147
+#: ../../mod/thing.php:310 ../../mod/thing.php:356 ../../mod/photos.php:631
+#: ../../mod/photos.php:998 ../../mod/chat.php:211
+msgid "Permissions"
+msgstr "Tillatelser"
+
+#: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:384
+#: ../../mod/photos.php:1215
+msgid "Close"
+msgstr "Lukk"
+
+#: ../../include/activities.php:42
+msgid " and "
+msgstr "og"
+
+#: ../../include/activities.php:50
+msgid "public profile"
+msgstr "offentlig profil"
+
+#: ../../include/activities.php:59
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s endret %2$s til &ldquo;%3$s&rdquo;"
+
+#: ../../include/activities.php:60
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Besøk %1$s sitt %2$s"
+
+#: ../../include/activities.php:63
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s har oppdatert %2$s, endret %3$s."
+
+#: ../../include/attach.php:246 ../../include/attach.php:332
+msgid "Item was not found."
+msgstr "Elementet ble ikke funnet."
+
+#: ../../include/attach.php:496
+msgid "No source file."
+msgstr "Ingen kildefil."
+
+#: ../../include/attach.php:518
+msgid "Cannot locate file to replace"
+msgstr "Kan ikke finne filen som skal byttes ut"
+
+#: ../../include/attach.php:536
+msgid "Cannot locate file to revise/update"
+msgstr "Finner ikke filen som skal revideres/oppdateres"
+
+#: ../../include/attach.php:671
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Filens størrelse overgår grensen på %d"
+
+#: ../../include/attach.php:685
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Du har nådd din lagringsgrense for vedlegg på %1$.0f Mbytes."
+
+#: ../../include/attach.php:841
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Mislyktes med å laste opp filen. Mulig systemgrense eller handling avbrutt."
+
+#: ../../include/attach.php:854
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Lagret fil kunne ikke bekreftes. Opplasting mislyktes."
+
+#: ../../include/attach.php:902 ../../include/attach.php:918
+msgid "Path not available."
+msgstr "Stien er ikke tilgjengelig."
+
+#: ../../include/attach.php:964 ../../include/attach.php:1116
+msgid "Empty pathname"
+msgstr "Tomt sti-navn"
+
+#: ../../include/attach.php:990
+msgid "duplicate filename or path"
+msgstr "duplikat av filnavn eller sti"
+
+#: ../../include/attach.php:1012
+msgid "Path not found."
+msgstr "Stien ble ikke funnet."
+
+#: ../../include/attach.php:1070
+msgid "mkdir failed."
+msgstr "mkdir mislyktes."
+
+#: ../../include/attach.php:1074
+msgid "database storage failed."
+msgstr "databaselagring mislyktes."
+
+#: ../../include/attach.php:1122
+msgid "Empty path"
+msgstr "Tom sti"
+
+#: ../../include/notify.php:20
+msgid "created a new post"
+msgstr "laget et nytt innlegg"
+
+#: ../../include/notify.php:21
+#, php-format
+msgid "commented on %s's post"
+msgstr "kommenterte på %s sitt innlegg"
+
+#: ../../include/widgets.php:92 ../../include/nav.php:157
+#: ../../mod/apps.php:36
+msgid "Apps"
+msgstr "Apper"
+
+#: ../../include/widgets.php:93
+msgid "System"
+msgstr "System"
+
+#: ../../include/widgets.php:95 ../../include/conversation.php:1526
+msgid "Personal"
+msgstr "Personlig"
+
+#: ../../include/widgets.php:96
+msgid "Create Personal App"
+msgstr "Lag personlig app"
+
+#: ../../include/widgets.php:97
+msgid "Edit Personal App"
+msgstr "Endre personlig app"
+
+#: ../../include/widgets.php:139 ../../mod/suggest.php:54
+msgid "Ignore/Hide"
+msgstr "Ignorer/Skjul"
+
+#: ../../include/widgets.php:144 ../../mod/connections.php:125
+msgid "Suggestions"
+msgstr "Forslag"
+
+#: ../../include/widgets.php:145
+msgid "See more..."
+msgstr "Se mer..."
+
+#: ../../include/widgets.php:166
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Du har %1$.0f av %2$.0f tillate forbindelser."
+
+#: ../../include/widgets.php:172
+msgid "Add New Connection"
+msgstr "Legg til ny forbindelse"
+
+#: ../../include/widgets.php:173
+msgid "Enter the channel address"
+msgstr "Skriv kanal-adressen"
+
+#: ../../include/widgets.php:174
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Eksempel: ola.nordmann@eksempel.no, http://eksempel.no/karinordmann"
+
+#: ../../include/widgets.php:190
+msgid "Notes"
+msgstr "Merknader"
+
+#: ../../include/widgets.php:266
+msgid "Remove term"
+msgstr "Fjern begrep"
+
+#: ../../include/widgets.php:274 ../../include/features.php:72
+msgid "Saved Searches"
+msgstr "Lagrede søk"
+
+#: ../../include/widgets.php:275 ../../include/group.php:300
+msgid "add"
+msgstr "legg til"
+
+#: ../../include/widgets.php:304 ../../include/features.php:85
+#: ../../include/contact_widgets.php:57
+msgid "Saved Folders"
+msgstr "Lagrede mapper"
+
+#: ../../include/widgets.php:307 ../../include/contact_widgets.php:60
+#: ../../include/contact_widgets.php:98
+msgid "Everything"
+msgstr "Alt"
+
+#: ../../include/widgets.php:349
+msgid "Archives"
+msgstr "Arkiv"
+
+#: ../../include/widgets.php:428 ../../mod/connedit.php:571
+msgid "Me"
+msgstr "Meg"
+
+#: ../../include/widgets.php:429 ../../mod/connedit.php:572
+msgid "Family"
+msgstr "Familie"
+
+#: ../../include/widgets.php:431 ../../mod/connedit.php:574
+msgid "Acquaintances"
+msgstr "Bekjente"
+
+#: ../../include/widgets.php:432 ../../mod/connedit.php:575
+#: ../../mod/connections.php:88 ../../mod/connections.php:103
+msgid "All"
+msgstr "Alle"
+
+#: ../../include/widgets.php:451
+msgid "Refresh"
+msgstr "Forny"
+
+#: ../../include/widgets.php:485
+msgid "Account settings"
+msgstr "Kontoinnstillinger"
+
+#: ../../include/widgets.php:491
+msgid "Channel settings"
+msgstr "Kanalinnstillinger"
+
+#: ../../include/widgets.php:497
+msgid "Additional features"
+msgstr "Tilleggsfunksjoner"
+
+#: ../../include/widgets.php:503
+msgid "Feature/Addon settings"
+msgstr "Funksjons-/Tilleggsinnstillinger"
+
+#: ../../include/widgets.php:509
+msgid "Display settings"
+msgstr "Visningsinnstillinger"
+
+#: ../../include/widgets.php:515
+msgid "Connected apps"
+msgstr "Tilkoblede app-er"
+
+#: ../../include/widgets.php:521
+msgid "Export channel"
+msgstr "Eksporter kanal"
+
+#: ../../include/widgets.php:530 ../../mod/connedit.php:683
+msgid "Connection Default Permissions"
+msgstr "Forbindelsens standard tillatelser"
+
+#: ../../include/widgets.php:538
+msgid "Premium Channel Settings"
+msgstr "Premiumkanal-innstillinger"
+
+#: ../../include/widgets.php:546 ../../include/features.php:59
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Kanalkilder"
+
+#: ../../include/widgets.php:554 ../../include/nav.php:202
+#: ../../include/apps.php:134 ../../mod/admin.php:1076
+#: ../../mod/admin.php:1276
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: ../../include/widgets.php:568
+msgid "Private Mail Menu"
+msgstr "Meny for privat post"
+
+#: ../../include/widgets.php:570
+msgid "Combined View"
+msgstr "Kombinert visning"
+
+#: ../../include/widgets.php:575 ../../include/nav.php:191
+msgid "Inbox"
+msgstr "Innboks"
+
+#: ../../include/widgets.php:580 ../../include/nav.php:192
+msgid "Outbox"
+msgstr "Utboks"
+
+#: ../../include/widgets.php:585 ../../include/nav.php:193
+msgid "New Message"
+msgstr "Ny melding"
+
+#: ../../include/widgets.php:604 ../../include/widgets.php:616
+msgid "Conversations"
+msgstr "Samtaler"
+
+#: ../../include/widgets.php:608
+msgid "Received Messages"
+msgstr "Mottatte meldinger"
+
+#: ../../include/widgets.php:612
+msgid "Sent Messages"
+msgstr "Sendte meldinger"
+
+#: ../../include/widgets.php:626
+msgid "No messages."
+msgstr "Ingen meldinger."
+
+#: ../../include/widgets.php:644
+msgid "Delete conversation"
+msgstr "Slett samtale"
+
+#: ../../include/widgets.php:670
+msgid "Events Menu"
+msgstr "Meny for hendelser"
+
+#: ../../include/widgets.php:671
+msgid "Day View"
+msgstr "Dag"
+
+#: ../../include/widgets.php:672
+msgid "Week View"
+msgstr "Uke"
+
+#: ../../include/widgets.php:673
+msgid "Month View"
+msgstr "MÃ¥ned"
+
+#: ../../include/widgets.php:674 ../../mod/events.php:654
+msgid "Export"
+msgstr "Eksport"
+
+#: ../../include/widgets.php:675 ../../mod/events.php:657
+msgid "Import"
+msgstr "Importer"
+
+#: ../../include/widgets.php:685
+msgid "Events Tools"
+msgstr "Kalenderverktøy"
+
+#: ../../include/widgets.php:686
+msgid "Export Calendar"
+msgstr "Eksporter kalender"
+
+#: ../../include/widgets.php:687
+msgid "Import Calendar"
+msgstr "Importer kalender"
+
+#: ../../include/widgets.php:761
+msgid "Chat Rooms"
+msgstr "Chatrom"
+
+#: ../../include/widgets.php:781
+msgid "Bookmarked Chatrooms"
+msgstr "Bokmerkede chatrom"
+
+#: ../../include/widgets.php:801
+msgid "Suggested Chatrooms"
+msgstr "Foreslåtte chatrom"
+
+#: ../../include/widgets.php:928 ../../include/widgets.php:986
+msgid "photo/image"
+msgstr "foto/bilde"
+
+#: ../../include/widgets.php:1081 ../../include/widgets.php:1083
+msgid "Rate Me"
+msgstr "Vurder meg"
+
+#: ../../include/widgets.php:1087
+msgid "View Ratings"
+msgstr "Vis vurderinger"
+
+#: ../../include/widgets.php:1098
+msgid "Public Hubs"
+msgstr "Offentlige huber"
+
+#: ../../include/widgets.php:1146
+msgid "Forums"
+msgstr "Forum"
+
+#: ../../include/widgets.php:1175
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#: ../../include/widgets.php:1184
+msgid "Documentation"
+msgstr "Dokumentasjon"
+
+#: ../../include/widgets.php:1186
+msgid "Project/Site Information"
+msgstr "Prosjekt-/Nettstedsinformasjon"
+
+#: ../../include/widgets.php:1187
+msgid "For Members"
+msgstr "For medlemmer"
+
+#: ../../include/widgets.php:1188
+msgid "For Administrators"
+msgstr "For administratorer"
+
+#: ../../include/widgets.php:1189
+msgid "For Developers"
+msgstr "For utviklere"
+
+#: ../../include/widgets.php:1214 ../../mod/admin.php:446
+msgid "Site"
+msgstr "Nettsted"
+
+#: ../../include/widgets.php:1215
+msgid "Accounts"
+msgstr "Kontoer"
+
+#: ../../include/widgets.php:1216 ../../mod/admin.php:977
+msgid "Channels"
+msgstr "Kanaler"
+
+#: ../../include/widgets.php:1217 ../../mod/admin.php:1074
+#: ../../mod/admin.php:1114
+msgid "Plugins"
+msgstr "Tilleggsfunksjoner"
+
+#: ../../include/widgets.php:1218 ../../mod/admin.php:1274
+#: ../../mod/admin.php:1308
+msgid "Themes"
+msgstr "Temaer"
+
+#: ../../include/widgets.php:1219
+msgid "Inspect queue"
+msgstr "Inspiser kø"
+
+#: ../../include/widgets.php:1220
+msgid "Profile Config"
+msgstr "Profilinnstillinger"
+
+#: ../../include/widgets.php:1221
+msgid "DB updates"
+msgstr "Databaseoppdateringer"
+
+#: ../../include/widgets.php:1239 ../../include/widgets.php:1245
+#: ../../mod/admin.php:1393
+msgid "Logs"
+msgstr "Logger"
+
+#: ../../include/widgets.php:1243 ../../include/nav.php:210
+msgid "Admin"
+msgstr "Administrator"
+
+#: ../../include/widgets.php:1244
+msgid "Plugin Features"
+msgstr "Tilleggsfunksjoner"
+
+#: ../../include/widgets.php:1246
+msgid "User registrations waiting for confirmation"
+msgstr "Brukerregistreringer som venter på bekreftelse"
+
+#: ../../include/widgets.php:1324 ../../mod/photos.php:748
+#: ../../mod/photos.php:1283
+msgid "View Photo"
+msgstr "Vis foto"
+
+#: ../../include/widgets.php:1341 ../../mod/photos.php:779
+msgid "Edit Album"
+msgstr "Endre album"
+
+#: ../../include/bb2diaspora.php:376
+msgid "Attachments:"
+msgstr "Vedlegg:"
+
+#: ../../include/bb2diaspora.php:467
+msgid "$Projectname event notification:"
+msgstr "$Projectname hendelsesvarsling:"
+
+#: ../../include/bookmarks.php:35
+#, php-format
+msgid "%1$s's bookmarks"
+msgstr "%1$s sine bokmerker"
 
 #: ../../include/features.php:38
 msgid "General Features"
@@ -541,14 +1933,9 @@ msgstr "Store bilder"
 
 #: ../../include/features.php:58
 msgid ""
-"Include large (640px) photo thumbnails in posts. If not enabled, use small "
-"(320px) photo thumbnails"
-msgstr "Inkluder store (640px) miniatyrbilder i innlegg. Hvis denne ikke er skrudd på, bruk små (320px) miniatyrbilder."
-
-#: ../../include/features.php:59 ../../include/widgets.php:545
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr "Kanalkilder"
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr "Inkluder store (1024px) småbilder i innlegg. Hvis denne ikke er påskrudd, bruk små (640px) småbilder."
 
 #: ../../include/features.php:59
 msgid "Automatically import channel content from other channels or feeds"
@@ -564,630 +1951,487 @@ msgid ""
 msgstr "Tillat valgfri kryptering av innhold ende-til-ende via en delt hemmelig nøkkel"
 
 #: ../../include/features.php:61
-msgid "Enable voting tools"
+msgid "Enable Voting Tools"
 msgstr "Skru på verktøy for å stemme"
 
 #: ../../include/features.php:61
 msgid "Provide a class of post which others can vote on"
 msgstr "Tilby en type innlegg som andre kan stemme på"
 
-#: ../../include/features.php:67
+#: ../../include/features.php:62
+msgid "Delayed Posting"
+msgstr "Tidfest publisering"
+
+#: ../../include/features.php:62
+msgid "Allow posts to be published at a later date"
+msgstr "Tillat innlegg å bli publisert på et senere tidspunkt"
+
+#: ../../include/features.php:63
+msgid "Suppress Duplicate Posts/Comments"
+msgstr "Forhindre duplikat av innlegg/kommentarer"
+
+#: ../../include/features.php:63
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
+msgstr "Forhindre innlegg med identisk innhold fra å bli publisert hvis det er mindre enn to minutter mellom innsendingene."
+
+#: ../../include/features.php:69
 msgid "Network and Stream Filtering"
 msgstr "Nettverk- og strømfiltrering"
 
-#: ../../include/features.php:68
+#: ../../include/features.php:70
 msgid "Search by Date"
 msgstr "Søk etter dato"
 
-#: ../../include/features.php:68
+#: ../../include/features.php:70
 msgid "Ability to select posts by date ranges"
 msgstr "Mulighet for å velge innlegg etter datoområde"
 
-#: ../../include/features.php:69
+#: ../../include/features.php:71
 msgid "Collections Filter"
 msgstr "Filter for samlinger"
 
-#: ../../include/features.php:69
+#: ../../include/features.php:71
 msgid "Enable widget to display Network posts only from selected collections"
 msgstr "Skru på miniprogram for å vise Nettverksinnlegg bare fra valgte samlinger"
 
-#: ../../include/features.php:70 ../../include/widgets.php:273
-msgid "Saved Searches"
-msgstr "Lagrede søk"
-
-#: ../../include/features.php:70
+#: ../../include/features.php:72
 msgid "Save search terms for re-use"
 msgstr "Lagre søkeuttrykk for senere bruk"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:73
 msgid "Network Personal Tab"
 msgstr "Nettverk personlig fane"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:73
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Skru på fane for å bare vise Nettverksinnlegg som du har deltatt i"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:74
 msgid "Network New Tab"
 msgstr "Nettverk Ny fane"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:74
 msgid "Enable tab to display all new Network activity"
 msgstr "Skru på fane for å vise all ny nettverksaktivitet"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:75
 msgid "Affinity Tool"
 msgstr "Nærhetsverktøy"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:75
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filtrer strømaktiviteten etter releasjonsdybde"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:76
 msgid "Connection Filtering"
 msgstr "Filtrer forbindelser"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:76
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Filtrer innkommende innlegg fra forbindelser basert på nøkkelord/innhold"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:77
 msgid "Suggest Channels"
 msgstr "Foreslå kanaler"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:77
 msgid "Show channel suggestions"
 msgstr "Vis kanalforslag"
 
-#: ../../include/features.php:80
+#: ../../include/features.php:82
 msgid "Post/Comment Tools"
 msgstr "Innlegg-/Kommentar-verktøy"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:83
 msgid "Tagging"
 msgstr "Merking"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:83
 msgid "Ability to tag existing posts"
 msgstr "Mulighet til å merke eksisterende meldinger"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:84
 msgid "Post Categories"
 msgstr "Innleggskategorier"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:84
 msgid "Add categories to your posts"
 msgstr "Legg kategorier til dine innlegg"
 
-#: ../../include/features.php:83 ../../include/contact_widgets.php:57
-#: ../../include/widgets.php:303
-msgid "Saved Folders"
-msgstr "Lagrede mapper"
-
-#: ../../include/features.php:83
+#: ../../include/features.php:85
 msgid "Ability to file posts under folders"
 msgstr "Mulighet til å sortere innlegg i mapper"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:86
 msgid "Dislike Posts"
 msgstr "Mislik innlegg"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:86
 msgid "Ability to dislike posts/comments"
 msgstr "Mulighet til å mislike innlegg/kommentarer"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:87
 msgid "Star Posts"
 msgstr "Stjerneinnlegg"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:87
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Mulighet til å merke spesielle innlegg med en stjerne"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:88
 msgid "Tag Cloud"
 msgstr "Merkelappsky"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:88
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Tilby en personlig merkelappsky på din kanalside"
 
-#: ../../include/comanche.php:34 ../../mod/admin.php:348
-msgid "Default"
-msgstr "Standard"
-
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
-msgstr "Slett dette elementet?"
-
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:673
-#: ../../mod/photos.php:1008 ../../mod/photos.php:1126
-msgid "Comment"
-msgstr "Kommentar"
-
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:390
-msgid "[+] show all"
-msgstr "[+] Vis alle"
-
-#: ../../include/js_strings.php:8
-msgid "[-] show less"
-msgstr "[-] Vis mindre"
-
-#: ../../include/js_strings.php:9
-msgid "[+] expand"
-msgstr "[+] Utvid"
-
-#: ../../include/js_strings.php:10
-msgid "[-] collapse"
-msgstr "[-] Lukk"
-
-#: ../../include/js_strings.php:11
-msgid "Password too short"
-msgstr "Passordet er for kort"
-
-#: ../../include/js_strings.php:12
-msgid "Passwords do not match"
-msgstr "Passordene er ikke like"
-
-#: ../../include/js_strings.php:13 ../../mod/photos.php:41
-msgid "everybody"
-msgstr "alle"
-
-#: ../../include/js_strings.php:14
-msgid "Secret Passphrase"
-msgstr "Hemmelig passordsetning"
-
-#: ../../include/js_strings.php:15
-msgid "Passphrase hint"
-msgstr "Hint om passordsetning"
-
-#: ../../include/js_strings.php:16
-msgid "Notice: Permissions have changed but have not yet been submitted."
-msgstr "Varsel: Tillatelser har blitt endret, men de har ennå ikke blitt sendt inn."
-
-#: ../../include/js_strings.php:17
-msgid "close all"
-msgstr "Lukk alle"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
+msgid "Male"
+msgstr "Mannlig"
 
-#: ../../include/js_strings.php:18
-msgid "Nothing new here"
-msgstr "Ikke noe nytt her"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
+msgid "Female"
+msgstr "Kvinnelig"
 
-#: ../../include/js_strings.php:19
-msgid "Rate This Channel (this is public)"
-msgstr "Vurder denne kanalen (dette er offentlig)"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "For tiden mann"
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:667
-#: ../../mod/rate.php:156
-msgid "Rating"
-msgstr "Vurdering"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "For tiden kvinne"
 
-#: ../../include/js_strings.php:21
-msgid "Describe (optional)"
-msgstr "Beskriv (valgfritt)"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "For det meste mann"
 
-#: ../../include/js_strings.php:22 ../../include/ItemObject.php:674
-#: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
-#: ../../mod/connedit.php:688 ../../mod/mood.php:135 ../../mod/pconfig.php:108
-#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:181
-#: ../../mod/chat.php:209 ../../mod/admin.php:411 ../../mod/admin.php:776
-#: ../../mod/admin.php:940 ../../mod/admin.php:1072 ../../mod/admin.php:1266
-#: ../../mod/admin.php:1351 ../../mod/appman.php:99 ../../mod/pdledit.php:58
-#: ../../mod/photos.php:598 ../../mod/photos.php:969 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1127 ../../mod/rate.php:167 ../../mod/events.php:534
-#: ../../mod/events.php:710 ../../mod/mail.php:364 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/import.php:511 ../../mod/thing.php:313
-#: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/settings.php:583
-#: ../../mod/settings.php:695 ../../mod/settings.php:723
-#: ../../mod/settings.php:746 ../../mod/settings.php:831
-#: ../../mod/settings.php:1020 ../../mod/xchan.php:11 ../../mod/group.php:81
-#: ../../mod/connect.php:93 ../../mod/locs.php:108 ../../mod/setup.php:331
-#: ../../mod/setup.php:371 ../../mod/profiles.php:667
-#: ../../mod/import_items.php:122 ../../view/theme/redbasic/php/config.php:99
-msgid "Submit"
-msgstr "Send"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "For det meste kvinne"
 
-#: ../../include/js_strings.php:23
-msgid "Please enter a link URL"
-msgstr "Vennligst skriv inn en lenke URL:"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transkjønnet"
 
-#: ../../include/js_strings.php:24
-msgid "Unsaved changes. Are you sure you wish to leave this page?"
-msgstr "Endringene er ikke lagret. Er du sikker på at du ønsker å forlate denne siden?"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "interkjønnet"
 
-#: ../../include/js_strings.php:26
-msgid "timeago.prefixAgo"
-msgstr "timeago.prefixAgo"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transseksuell"
 
-#: ../../include/js_strings.php:27
-msgid "timeago.prefixFromNow"
-msgstr "timeago.prefixFromNow"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Hermafroditt"
 
-#: ../../include/js_strings.php:28
-msgid "ago"
-msgstr "siden"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Intetkjønn"
 
-#: ../../include/js_strings.php:29
-msgid "from now"
-msgstr "fra nå"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "Ubestemt"
 
-#: ../../include/js_strings.php:30
-msgid "less than a minute"
-msgstr "mindre enn ett minutt"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+#: ../../include/profile_selectors.php:61
+#: ../../include/profile_selectors.php:97 ../../include/permissions.php:871
+msgid "Other"
+msgstr "Annen"
 
-#: ../../include/js_strings.php:31
-msgid "about a minute"
-msgstr "omtrent et minutt"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Ubestemt"
 
-#: ../../include/js_strings.php:32
-#, php-format
-msgid "%d minutes"
-msgstr "%d minutter"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Males"
+msgstr "Menn"
 
-#: ../../include/js_strings.php:33
-msgid "about an hour"
-msgstr "omtrent en time"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Females"
+msgstr "Kvinner"
 
-#: ../../include/js_strings.php:34
-#, php-format
-msgid "about %d hours"
-msgstr "omtrent %d timer"
+#: ../../include/profile_selectors.php:42
+msgid "Gay"
+msgstr "Homo"
 
-#: ../../include/js_strings.php:35
-msgid "a day"
-msgstr "en dag"
+#: ../../include/profile_selectors.php:42
+msgid "Lesbian"
+msgstr "Lesbisk"
 
-#: ../../include/js_strings.php:36
-#, php-format
-msgid "%d days"
-msgstr "%d dager"
+#: ../../include/profile_selectors.php:42
+msgid "No Preference"
+msgstr "Ingen preferanse"
 
-#: ../../include/js_strings.php:37
-msgid "about a month"
-msgstr "omtrent en måned"
+#: ../../include/profile_selectors.php:42
+msgid "Bisexual"
+msgstr "Biseksuell"
 
-#: ../../include/js_strings.php:38
-#, php-format
-msgid "%d months"
-msgstr "%d måneder"
+#: ../../include/profile_selectors.php:42
+msgid "Autosexual"
+msgstr "Autoseksuell"
 
-#: ../../include/js_strings.php:39
-msgid "about a year"
-msgstr "omtrent et år"
+#: ../../include/profile_selectors.php:42
+msgid "Abstinent"
+msgstr "Avholdende"
 
-#: ../../include/js_strings.php:40
-#, php-format
-msgid "%d years"
-msgstr "%d år"
+#: ../../include/profile_selectors.php:42
+msgid "Virgin"
+msgstr "Jomfru"
 
-#: ../../include/js_strings.php:41
-msgid " "
-msgstr " "
+#: ../../include/profile_selectors.php:42
+msgid "Deviant"
+msgstr "Avviker"
 
-#: ../../include/js_strings.php:42
-msgid "timeago.numbers"
-msgstr "timeago.numbers"
+#: ../../include/profile_selectors.php:42
+msgid "Fetish"
+msgstr "Fetisj"
 
-#: ../../include/js_strings.php:44 ../../include/text.php:1144
-msgid "January"
-msgstr "januar"
+#: ../../include/profile_selectors.php:42
+msgid "Oodles"
+msgstr "Masse"
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1144
-msgid "February"
-msgstr "februar"
+#: ../../include/profile_selectors.php:42
+msgid "Nonsexual"
+msgstr "Ikke-seksuell"
 
-#: ../../include/js_strings.php:46 ../../include/text.php:1144
-msgid "March"
-msgstr "mars"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Single"
+msgstr "Enslig"
 
-#: ../../include/js_strings.php:47 ../../include/text.php:1144
-msgid "April"
-msgstr "april"
+#: ../../include/profile_selectors.php:80
+msgid "Lonely"
+msgstr "Ensom"
 
-#: ../../include/js_strings.php:48
-msgctxt "long"
-msgid "May"
-msgstr "mai"
+#: ../../include/profile_selectors.php:80
+msgid "Available"
+msgstr "Tilgjengelig"
 
-#: ../../include/js_strings.php:49 ../../include/text.php:1144
-msgid "June"
-msgstr "juni"
+#: ../../include/profile_selectors.php:80
+msgid "Unavailable"
+msgstr "Ikke tilgjengelig"
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1144
-msgid "July"
-msgstr "juli"
+#: ../../include/profile_selectors.php:80
+msgid "Has crush"
+msgstr "Er forelsket"
 
-#: ../../include/js_strings.php:51 ../../include/text.php:1144
-msgid "August"
-msgstr "august"
+#: ../../include/profile_selectors.php:80
+msgid "Infatuated"
+msgstr "Betatt"
 
-#: ../../include/js_strings.php:52 ../../include/text.php:1144
-msgid "September"
-msgstr "september"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Dating"
+msgstr "Sammen med"
 
-#: ../../include/js_strings.php:53 ../../include/text.php:1144
-msgid "October"
-msgstr "oktober"
+#: ../../include/profile_selectors.php:80
+msgid "Unfaithful"
+msgstr "Utro"
 
-#: ../../include/js_strings.php:54 ../../include/text.php:1144
-msgid "November"
-msgstr "november"
+#: ../../include/profile_selectors.php:80
+msgid "Sex Addict"
+msgstr "Sexavhengig"
 
-#: ../../include/js_strings.php:55 ../../include/text.php:1144
-msgid "December"
-msgstr "desember"
+#: ../../include/profile_selectors.php:80
+msgid "Friends/Benefits"
+msgstr "Venner med frynsegoder"
 
-#: ../../include/js_strings.php:56
-msgid "Jan"
-msgstr "Jan"
+#: ../../include/profile_selectors.php:80
+msgid "Casual"
+msgstr "Tilfeldig"
 
-#: ../../include/js_strings.php:57
-msgid "Feb"
-msgstr "Feb"
+#: ../../include/profile_selectors.php:80
+msgid "Engaged"
+msgstr "Forlovet"
 
-#: ../../include/js_strings.php:58
-msgid "Mar"
-msgstr "Mar"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Married"
+msgstr "Gift"
 
-#: ../../include/js_strings.php:59
-msgid "Apr"
-msgstr "Apr"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily married"
+msgstr "Gift i fantasien"
 
-#: ../../include/js_strings.php:60
-msgctxt "short"
-msgid "May"
-msgstr "mai"
+#: ../../include/profile_selectors.php:80
+msgid "Partners"
+msgstr "Partnere"
 
-#: ../../include/js_strings.php:61
-msgid "Jun"
-msgstr "Jun"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Cohabiting"
+msgstr "Samboer"
 
-#: ../../include/js_strings.php:62
-msgid "Jul"
-msgstr "Jul"
+#: ../../include/profile_selectors.php:80
+msgid "Common law"
+msgstr "Samboer"
 
-#: ../../include/js_strings.php:63
-msgid "Aug"
-msgstr "Aug"
+#: ../../include/profile_selectors.php:80
+msgid "Happy"
+msgstr "Lykkelig"
 
-#: ../../include/js_strings.php:64
-msgid "Sep"
-msgstr "Sep"
+#: ../../include/profile_selectors.php:80
+msgid "Not looking"
+msgstr "Ikke på utkikk"
 
-#: ../../include/js_strings.php:65
-msgid "Oct"
-msgstr "Okt"
+#: ../../include/profile_selectors.php:80
+msgid "Swinger"
+msgstr "Partnerbytte"
 
-#: ../../include/js_strings.php:66
-msgid "Nov"
-msgstr "Nov"
+#: ../../include/profile_selectors.php:80
+msgid "Betrayed"
+msgstr "Bedratt"
 
-#: ../../include/js_strings.php:67
-msgid "Dec"
-msgstr "Des"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Separated"
+msgstr "Separert"
 
-#: ../../include/js_strings.php:68 ../../include/text.php:1140
-msgid "Sunday"
-msgstr "søndag"
+#: ../../include/profile_selectors.php:80
+msgid "Unstable"
+msgstr "Ustabilt"
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1140
-msgid "Monday"
-msgstr "mandag"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Divorced"
+msgstr "Skilt"
 
-#: ../../include/js_strings.php:70 ../../include/text.php:1140
-msgid "Tuesday"
-msgstr "tirsdag"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily divorced"
+msgstr "Skilt i fantasien"
 
-#: ../../include/js_strings.php:71 ../../include/text.php:1140
-msgid "Wednesday"
-msgstr "onsdag"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Widowed"
+msgstr "Enke"
 
-#: ../../include/js_strings.php:72 ../../include/text.php:1140
-msgid "Thursday"
-msgstr "torsdag"
+#: ../../include/profile_selectors.php:80
+msgid "Uncertain"
+msgstr "Usikkert"
 
-#: ../../include/js_strings.php:73 ../../include/text.php:1140
-msgid "Friday"
-msgstr "fredag"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "It's complicated"
+msgstr "Det er komplisert"
 
-#: ../../include/js_strings.php:74 ../../include/text.php:1140
-msgid "Saturday"
-msgstr "lørdag"
+#: ../../include/profile_selectors.php:80
+msgid "Don't care"
+msgstr "Bryr meg ikke"
 
-#: ../../include/js_strings.php:75
-msgid "Sun"
-msgstr "Søn"
+#: ../../include/profile_selectors.php:80
+msgid "Ask me"
+msgstr "Spør meg"
 
-#: ../../include/js_strings.php:76
-msgid "Mon"
-msgstr "Man"
+#: ../../include/datetime.php:48
+msgid "Miscellaneous"
+msgstr "Forskjellig"
 
-#: ../../include/js_strings.php:77
-msgid "Tue"
-msgstr "Tirs"
+#: ../../include/datetime.php:132
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "YYYY-MM-DD eller MM-DD"
 
-#: ../../include/js_strings.php:78
-msgid "Wed"
-msgstr "Ons"
+#: ../../include/datetime.php:236 ../../mod/appman.php:91
+#: ../../mod/appman.php:92 ../../mod/events.php:437 ../../mod/events.php:442
+msgid "Required"
+msgstr "PÃ¥krevd"
 
-#: ../../include/js_strings.php:79
-msgid "Thu"
-msgstr "Tors"
+#: ../../include/datetime.php:263 ../../boot.php:2291
+msgid "never"
+msgstr "aldri"
 
-#: ../../include/js_strings.php:80
-msgid "Fri"
-msgstr "Fre"
+#: ../../include/datetime.php:269
+msgid "less than a second ago"
+msgstr "for mindre enn ett sekund siden"
 
-#: ../../include/js_strings.php:81
-msgid "Sat"
-msgstr "Lør"
+#: ../../include/datetime.php:272
+msgid "year"
+msgstr "Ã¥r"
 
-#: ../../include/js_strings.php:82
-msgctxt "calendar"
-msgid "today"
-msgstr "idag"
+#: ../../include/datetime.php:272
+msgid "years"
+msgstr "Ã¥r"
 
-#: ../../include/js_strings.php:83
-msgctxt "calendar"
+#: ../../include/datetime.php:273
 msgid "month"
 msgstr "måned"
 
-#: ../../include/js_strings.php:84
-msgctxt "calendar"
+#: ../../include/datetime.php:273
+msgid "months"
+msgstr "måneder"
+
+#: ../../include/datetime.php:274
 msgid "week"
 msgstr "uke"
 
-#: ../../include/js_strings.php:85
-msgctxt "calendar"
+#: ../../include/datetime.php:274
+msgid "weeks"
+msgstr "uker"
+
+#: ../../include/datetime.php:275
 msgid "day"
 msgstr "dag"
 
-#: ../../include/js_strings.php:86
-msgctxt "calendar"
-msgid "All day"
-msgstr "Hele dagen"
-
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr "Ofte"
-
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr "Hver time"
-
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr "To ganger daglig"
-
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "Daglig"
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Ukentlig"
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "MÃ¥nedlig"
-
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/contact_selectors.php:79 ../../mod/id.php:15
-#: ../../mod/id.php:16 ../../mod/admin.php:779 ../../mod/admin.php:788
-#: ../../boot.php:1499
-msgid "Email"
-msgstr "E-post"
-
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
-msgstr "Zot!"
-
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr "LinkedIn"
+#: ../../include/datetime.php:275
+msgid "days"
+msgstr "dager"
 
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
+#: ../../include/datetime.php:276
+msgid "hour"
+msgstr "time"
 
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
-msgstr "MySpace"
+#: ../../include/datetime.php:276
+msgid "hours"
+msgstr "timer"
 
-#: ../../include/activities.php:42
-msgid " and "
-msgstr "og"
+#: ../../include/datetime.php:277
+msgid "minute"
+msgstr "minutt"
 
-#: ../../include/activities.php:50
-msgid "public profile"
-msgstr "offentlig profil"
+#: ../../include/datetime.php:277
+msgid "minutes"
+msgstr "minutter"
 
-#: ../../include/activities.php:59
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s endret %2$s til &ldquo;%3$s&rdquo;"
+#: ../../include/datetime.php:278
+msgid "second"
+msgstr "sekund"
 
-#: ../../include/activities.php:60
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Besøk %1$s sitt %2$s"
+#: ../../include/datetime.php:278
+msgid "seconds"
+msgstr "sekunder"
 
-#: ../../include/activities.php:63
+#: ../../include/datetime.php:286
 #, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s har oppdatert %2$s, endret %3$s."
-
-#: ../../include/Contact.php:101 ../../include/conversation.php:947
-#: ../../include/identity.php:941 ../../include/widgets.php:136
-#: ../../include/widgets.php:174 ../../mod/directory.php:316
-#: ../../mod/match.php:64 ../../mod/suggest.php:52
-msgid "Connect"
-msgstr "Koble"
-
-#: ../../include/Contact.php:118
-msgid "New window"
-msgstr "Nytt vindu"
-
-#: ../../include/Contact.php:119
-msgid "Open the selected location in a different window or browser tab"
-msgstr "Ã…pne det valgte stedet i et annet vindu eller nettleser-fane"
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr "%1$d %2$s siden"
 
-#: ../../include/Contact.php:237
+#: ../../include/datetime.php:520
 #, php-format
-msgid "User '%s' deleted"
-msgstr "Brukeren '%s' er slettet"
+msgid "%1$s's birthday"
+msgstr "%1$s sin fødselsdag"
 
-#: ../../include/dba/dba_driver.php:141
+#: ../../include/datetime.php:521
 #, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "Kan ikke finne DNS-informasjon om databasetjener '%s'"
-
-#: ../../include/conversation.php:120 ../../include/text.php:1832
-#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
-msgid "photo"
-msgstr "foto"
+msgid "Happy Birthday %1$s"
+msgstr "Gratulerer med dagen, %1$s !"
 
-#: ../../include/conversation.php:123 ../../include/text.php:1835
-#: ../../include/event.php:896 ../../mod/like.php:363 ../../mod/tagger.php:47
-#: ../../mod/events.php:245
-msgid "event"
-msgstr "hendelse"
+#: ../../include/api.php:1336
+msgid "Public Timeline"
+msgstr "Offentlig tidslinje"
 
 #: ../../include/conversation.php:126 ../../mod/like.php:113
 msgid "channel"
 msgstr "kanal"
 
-#: ../../include/conversation.php:148 ../../include/text.php:1838
-#: ../../mod/like.php:361 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
-msgid "status"
-msgstr "status"
-
-#: ../../include/conversation.php:150 ../../include/text.php:1840
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr "kommentar"
-
 #: ../../include/conversation.php:164 ../../mod/like.php:410
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -1208,629 +2452,790 @@ msgstr "%1$s er nå forbundet med %2$s"
 msgid "%1$s poked %2$s"
 msgstr "%1$s prikket %2$s"
 
-#: ../../include/conversation.php:243 ../../include/text.php:933
-msgid "poked"
-msgstr "prikket"
-
 #: ../../include/conversation.php:260 ../../mod/mood.php:63
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s er %2$s"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1024
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Likes"
 msgstr "Liker"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1024
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Liker ikke"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Agree"
 msgstr "Enig"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Disagree"
 msgstr "Uenig"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Abstain"
 msgstr "Avstår"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Attending"
 msgstr "Deltar"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Not attending"
 msgstr "Deltar ikke"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Might attend"
 msgstr "Deltar kanskje"
 
-#: ../../include/conversation.php:661 ../../include/ItemObject.php:126
+#: ../../include/conversation.php:656 ../../include/ItemObject.php:126
 msgid "Select"
 msgstr "Velg"
 
-#: ../../include/conversation.php:669 ../../include/ItemObject.php:89
+#: ../../include/conversation.php:664 ../../include/ItemObject.php:89
 msgid "Private Message"
 msgstr "Privat melding"
 
-#: ../../include/conversation.php:676 ../../include/ItemObject.php:227
+#: ../../include/conversation.php:671 ../../include/ItemObject.php:227
 msgid "Message signature validated"
 msgstr "Innleggets signatur er bekreftet"
 
-#: ../../include/conversation.php:677 ../../include/ItemObject.php:228
+#: ../../include/conversation.php:672 ../../include/ItemObject.php:228
 msgid "Message signature incorrect"
 msgstr "Innleggets signatur er feil"
 
-#: ../../include/conversation.php:694
+#: ../../include/conversation.php:691
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Vis %s sin profile @ %s"
 
-#: ../../include/conversation.php:709
+#: ../../include/conversation.php:710
 msgid "Categories:"
 msgstr "Kategorier:"
 
-#: ../../include/conversation.php:710
+#: ../../include/conversation.php:711
 msgid "Filed under:"
 msgstr "Sortert under:"
 
-#: ../../include/conversation.php:718 ../../include/ItemObject.php:314
+#: ../../include/conversation.php:719 ../../include/ItemObject.php:334
 #, php-format
 msgid "from %s"
 msgstr "fra %s"
 
-#: ../../include/conversation.php:721 ../../include/ItemObject.php:317
+#: ../../include/conversation.php:722 ../../include/ItemObject.php:337
 #, php-format
 msgid "last edited: %s"
 msgstr "sist endret: %s"
 
-#: ../../include/conversation.php:722 ../../include/ItemObject.php:318
+#: ../../include/conversation.php:723 ../../include/ItemObject.php:338
 #, php-format
 msgid "Expires: %s"
 msgstr "Utløper: %s"
 
-#: ../../include/conversation.php:737
+#: ../../include/conversation.php:738
 msgid "View in context"
 msgstr "Vis i sammenheng"
 
-#: ../../include/conversation.php:739 ../../include/conversation.php:1212
-#: ../../include/ItemObject.php:366 ../../mod/editpost.php:130
-#: ../../mod/editblock.php:150 ../../mod/photos.php:990 ../../mod/mail.php:237
-#: ../../mod/mail.php:365 ../../mod/editlayout.php:148
-#: ../../mod/editwebpage.php:190
+#: ../../include/conversation.php:740 ../../include/conversation.php:1227
+#: ../../include/ItemObject.php:389 ../../mod/editwebpage.php:190
+#: ../../mod/editblock.php:150 ../../mod/editlayout.php:148
+#: ../../mod/photos.php:1026 ../../mod/editpost.php:129
 msgid "Please wait"
 msgstr "Vennligst vent"
 
-#: ../../include/conversation.php:848
+#: ../../include/conversation.php:850
 msgid "remove"
 msgstr "fjern"
 
-#: ../../include/conversation.php:852 ../../include/nav.php:241
+#: ../../include/conversation.php:854 ../../include/nav.php:241
 msgid "Loading..."
 msgstr "Laster..."
 
-#: ../../include/conversation.php:853
+#: ../../include/conversation.php:855
 msgid "Delete Selected Items"
 msgstr "Slett valgte elementer"
 
-#: ../../include/conversation.php:941
+#: ../../include/conversation.php:946
 msgid "View Source"
 msgstr "Vis kilde"
 
-#: ../../include/conversation.php:942
+#: ../../include/conversation.php:947
 msgid "Follow Thread"
 msgstr "Følg tråd"
 
-#: ../../include/conversation.php:943
+#: ../../include/conversation.php:948
+msgid "Unfollow Thread"
+msgstr "Ikke følg tråd"
+
+#: ../../include/conversation.php:949
 msgid "View Status"
 msgstr "Vis status"
 
-#: ../../include/conversation.php:944 ../../include/nav.php:86
-#: ../../mod/connedit.php:494
+#: ../../include/conversation.php:950 ../../include/nav.php:86
+#: ../../mod/connedit.php:498
 msgid "View Profile"
 msgstr "Vis profil"
 
-#: ../../include/conversation.php:945
+#: ../../include/conversation.php:951
 msgid "View Photos"
 msgstr "Vis bilder"
 
-#: ../../include/conversation.php:946
+#: ../../include/conversation.php:952
 msgid "Activity/Posts"
 msgstr "Aktivitet/Innlegg"
 
-#: ../../include/conversation.php:948
+#: ../../include/conversation.php:954
 msgid "Edit Connection"
 msgstr "Endre forbindelse"
 
-#: ../../include/conversation.php:949
+#: ../../include/conversation.php:955
 msgid "Send PM"
 msgstr "Send privat melding"
 
-#: ../../include/conversation.php:950 ../../include/apps.php:145
+#: ../../include/conversation.php:956 ../../include/apps.php:145
 msgid "Poke"
 msgstr "Prikk"
 
-#: ../../include/conversation.php:1064
+#: ../../include/conversation.php:1070
 #, php-format
 msgid "%s likes this."
 msgstr "%s liker dette."
 
-#: ../../include/conversation.php:1064
+#: ../../include/conversation.php:1070
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s liker ikke dette."
 
-#: ../../include/conversation.php:1068
+#: ../../include/conversation.php:1074
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] "<span %1$s>%2$d person</span> liker dette."
 msgstr[1] "<span %1$s>%2$d personer</span> liker dette."
 
-#: ../../include/conversation.php:1070
+#: ../../include/conversation.php:1076
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] "<span %1$s>%2$d person</span> liker ikke dette."
 msgstr[1] "<span %1$s>%2$d personer</span> liker ikke dette."
 
-#: ../../include/conversation.php:1076
+#: ../../include/conversation.php:1082
 msgid "and"
 msgstr "og"
 
-#: ../../include/conversation.php:1079
+#: ../../include/conversation.php:1085
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ", og %d annen person"
 msgstr[1] ", og %d andre personer"
 
-#: ../../include/conversation.php:1080
+#: ../../include/conversation.php:1086
 #, php-format
 msgid "%s like this."
 msgstr "%s liker dette."
 
-#: ../../include/conversation.php:1080
+#: ../../include/conversation.php:1086
 #, php-format
 msgid "%s don't like this."
 msgstr "%s liker ikke dette."
 
-#: ../../include/conversation.php:1143
+#: ../../include/conversation.php:1154
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Synlig for <strong>alle</strong>"
 
-#: ../../include/conversation.php:1144 ../../mod/mail.php:170
-#: ../../mod/mail.php:299
+#: ../../include/conversation.php:1155 ../../mod/mail.php:202
+#: ../../mod/mail.php:316
 msgid "Please enter a link URL:"
 msgstr "Vennligst skriv inn en lenke URL:"
 
-#: ../../include/conversation.php:1145
+#: ../../include/conversation.php:1156
 msgid "Please enter a video link/URL:"
 msgstr "Vennligst skriv en videolenke/URL:"
 
-#: ../../include/conversation.php:1146
+#: ../../include/conversation.php:1157
 msgid "Please enter an audio link/URL:"
 msgstr "Vennligst skriv en lydlenke/URL:"
 
-#: ../../include/conversation.php:1147
+#: ../../include/conversation.php:1158
 msgid "Tag term:"
 msgstr "Merkelapp:"
 
-#: ../../include/conversation.php:1148 ../../mod/filer.php:48
+#: ../../include/conversation.php:1159 ../../mod/filer.php:48
 msgid "Save to Folder:"
 msgstr "Lagre til mappe:"
 
-#: ../../include/conversation.php:1149
+#: ../../include/conversation.php:1160
 msgid "Where are you right now?"
 msgstr "Hvor er du akkurat nå?"
 
-#: ../../include/conversation.php:1150 ../../mod/editpost.php:54
-#: ../../mod/mail.php:171 ../../mod/mail.php:300
+#: ../../include/conversation.php:1161 ../../mod/editpost.php:56
+#: ../../mod/mail.php:203 ../../mod/mail.php:317
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Utløper YYYY-MM-DD HH:MM"
 
-#: ../../include/conversation.php:1158 ../../include/page_widgets.php:40
-#: ../../include/ItemObject.php:683 ../../mod/editpost.php:150
-#: ../../mod/editblock.php:171 ../../mod/photos.php:1010
-#: ../../mod/events.php:707 ../../mod/webpages.php:188
-#: ../../mod/editwebpage.php:212
+#: ../../include/conversation.php:1169 ../../include/page_widgets.php:40
+#: ../../include/ItemObject.php:706 ../../mod/editwebpage.php:212
+#: ../../mod/editblock.php:171 ../../mod/webpages.php:188
+#: ../../mod/photos.php:1046 ../../mod/editpost.php:149
+#: ../../mod/events.php:458
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#: ../../include/conversation.php:1177 ../../mod/layouts.php:184
-#: ../../mod/photos.php:989 ../../mod/webpages.php:182
-#: ../../mod/blocks.php:154
+#: ../../include/conversation.php:1192 ../../mod/blocks.php:154
+#: ../../mod/webpages.php:182 ../../mod/layouts.php:184
+#: ../../mod/photos.php:1025
 msgid "Share"
 msgstr "Del"
 
-#: ../../include/conversation.php:1179
+#: ../../include/conversation.php:1194
 msgid "Page link name"
 msgstr "Sidens lenkenavn"
 
-#: ../../include/conversation.php:1182
+#: ../../include/conversation.php:1197
 msgid "Post as"
 msgstr "Lag innlegg som"
 
-#: ../../include/conversation.php:1184 ../../include/ItemObject.php:675
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:136
-#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
+#: ../../include/conversation.php:1199 ../../include/ItemObject.php:698
+#: ../../mod/editwebpage.php:177 ../../mod/editblock.php:136
+#: ../../mod/editlayout.php:135 ../../mod/editpost.php:113
 msgid "Bold"
 msgstr "Uthevet"
 
-#: ../../include/conversation.php:1185 ../../include/ItemObject.php:676
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:137
-#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
+#: ../../include/conversation.php:1200 ../../include/ItemObject.php:699
+#: ../../mod/editwebpage.php:178 ../../mod/editblock.php:137
+#: ../../mod/editlayout.php:136 ../../mod/editpost.php:114
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../include/conversation.php:1186 ../../include/ItemObject.php:677
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:138
-#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
+#: ../../include/conversation.php:1201 ../../include/ItemObject.php:700
+#: ../../mod/editwebpage.php:179 ../../mod/editblock.php:138
+#: ../../mod/editlayout.php:137 ../../mod/editpost.php:115
 msgid "Underline"
 msgstr "Understreket"
 
-#: ../../include/conversation.php:1187 ../../include/ItemObject.php:678
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:139
-#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
+#: ../../include/conversation.php:1202 ../../include/ItemObject.php:701
+#: ../../mod/editwebpage.php:180 ../../mod/editblock.php:139
+#: ../../mod/editlayout.php:138 ../../mod/editpost.php:116
 msgid "Quote"
 msgstr "Sitat"
 
-#: ../../include/conversation.php:1188 ../../include/ItemObject.php:679
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:140
-#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
+#: ../../include/conversation.php:1203 ../../include/ItemObject.php:702
+#: ../../mod/editwebpage.php:181 ../../mod/editblock.php:140
+#: ../../mod/editlayout.php:139 ../../mod/editpost.php:117
 msgid "Code"
 msgstr "Kode"
 
-#: ../../include/conversation.php:1189 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:142 ../../mod/mail.php:234 ../../mod/mail.php:361
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:182
+#: ../../include/conversation.php:1204 ../../mod/editwebpage.php:182
+#: ../../mod/editblock.php:142 ../../mod/editlayout.php:140
+#: ../../mod/editpost.php:118
 msgid "Upload photo"
 msgstr "Last opp bilde"
 
-#: ../../include/conversation.php:1190
+#: ../../include/conversation.php:1205
 msgid "upload photo"
 msgstr "last opp bilde"
 
-#: ../../include/conversation.php:1191 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:143 ../../mod/mail.php:235 ../../mod/mail.php:362
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183
+#: ../../include/conversation.php:1206 ../../mod/editwebpage.php:183
+#: ../../mod/editblock.php:143 ../../mod/editlayout.php:141
+#: ../../mod/editpost.php:119 ../../mod/mail.php:248 ../../mod/mail.php:378
 msgid "Attach file"
 msgstr "Legg ved fil"
 
-#: ../../include/conversation.php:1192
+#: ../../include/conversation.php:1207
 msgid "attach file"
 msgstr "legg ved fil"
 
-#: ../../include/conversation.php:1193 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:144 ../../mod/mail.php:236 ../../mod/mail.php:363
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184
+#: ../../include/conversation.php:1208 ../../mod/editwebpage.php:184
+#: ../../mod/editblock.php:144 ../../mod/editlayout.php:142
+#: ../../mod/editpost.php:120 ../../mod/mail.php:249 ../../mod/mail.php:379
 msgid "Insert web link"
 msgstr "Sett inn web-lenke"
 
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1209
 msgid "web link"
 msgstr "web-lenke"
 
-#: ../../include/conversation.php:1195
+#: ../../include/conversation.php:1210
 msgid "Insert video link"
 msgstr "Sett inn videolenke"
 
-#: ../../include/conversation.php:1196
+#: ../../include/conversation.php:1211
 msgid "video link"
 msgstr "videolenke"
 
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1212
 msgid "Insert audio link"
 msgstr "Sett inn lenke til lyd"
 
-#: ../../include/conversation.php:1198
+#: ../../include/conversation.php:1213
 msgid "audio link"
 msgstr "lenke til lyd"
 
-#: ../../include/conversation.php:1199 ../../mod/editpost.php:125
+#: ../../include/conversation.php:1214 ../../mod/editwebpage.php:188
 #: ../../mod/editblock.php:148 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:188
+#: ../../mod/editpost.php:124
 msgid "Set your location"
 msgstr "Angi din plassering"
 
-#: ../../include/conversation.php:1200
+#: ../../include/conversation.php:1215
 msgid "set location"
 msgstr "angi plassering"
 
-#: ../../include/conversation.php:1201 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1216 ../../mod/editpost.php:126
 msgid "Toggle voting"
 msgstr "Skru av eller på stemming"
 
-#: ../../include/conversation.php:1204 ../../mod/editpost.php:126
+#: ../../include/conversation.php:1219 ../../mod/editwebpage.php:189
 #: ../../mod/editblock.php:149 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:189
+#: ../../mod/editpost.php:125
 msgid "Clear browser location"
 msgstr "Fjern nettleserplassering"
 
-#: ../../include/conversation.php:1205
+#: ../../include/conversation.php:1220
 msgid "clear location"
 msgstr "fjern plassering"
 
-#: ../../include/conversation.php:1207 ../../mod/editpost.php:142
-#: ../../mod/editblock.php:162 ../../mod/editwebpage.php:205
+#: ../../include/conversation.php:1222 ../../mod/editwebpage.php:205
+#: ../../mod/editblock.php:162 ../../mod/editpost.php:141
 msgid "Title (optional)"
 msgstr "Tittel (valgfri)"
 
-#: ../../include/conversation.php:1211 ../../mod/editpost.php:144
+#: ../../include/conversation.php:1226 ../../mod/editwebpage.php:207
 #: ../../mod/editblock.php:165 ../../mod/editlayout.php:163
-#: ../../mod/editwebpage.php:207
+#: ../../mod/editpost.php:143
 msgid "Categories (optional, comma-separated list)"
 msgstr "Kategorier (valgfri, kommaseparert liste)"
 
-#: ../../include/conversation.php:1213 ../../mod/editpost.php:131
+#: ../../include/conversation.php:1228 ../../mod/editwebpage.php:191
 #: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
-#: ../../mod/editwebpage.php:191
+#: ../../mod/editpost.php:130 ../../mod/events.php:459
 msgid "Permission settings"
 msgstr "Tillatelser - innstillinger"
 
-#: ../../include/conversation.php:1214
+#: ../../include/conversation.php:1229
 msgid "permissions"
 msgstr "tillatelser"
 
-#: ../../include/conversation.php:1222 ../../mod/editpost.php:139
+#: ../../include/conversation.php:1237 ../../mod/editwebpage.php:200
 #: ../../mod/editblock.php:159 ../../mod/editlayout.php:156
-#: ../../mod/editwebpage.php:200
+#: ../../mod/editpost.php:138
 msgid "Public post"
 msgstr "Offentlig innlegg"
 
-#: ../../include/conversation.php:1224 ../../mod/editpost.php:145
+#: ../../include/conversation.php:1239 ../../mod/editwebpage.php:208
 #: ../../mod/editblock.php:166 ../../mod/editlayout.php:164
-#: ../../mod/editwebpage.php:208
+#: ../../mod/editpost.php:144
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Eksempel: ola@eksempel.no, kari@eksempel.no"
 
-#: ../../include/conversation.php:1237 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:176 ../../mod/mail.php:241 ../../mod/mail.php:368
-#: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217
+#: ../../include/conversation.php:1252 ../../mod/editwebpage.php:217
+#: ../../mod/editblock.php:176 ../../mod/editlayout.php:173
+#: ../../mod/editpost.php:155 ../../mod/mail.php:253 ../../mod/mail.php:383
 msgid "Set expiration date"
 msgstr "Angi utløpsdato"
 
-#: ../../include/conversation.php:1239 ../../include/ItemObject.php:686
-#: ../../mod/editpost.php:158 ../../mod/mail.php:243 ../../mod/mail.php:370
+#: ../../include/conversation.php:1255
+msgid "Set publish date"
+msgstr "Angi publiseringsdato"
+
+#: ../../include/conversation.php:1257 ../../include/ItemObject.php:709
+#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385
 msgid "Encrypt text"
 msgstr "Krypter tekst"
 
-#: ../../include/conversation.php:1241 ../../mod/editpost.php:160
-#: ../../mod/events.php:691
+#: ../../include/conversation.php:1259 ../../mod/editpost.php:159
 msgid "OK"
 msgstr "OK"
 
-#: ../../include/conversation.php:1242 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
-#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-#: ../../mod/settings.php:584 ../../mod/settings.php:610
+#: ../../include/conversation.php:1260 ../../mod/fbrowser.php:77
+#: ../../mod/fbrowser.php:112 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
+#: ../../mod/editpost.php:160
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../../include/conversation.php:1485
+#: ../../include/conversation.php:1503
 msgid "Discover"
 msgstr "Oppdage"
 
-#: ../../include/conversation.php:1488
+#: ../../include/conversation.php:1506
 msgid "Imported public streams"
 msgstr "Importerte offentlige strømmer"
 
-#: ../../include/conversation.php:1493
+#: ../../include/conversation.php:1511
 msgid "Commented Order"
 msgstr "Kommentert"
 
-#: ../../include/conversation.php:1496
+#: ../../include/conversation.php:1514
 msgid "Sort by Comment Date"
 msgstr "Sorter etter kommentert dato"
 
-#: ../../include/conversation.php:1500
+#: ../../include/conversation.php:1518
 msgid "Posted Order"
 msgstr "Lagt inn"
 
-#: ../../include/conversation.php:1503
+#: ../../include/conversation.php:1521
 msgid "Sort by Post Date"
 msgstr "Sorter etter innleggsdato"
 
-#: ../../include/conversation.php:1508 ../../include/widgets.php:94
-msgid "Personal"
-msgstr "Personlig"
-
-#: ../../include/conversation.php:1511
+#: ../../include/conversation.php:1529
 msgid "Posts that mention or involve you"
 msgstr "Innlegg som nevner eller involverer deg"
 
-#: ../../include/conversation.php:1517 ../../mod/menu.php:112
-#: ../../mod/connections.php:72 ../../mod/connections.php:82
+#: ../../include/conversation.php:1535 ../../mod/connections.php:72
+#: ../../mod/connections.php:82 ../../mod/menu.php:112
 msgid "New"
 msgstr "Nye"
 
-#: ../../include/conversation.php:1520
+#: ../../include/conversation.php:1538
 msgid "Activity Stream - by date"
 msgstr "Aktivitetsstrøm - etter dato"
 
-#: ../../include/conversation.php:1526
+#: ../../include/conversation.php:1544
 msgid "Starred"
 msgstr "Stjerne"
 
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1547
 msgid "Favourite Posts"
 msgstr "Favorittinnlegg"
 
-#: ../../include/conversation.php:1536
+#: ../../include/conversation.php:1554
 msgid "Spam"
 msgstr "Søppel"
 
-#: ../../include/conversation.php:1539
+#: ../../include/conversation.php:1557
 msgid "Posts flagged as SPAM"
 msgstr "Innlegg merket som SØPPEL"
 
-#: ../../include/conversation.php:1583 ../../mod/admin.php:947
+#: ../../include/conversation.php:1601 ../../mod/admin.php:985
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../../include/conversation.php:1586
+#: ../../include/conversation.php:1604
 msgid "Status Messages and Posts"
 msgstr "Statusmeldinger og -innlegg"
 
-#: ../../include/conversation.php:1595
+#: ../../include/conversation.php:1613
 msgid "About"
 msgstr "Om"
 
-#: ../../include/conversation.php:1598
+#: ../../include/conversation.php:1616
 msgid "Profile Details"
 msgstr "Profildetaljer"
 
-#: ../../include/conversation.php:1604 ../../include/apps.php:139
-#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
+#: ../../include/conversation.php:1622 ../../include/nav.php:92
+#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr "Bilder"
 
-#: ../../include/conversation.php:1607 ../../include/photos.php:422
-msgid "Photo Albums"
-msgstr "Fotoalbum"
-
-#: ../../include/conversation.php:1614
+#: ../../include/conversation.php:1632
 msgid "Files and Storage"
 msgstr "Filer og lagring"
 
-#: ../../include/conversation.php:1624 ../../include/conversation.php:1627
+#: ../../include/conversation.php:1642 ../../include/conversation.php:1645
 msgid "Chatrooms"
 msgstr "Chatrom"
 
-#: ../../include/conversation.php:1637 ../../include/apps.php:129
-#: ../../include/nav.php:103
+#: ../../include/conversation.php:1655 ../../include/nav.php:103
+#: ../../include/apps.php:129
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: ../../include/conversation.php:1640
+#: ../../include/conversation.php:1658
 msgid "Saved Bookmarks"
 msgstr "Lagrede bokmerker"
 
-#: ../../include/conversation.php:1647 ../../include/apps.php:136
-#: ../../include/nav.php:107 ../../mod/webpages.php:178
+#: ../../include/conversation.php:1665 ../../include/nav.php:107
+#: ../../include/apps.php:136 ../../mod/webpages.php:178
 msgid "Webpages"
 msgstr "Websider"
 
-#: ../../include/conversation.php:1650
+#: ../../include/conversation.php:1668
 msgid "Manage Webpages"
 msgstr "HÃ¥ndtere websider"
 
-#: ../../include/conversation.php:1679 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1043
-#: ../../mod/photos.php:1055
+#: ../../include/conversation.php:1697 ../../include/ItemObject.php:175
+#: ../../include/ItemObject.php:187 ../../mod/photos.php:1079
+#: ../../mod/photos.php:1091
 msgid "View all"
 msgstr "Vis alle"
 
-#: ../../include/conversation.php:1703 ../../include/taxonomy.php:403
-#: ../../include/identity.php:1252 ../../include/ItemObject.php:179
-#: ../../mod/photos.php:1047
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Liker"
-msgstr[1] "Liker"
-
-#: ../../include/conversation.php:1706 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1052
+#: ../../include/conversation.php:1724 ../../include/ItemObject.php:184
+#: ../../mod/photos.php:1088
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "Liker ikke"
 msgstr[1] "Liker ikke"
 
-#: ../../include/conversation.php:1709
+#: ../../include/conversation.php:1727
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Deltar"
 msgstr[1] "Deltar"
 
-#: ../../include/conversation.php:1712
+#: ../../include/conversation.php:1730
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Deltar ikke"
 msgstr[1] "Deltar ikke"
 
-#: ../../include/conversation.php:1715
+#: ../../include/conversation.php:1733
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Ikke bestemt"
 msgstr[1] "Ikke bestemt"
 
-#: ../../include/conversation.php:1718
+#: ../../include/conversation.php:1736
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "Enig"
 msgstr[1] "Enige"
 
-#: ../../include/conversation.php:1721
+#: ../../include/conversation.php:1739
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "Uenig"
 msgstr[1] "Uenige"
 
-#: ../../include/conversation.php:1724
+#: ../../include/conversation.php:1742
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "Avstår"
 msgstr[1] "Avstår"
 
-#: ../../include/api.php:1290
-msgid "Public Timeline"
-msgstr "Offentlig tidslinje"
+#: ../../include/auth.php:132
+msgid "Logged out."
+msgstr "Logget ut."
+
+#: ../../include/auth.php:273
+msgid "Failed authentication"
+msgstr "Mislykket autentisering"
+
+#: ../../include/auth.php:287 ../../mod/openid.php:189
+msgid "Login failed."
+msgstr "Innlogging mislyktes."
+
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr "Ofte"
+
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr "Hver time"
+
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr "To ganger daglig"
+
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr "Daglig"
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Ukentlig"
 
-#: ../../include/photos.php:109
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "MÃ¥nedlig"
+
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/contact_selectors.php:79 ../../mod/id.php:15
+#: ../../mod/id.php:16 ../../mod/admin.php:817 ../../mod/admin.php:826
+#: ../../boot.php:1490
+msgid "Email"
+msgstr "E-post"
+
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr "Zot!"
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:794
+#: ../../include/bbcode.php:797 ../../include/bbcode.php:802
+#: ../../include/bbcode.php:805 ../../include/bbcode.php:808
+#: ../../include/bbcode.php:811 ../../include/bbcode.php:816
+#: ../../include/bbcode.php:819 ../../include/bbcode.php:824
+#: ../../include/bbcode.php:827 ../../include/bbcode.php:830
+#: ../../include/bbcode.php:833
+msgid "Image/photo"
+msgstr "Bilde/fotografi"
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:844
+msgid "Encrypted content"
+msgstr "Kryptert innhold"
+
+#: ../../include/bbcode.php:179
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Bilde overstiger nettstedets størrelsesbegrensning på %lu bytes"
+msgid "Install %s element: "
+msgstr "Installer %s element:"
 
-#: ../../include/photos.php:116
-msgid "Image file is empty."
-msgstr "Bildefilen er tom."
+#: ../../include/bbcode.php:183
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Dette innlegget inneholder det installerbare elementet %s, men du mangler tillatelse til å installere det på dette nettstedet."
 
-#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
-msgid "Unable to process image"
-msgstr "Kan ikke behandle bildet"
+#: ../../include/bbcode.php:193 ../../mod/impel.php:37
+msgid "webpage"
+msgstr "nettside"
 
-#: ../../include/photos.php:219
-msgid "Photo storage failed."
-msgstr "Bildelagring mislyktes."
+#: ../../include/bbcode.php:196 ../../mod/impel.php:47
+msgid "layout"
+msgstr "layout"
 
-#: ../../include/photos.php:426
-msgid "Upload New Photos"
-msgstr "Last opp nye bilder"
+#: ../../include/bbcode.php:199 ../../mod/impel.php:42
+msgid "block"
+msgstr "byggekloss"
+
+#: ../../include/bbcode.php:202 ../../mod/impel.php:54
+msgid "menu"
+msgstr "meny"
+
+#: ../../include/bbcode.php:257
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s skrev følgende %2$s %3$s"
+
+#: ../../include/bbcode.php:259 ../../mod/tagger.php:51
+msgid "post"
+msgstr "innlegg"
+
+#: ../../include/bbcode.php:547
+msgid "Different viewers will see this text differently"
+msgstr "Denne teksten vil se forskjellig ut for ulike besøkende"
+
+#: ../../include/bbcode.php:755
+msgid "$1 spoiler"
+msgstr "$1 avsløring"
+
+#: ../../include/bbcode.php:782
+msgid "$1 wrote:"
+msgstr "$1 skrev:"
+
+#: ../../include/contact_widgets.php:14
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitasjon tilgjengelig"
+msgstr[1] "%d invitasjoner tilgjengelig"
+
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:451
+msgid "Advanced"
+msgstr "Avansert"
+
+#: ../../include/contact_widgets.php:22
+msgid "Find Channels"
+msgstr "Finn kanaler"
+
+#: ../../include/contact_widgets.php:23
+msgid "Enter name or interest"
+msgstr "Skriv navn eller interesse"
+
+#: ../../include/contact_widgets.php:24
+msgid "Connect/Follow"
+msgstr "Forbindelse/Følg"
+
+#: ../../include/contact_widgets.php:25
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Eksempler: Ola Nordmann, fisking"
+
+#: ../../include/contact_widgets.php:26 ../../mod/directory.php:381
+#: ../../mod/directory.php:386 ../../mod/connections.php:266
+msgid "Find"
+msgstr "Finn"
+
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:385
+#: ../../mod/suggest.php:60
+msgid "Channel Suggestions"
+msgstr "Kanalforslag"
+
+#: ../../include/contact_widgets.php:29
+msgid "Random Profile"
+msgstr "Tilfeldig profil"
+
+#: ../../include/contact_widgets.php:30
+msgid "Invite Friends"
+msgstr "Inviter venner"
 
-#: ../../include/enotify.php:57 ../../include/network.php:1613
+#: ../../include/contact_widgets.php:32
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Avansert eksempel: navn=fred og land=island"
+
+#: ../../include/contact_widgets.php:128
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d forbindelse felles"
+msgstr[1] "%d forbindelser felles"
+
+#: ../../include/contact_widgets.php:133
+msgid "show more"
+msgstr "vis mer"
+
+#: ../../include/enotify.php:57 ../../include/network.php:1608
 msgid "$Projectname Notification"
 msgstr "$Projectname varsling"
 
-#: ../../include/enotify.php:58 ../../include/network.php:1614
+#: ../../include/enotify.php:58 ../../include/network.php:1609
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../include/enotify.php:60 ../../include/network.php:1616
+#: ../../include/enotify.php:60 ../../include/network.php:1611
 msgid "Thank You,"
 msgstr "Tusen takk,"
 
-#: ../../include/enotify.php:62 ../../include/network.php:1618
+#: ../../include/enotify.php:62 ../../include/network.php:1613
 #, php-format
 msgid "%s Administrator"
 msgstr "%s administrator"
@@ -1842,8 +3247,8 @@ msgstr "%s <!item_type!>"
 
 #: ../../include/enotify.php:100
 #, php-format
-msgid "[Red:Notify] New mail received at %s"
-msgstr "[Red:Notify] Ny melding mottatt hos %s"
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr "[Hubzilla:Notify] Ny melding mottatt hos %s"
 
 #: ../../include/enotify.php:102
 #, php-format
@@ -1864,814 +3269,187 @@ msgstr "en privat melding"
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Vennligst besøk %s for å se og/eller svare på dine private meldinger."
 
-#: ../../include/enotify.php:158
+#: ../../include/enotify.php:160
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s, %2$s kommenterte på [zrl=%3$s]a %4$s[/zrl]"
 
-#: ../../include/enotify.php:166
+#: ../../include/enotify.php:168
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr "%1$s, %2$s kommenterte på [zrl=%3$s]%4$s's %5$s[/zrl]"
 
-#: ../../include/enotify.php:175
+#: ../../include/enotify.php:177
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s, %2$s kommenterte på [zrl=%3$s]din %4$s[/zrl]"
 
-#: ../../include/enotify.php:186
+#: ../../include/enotify.php:188
 #, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Red:Notify] Kommentar til samtale #%1$d av %2$s"
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Hubzilla:Notify] Kommentar til samtale #%1$d av %2$s"
 
-#: ../../include/enotify.php:187
+#: ../../include/enotify.php:189
 #, php-format
 msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr "%1$s, %2$s kommenterte på et element eller en samtale du følger"
 
-#: ../../include/enotify.php:190 ../../include/enotify.php:205
-#: ../../include/enotify.php:231 ../../include/enotify.php:249
-#: ../../include/enotify.php:263
+#: ../../include/enotify.php:192 ../../include/enotify.php:207
+#: ../../include/enotify.php:233 ../../include/enotify.php:251
+#: ../../include/enotify.php:265
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Vennligst besøk %s for å se og/eller svare i samtalen"
 
-#: ../../include/enotify.php:196
+#: ../../include/enotify.php:198
 #, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
-msgstr "[Red:Notify] %s skrev et innlegg på din profilvegg"
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr "[Hubzilla:Notify] %s skrev et innlegg på din profilvegg"
 
-#: ../../include/enotify.php:198
+#: ../../include/enotify.php:200
 #, php-format
 msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr "%1$s, %2$s skrev et innlegg på din profilvegg på %3$s"
 
-#: ../../include/enotify.php:200
+#: ../../include/enotify.php:202
 #, php-format
 msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr "%1$s, %2$s skrev et innlegg på [zrl=%3$s]din vegg[/zrl]"
 
-#: ../../include/enotify.php:224
+#: ../../include/enotify.php:226
 #, php-format
-msgid "[Red:Notify] %s tagged you"
-msgstr "[Red:Notify] %s merket deg"
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr "[Hubzilla:Notify] %s merket deg"
 
-#: ../../include/enotify.php:225
+#: ../../include/enotify.php:227
 #, php-format
 msgid "%1$s, %2$s tagged you at %3$s"
 msgstr "%1$s, %2$s merket deg på %3$s"
 
-#: ../../include/enotify.php:226
+#: ../../include/enotify.php:228
 #, php-format
 msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%3$s]merket deg[/zrl]."
 
-#: ../../include/enotify.php:238
+#: ../../include/enotify.php:240
 #, php-format
-msgid "[Red:Notify] %1$s poked you"
-msgstr "[Red:Notify] %1$s prikket deg"
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr "[Hubzilla:Notify] %1$s prikket deg"
 
-#: ../../include/enotify.php:239
+#: ../../include/enotify.php:241
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
 msgstr "%1$s, %2$s dyttet deg på %3$s"
 
-#: ../../include/enotify.php:240
+#: ../../include/enotify.php:242
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s, %2$s [zrl=%2$s]dyttet deg[/zrl]."
 
-#: ../../include/enotify.php:256
+#: ../../include/enotify.php:258
 #, php-format
-msgid "[Red:Notify] %s tagged your post"
-msgstr "[Red:Notify] %s merket ditt innlegg"
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr "[Hubzilla:Notify] %s merket ditt innlegg"
 
-#: ../../include/enotify.php:257
+#: ../../include/enotify.php:259
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr "%1$s, %2$s merket ditt innlegg på %3$s"
 
-#: ../../include/enotify.php:258
+#: ../../include/enotify.php:260
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr "%1$s, %2$s merket [zrl=%3$s]ditt innlegg[/zrl]"
 
-#: ../../include/enotify.php:270
-msgid "[Red:Notify] Introduction received"
-msgstr "[Red:Notify] Introduksjon mottatt"
+#: ../../include/enotify.php:272
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr "[Hubzilla:Notify] Introduksjon mottatt"
 
-#: ../../include/enotify.php:271
+#: ../../include/enotify.php:273
 #, php-format
 msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
 msgstr "%1$s, du har mottatt en ny forespørsel om forbindelse fra '%2$s' hos %3$s"
 
-#: ../../include/enotify.php:272
+#: ../../include/enotify.php:274
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr "%1$s, du mottok [zrl=%2$s]en ny forespørsel om forbindelse[/zrl] fra %3$s."
 
-#: ../../include/enotify.php:276 ../../include/enotify.php:295
+#: ../../include/enotify.php:278 ../../include/enotify.php:297
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Du kan besøke profilen deres på %s"
 
-#: ../../include/enotify.php:278
+#: ../../include/enotify.php:280
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr "Vennligst besøk %s for å godkjenne eller avslå forespørselen om forbindelse."
 
-#: ../../include/enotify.php:285
-msgid "[Red:Notify] Friend suggestion received"
-msgstr "[Red:Notify] Venneforslag mottatt"
+#: ../../include/enotify.php:287
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr "[Hubzilla:Notify] Venneforslag mottatt"
 
-#: ../../include/enotify.php:286
+#: ../../include/enotify.php:288
 #, php-format
 msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr "%1$s, du har mottatt en venneforespørsel fra '%2$s' hos %3$s"
 
-#: ../../include/enotify.php:287
+#: ../../include/enotify.php:289
 #, php-format
 msgid ""
 "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
 "%4$s."
 msgstr "%1$s, du har mottatt [zrl=%2$s]et venneforslaget[/zrl] angående %3$s fra %4$s. "
 
-#: ../../include/enotify.php:293
+#: ../../include/enotify.php:295
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../../include/enotify.php:294
+#: ../../include/enotify.php:296
 msgid "Photo:"
 msgstr "Bilde:"
 
-#: ../../include/enotify.php:297
+#: ../../include/enotify.php:299
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Vennligst besøk %s for å godkjenne eller avslå dette forslaget."
 
-#: ../../include/enotify.php:508
-msgid "[Red:Notify]"
-msgstr "[Red:Notify]"
-
-#: ../../include/network.php:635
-msgid "view full size"
-msgstr "vis full størrelse"
-
-#: ../../include/network.php:1660 ../../include/account.php:314
-#: ../../include/account.php:341 ../../include/account.php:401
-msgid "Administrator"
-msgstr "Administrator"
-
-#: ../../include/network.php:1674
-msgid "No Subject"
-msgstr "Uten emne"
-
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
-msgstr "%1$s sine bokmerker"
-
-#: ../../include/text.php:391
-msgid "prev"
-msgstr "forrige"
-
-#: ../../include/text.php:393
-msgid "first"
-msgstr "første"
-
-#: ../../include/text.php:422
-msgid "last"
-msgstr "siste"
-
-#: ../../include/text.php:425
-msgid "next"
-msgstr "neste"
-
-#: ../../include/text.php:435
-msgid "older"
-msgstr "eldre"
-
-#: ../../include/text.php:437
-msgid "newer"
-msgstr "nyere"
-
-#: ../../include/text.php:775
-msgid "No connections"
-msgstr "Ingen forbindelser"
-
-#: ../../include/text.php:787
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d forbindelse"
-msgstr[1] "%d forbindelser"
-
-#: ../../include/text.php:800 ../../mod/viewconnections.php:101
-msgid "View Connections"
-msgstr "Vis forbindelser"
-
-#: ../../include/text.php:857 ../../include/text.php:869
-#: ../../include/apps.php:147 ../../include/nav.php:159
-#: ../../mod/search.php:38
-msgid "Search"
-msgstr "Søk"
-
-#: ../../include/text.php:858 ../../include/text.php:870
-#: ../../include/widgets.php:191 ../../mod/filer.php:49
-#: ../../mod/admin.php:1411 ../../mod/admin.php:1431 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98
-msgid "Save"
-msgstr "Lagre"
-
-#: ../../include/text.php:933
-msgid "poke"
-msgstr "prikk"
-
-#: ../../include/text.php:934
-msgid "ping"
-msgstr "varsle"
-
-#: ../../include/text.php:934
-msgid "pinged"
-msgstr "varslet"
-
-#: ../../include/text.php:935
-msgid "prod"
-msgstr "oppildne"
-
-#: ../../include/text.php:935
-msgid "prodded"
-msgstr "oppildnet"
-
-#: ../../include/text.php:936
-msgid "slap"
-msgstr "daske"
-
-#: ../../include/text.php:936
-msgid "slapped"
-msgstr "dasket"
-
-#: ../../include/text.php:937
-msgid "finger"
-msgstr "fingre"
-
-#: ../../include/text.php:937
-msgid "fingered"
-msgstr "fingret"
-
-#: ../../include/text.php:938
-msgid "rebuff"
-msgstr "tilbakevise"
-
-#: ../../include/text.php:938
-msgid "rebuffed"
-msgstr "tilbakeviste"
-
-#: ../../include/text.php:948
-msgid "happy"
-msgstr "glad"
-
-#: ../../include/text.php:949
-msgid "sad"
-msgstr "trist"
-
-#: ../../include/text.php:950
-msgid "mellow"
-msgstr "dempet"
-
-#: ../../include/text.php:951
-msgid "tired"
-msgstr "trøtt"
-
-#: ../../include/text.php:952
-msgid "perky"
-msgstr "oppkvikket"
-
-#: ../../include/text.php:953
-msgid "angry"
-msgstr "sint"
-
-#: ../../include/text.php:954
-msgid "stupified"
-msgstr "sløvet"
-
-#: ../../include/text.php:955
-msgid "puzzled"
-msgstr "forundret"
-
-#: ../../include/text.php:956
-msgid "interested"
-msgstr "interessert"
-
-#: ../../include/text.php:957
-msgid "bitter"
-msgstr "bitter"
-
-#: ../../include/text.php:958
-msgid "cheerful"
-msgstr "munter"
-
-#: ../../include/text.php:959
-msgid "alive"
-msgstr "levende"
-
-#: ../../include/text.php:960
-msgid "annoyed"
-msgstr "irritert"
-
-#: ../../include/text.php:961
-msgid "anxious"
-msgstr "nervøs"
-
-#: ../../include/text.php:962
-msgid "cranky"
-msgstr "gretten"
-
-#: ../../include/text.php:963
-msgid "disturbed"
-msgstr "foruroliget"
-
-#: ../../include/text.php:964
-msgid "frustrated"
-msgstr "frustrert"
-
-#: ../../include/text.php:965
-msgid "depressed"
-msgstr "lei seg"
-
-#: ../../include/text.php:966
-msgid "motivated"
-msgstr "motivert"
-
-#: ../../include/text.php:967
-msgid "relaxed"
-msgstr "avslappet"
-
-#: ../../include/text.php:968
-msgid "surprised"
-msgstr "overrasket"
-
-#: ../../include/text.php:1144
-msgid "May"
-msgstr "mai"
-
-#: ../../include/text.php:1247
-msgid "unknown.???"
-msgstr "ukjent.???"
-
-#: ../../include/text.php:1248
-msgid "bytes"
-msgstr "bytes"
-
-#: ../../include/text.php:1284
-msgid "remove category"
-msgstr "fjern kategori"
-
-#: ../../include/text.php:1359
-msgid "remove from file"
-msgstr "fjern fra fil"
-
-#: ../../include/text.php:1443 ../../include/text.php:1454
-msgid "Click to open/close"
-msgstr "Klikk for å åpne/lukke"
-
-#: ../../include/text.php:1609 ../../mod/events.php:497
-msgid "Link to Source"
-msgstr "Lenke til kilde"
-
-#: ../../include/text.php:1630 ../../include/text.php:1701
-msgid "default"
-msgstr "standard"
-
-#: ../../include/text.php:1638
-msgid "Page layout"
-msgstr "Sidens layout"
-
-#: ../../include/text.php:1638
-msgid "You can create your own with the layouts tool"
-msgstr "Du kan lage din egen med layout-verktøyet"
-
-#: ../../include/text.php:1679
-msgid "Page content type"
-msgstr "Sidens innholdstype"
-
-#: ../../include/text.php:1713
-msgid "Select an alternate language"
-msgstr "Velg et annet språk"
-
-#: ../../include/text.php:1845
-msgid "activity"
-msgstr "aktivitet"
-
-#: ../../include/text.php:2140
-msgid "Design Tools"
-msgstr "Designverktøy"
-
-#: ../../include/text.php:2143 ../../mod/blocks.php:147
-msgid "Blocks"
-msgstr "Byggeklosser"
-
-#: ../../include/text.php:2144 ../../mod/menu.php:103
-msgid "Menus"
-msgstr "Menyer"
-
-#: ../../include/text.php:2145 ../../mod/layouts.php:174
-msgid "Layouts"
-msgstr "Layout"
-
-#: ../../include/text.php:2146
-msgid "Pages"
-msgstr "Sider"
-
-#: ../../include/acl_selectors.php:239
-msgid "Visible to your default audience"
-msgstr "Synlig for ditt standard publikum"
-
-#: ../../include/acl_selectors.php:240
-msgid "Show"
-msgstr "Vis"
-
-#: ../../include/acl_selectors.php:241
-msgid "Don't show"
-msgstr "Ikke vis"
-
-#: ../../include/acl_selectors.php:247 ../../mod/filestorage.php:147
-#: ../../mod/chat.php:207 ../../mod/photos.php:592 ../../mod/photos.php:962
-#: ../../mod/events.php:708 ../../mod/thing.php:310 ../../mod/thing.php:356
-msgid "Permissions"
-msgstr "Tillatelser"
-
-#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:361
-#: ../../mod/photos.php:1179
-msgid "Close"
-msgstr "Lukk"
-
-#: ../../include/attach.php:243 ../../include/attach.php:329
-msgid "Item was not found."
-msgstr "Elementet ble ikke funnet."
-
-#: ../../include/attach.php:471
-msgid "No source file."
-msgstr "Ingen kildefil."
-
-#: ../../include/attach.php:489
-msgid "Cannot locate file to replace"
-msgstr "Kan ikke finne filen som skal byttes ut"
-
-#: ../../include/attach.php:507
-msgid "Cannot locate file to revise/update"
-msgstr "Finner ikke filen som skal revideres/oppdateres"
-
-#: ../../include/attach.php:632
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Filens størrelse overgår grensen på %d"
-
-#: ../../include/attach.php:645
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Du har nådd din lagringsgrense for vedlegg på %1$.0f Mbytes."
-
-#: ../../include/attach.php:793
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Mislyktes med å laste opp filen. Mulig systemgrense eller handling avbrutt."
-
-#: ../../include/attach.php:806
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Lagret fil kunne ikke bekreftes. Opplasting mislyktes."
-
-#: ../../include/attach.php:854 ../../include/attach.php:870
-msgid "Path not available."
-msgstr "Stien er ikke tilgjengelig."
-
-#: ../../include/attach.php:916 ../../include/attach.php:1069
-msgid "Empty pathname"
-msgstr "Tomt sti-navn"
-
-#: ../../include/attach.php:942
-msgid "duplicate filename or path"
-msgstr "duplikat av filnavn eller sti"
-
-#: ../../include/attach.php:965
-msgid "Path not found."
-msgstr "Stien ble ikke funnet."
-
-#: ../../include/attach.php:1023
-msgid "mkdir failed."
-msgstr "mkdir mislyktes."
-
-#: ../../include/attach.php:1027
-msgid "database storage failed."
-msgstr "databaselagring mislyktes."
-
-#: ../../include/attach.php:1075
-msgid "Empty path"
-msgstr "Tom sti"
-
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Kan ikke lage en kopi av kanal-identifikatoren på dette systemet. Import mislyktes."
-
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
-msgstr "Kanalkloning mislyktes. Import mislyktes."
-
-#: ../../include/import.php:80 ../../mod/import.php:138
-msgid "Cloned channel not found. Import failed."
-msgstr "Klonet kanal ble ikke funnet. Import mislyktes."
-
-#: ../../include/notify.php:20
-msgid "created a new post"
-msgstr "laget et nytt innlegg"
-
-#: ../../include/notify.php:21
-#, php-format
-msgid "commented on %s's post"
-msgstr "kommenterte på %s sitt innlegg"
-
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Ny side"
-
-#: ../../include/page_widgets.php:39 ../../mod/layouts.php:188
-#: ../../mod/webpages.php:187 ../../mod/blocks.php:159
-msgid "View"
-msgstr "Vis"
-
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
-msgid "Actions"
-msgstr "Handlinger"
-
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
-msgid "Page Link"
-msgstr "Sidelenke"
-
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr "Tittel"
-
-#: ../../include/page_widgets.php:44 ../../mod/layouts.php:181
-#: ../../mod/menu.php:110 ../../mod/webpages.php:192 ../../mod/blocks.php:150
-msgid "Created"
-msgstr "Laget"
-
-#: ../../include/page_widgets.php:45 ../../mod/layouts.php:182
-#: ../../mod/menu.php:111 ../../mod/webpages.php:193 ../../mod/blocks.php:151
-msgid "Edited"
-msgstr "Endret"
-
-#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
-#: ../../mod/photos.php:660 ../../mod/profile_photo.php:146
-#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
-msgid "Profile Photos"
-msgstr "Profilbilder"
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
-msgid "Male"
-msgstr "Mannlig"
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
-msgid "Female"
-msgstr "Kvinnelig"
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "For tiden mann"
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "For tiden kvinne"
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "For det meste mann"
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "For det meste kvinne"
-
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transkjønnet"
-
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "interkjønnet"
-
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transseksuell"
-
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Hermafroditt"
-
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Intetkjønn"
-
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "Ubestemt"
-
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr "Ubestemt"
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
-msgstr "Menn"
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
-msgstr "Kvinner"
-
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
-msgstr "Homo"
-
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
-msgstr "Lesbisk"
-
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
-msgstr "Ingen preferanse"
-
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
-msgstr "Biseksuell"
-
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
-msgstr "Autoseksuell"
-
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
-msgstr "Avholdende"
-
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
-msgstr "Jomfru"
-
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
-msgstr "Avviker"
-
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
-msgstr "Fetisj"
-
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
-msgstr "Masse"
-
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
-msgstr "Ikke-seksuell"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
-msgstr "Enslig"
-
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
-msgstr "Ensom"
-
-#: ../../include/profile_selectors.php:80
-msgid "Available"
-msgstr "Tilgjengelig"
-
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
-msgstr "Ikke tilgjengelig"
-
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
-msgstr "Er forelsket"
-
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
-msgstr "Betatt"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
-msgstr "Sammen med"
-
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
-msgstr "Utro"
-
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
-msgstr "Sexavhengig"
-
-#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
-#: ../../include/identity.php:391 ../../include/identity.php:398
-#: ../../include/widgets.php:429 ../../mod/connedit.php:569
-#: ../../mod/settings.php:337 ../../mod/settings.php:341
-#: ../../mod/settings.php:342 ../../mod/settings.php:345
-#: ../../mod/settings.php:356
-msgid "Friends"
-msgstr "Venner"
-
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
-msgstr "Venner med frynsegoder"
-
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
-msgstr "Tilfeldig"
-
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
-msgstr "Forlovet"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
-msgstr "Gift"
-
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
-msgstr "Gift i fantasien"
-
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
-msgstr "Partnere"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
-msgstr "Samboer"
+#: ../../include/enotify.php:514
+msgid "[Hubzilla:Notify]"
+msgstr "[Hubzilla:Notify]"
 
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
-msgstr "Samboer"
-
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
-msgstr "Lykkelig"
-
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
-msgstr "Ikke på utkikk"
-
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
-msgstr "Partnerbytte"
-
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
-msgstr "Bedratt"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
-msgstr "Separert"
-
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
-msgstr "Ustabilt"
+#: ../../include/follow.php:28
+msgid "Channel is blocked on this site."
+msgstr "Kanalen er blokkert på dette nettstedet."
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
-msgstr "Skilt"
+#: ../../include/follow.php:33
+msgid "Channel location missing."
+msgstr "Kanalplassering mangler."
 
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
-msgstr "Skilt i fantasien"
+#: ../../include/follow.php:82
+msgid "Response from remote channel was incomplete."
+msgstr "Svaret fra den andre kanalen var ikke komplett."
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
-msgstr "Enke"
+#: ../../include/follow.php:99
+msgid "Channel was deleted and no longer exists."
+msgstr "Kanalen er slettet og finnes ikke lenger."
 
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
-msgstr "Usikkert"
+#: ../../include/follow.php:152 ../../include/follow.php:181
+msgid "Protocol disabled."
+msgstr "Protokollen er avskrudd."
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
-msgstr "Det er komplisert"
+#: ../../include/follow.php:171
+msgid "Channel discovery failed."
+msgstr "Kanaloppdagelse mislyktes."
 
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
-msgstr "Bryr meg ikke"
+#: ../../include/follow.php:197
+msgid "local account not found."
+msgstr "lokal konto ble ikke funnet."
 
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
-msgstr "Spør meg"
+#: ../../include/follow.php:221
+msgid "Cannot connect to yourself."
+msgstr "Kan ikke lage forbindelse med deg selv."
 
 #: ../../include/oembed.php:213
 msgid "Embedded content"
@@ -2681,417 +3459,283 @@ msgstr "Innebygget innhold"
 msgid "Embedding disabled"
 msgstr "Innbygging avskrudd"
 
-#: ../../include/event.php:22 ../../include/bb2diaspora.php:459
-msgid "l F d, Y \\@ g:i A"
-msgstr "l F d, Y \\@ g:i A"
-
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:465
-msgid "Starts:"
-msgstr "Starter:"
-
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:473
-msgid "Finishes:"
-msgstr "Slutter:"
-
-#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:992 ../../mod/directory.php:302
-#: ../../mod/events.php:701
-msgid "Location:"
-msgstr "Plassering:"
-
-#: ../../include/event.php:766
-msgid "This event has been added to your calendar."
-msgstr "Denne hendelsen er lagt til i din kalender."
-
-#: ../../include/event.php:953
-msgid "Not specified"
-msgstr "Ikke spesifisert"
-
-#: ../../include/event.php:954
-msgid "Needs Action"
-msgstr "Trenger handling"
-
-#: ../../include/event.php:955
-msgid "Completed"
-msgstr "Ferdig"
-
-#: ../../include/event.php:956
-msgid "In Process"
-msgstr "Igang"
-
-#: ../../include/event.php:957
-msgid "Cancelled"
-msgstr "Avbrutt"
+#: ../../include/message.php:19
+msgid "No recipient provided."
+msgstr "Ingen mottaker angitt."
 
-#: ../../include/apps.php:128
-msgid "Site Admin"
-msgstr "Nettstedsadministrator"
+#: ../../include/message.php:24
+msgid "[no subject]"
+msgstr "[ikke noe emne]"
 
-#: ../../include/apps.php:130
-msgid "Address Book"
-msgstr "Adressebok"
+#: ../../include/message.php:44
+msgid "Unable to determine sender."
+msgstr "Kan ikke avgjøre avsender."
 
-#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1497
-msgid "Login"
-msgstr "Logg inn"
+#: ../../include/message.php:219
+msgid "Stored post could not be verified."
+msgstr "Lagret innlegg kunne ikke bekreftes."
 
-#: ../../include/apps.php:132 ../../include/nav.php:200
-#: ../../mod/manage.php:160
-msgid "Channel Manager"
-msgstr "Kanalstyring"
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1487
+msgid "Logout"
+msgstr "Logg ut"
 
-#: ../../include/apps.php:133
-msgid "Matrix"
-msgstr "Matrix"
+#: ../../include/nav.php:82 ../../include/nav.php:114
+msgid "End this session"
+msgstr "Avslutt denne økten"
 
-#: ../../include/apps.php:134 ../../include/widgets.php:553
-#: ../../include/nav.php:202 ../../mod/admin.php:1033 ../../mod/admin.php:1233
-msgid "Settings"
-msgstr "Innstillinger"
+#: ../../include/nav.php:85 ../../include/nav.php:145
+msgid "Home"
+msgstr "Hjem"
 
-#: ../../include/apps.php:137 ../../include/nav.php:177
-msgid "Channel Home"
-msgstr "Kanalhjem"
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
+msgstr "Dine innlegg og samtaler"
 
-#: ../../include/apps.php:138 ../../include/identity.php:1226
-#: ../../include/identity.php:1343 ../../mod/profperm.php:112
-msgid "Profile"
-msgstr "Profil"
+#: ../../include/nav.php:86
+msgid "Your profile page"
+msgstr "Din profilside"
 
-#: ../../include/apps.php:140 ../../include/nav.php:196
-#: ../../mod/events.php:526
-msgid "Events"
-msgstr "Hendelser"
+#: ../../include/nav.php:88
+msgid "Edit Profiles"
+msgstr "Endre profiler"
 
-#: ../../include/apps.php:141 ../../include/nav.php:162
-msgid "Directory"
-msgstr "Katalog"
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
+msgstr "HÃ¥ndter/endre profiler"
 
-#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:202
-#: ../../mod/help.php:207 ../../mod/layouts.php:176
-msgid "Help"
-msgstr "Hjelp"
+#: ../../include/nav.php:90
+msgid "Edit your profile"
+msgstr "Endre din profil"
 
-#: ../../include/apps.php:143 ../../include/nav.php:188
-msgid "Mail"
-msgstr "Melding"
+#: ../../include/nav.php:92
+msgid "Your photos"
+msgstr "Dine bilder"
 
-#: ../../include/apps.php:144 ../../mod/mood.php:131
-msgid "Mood"
-msgstr "Stemning"
+#: ../../include/nav.php:93
+msgid "Your files"
+msgstr "Dine filer"
 
-#: ../../include/apps.php:146 ../../include/nav.php:97
+#: ../../include/nav.php:97 ../../include/apps.php:146
 msgid "Chat"
 msgstr "Chat"
 
-#: ../../include/apps.php:148
-msgid "Probe"
-msgstr "Undersøk"
-
-#: ../../include/apps.php:149
-msgid "Suggest"
-msgstr "Forreslå"
-
-#: ../../include/apps.php:150
-msgid "Random Channel"
-msgstr "Tilfeldig kanal"
-
-#: ../../include/apps.php:151
-msgid "Invite"
-msgstr "Inviter"
-
-#: ../../include/apps.php:152
-msgid "Features"
-msgstr "Funksjoner"
-
-#: ../../include/apps.php:153 ../../mod/id.php:28
-msgid "Language"
-msgstr "Språk"
-
-#: ../../include/apps.php:154
-msgid "Post"
-msgstr "Innlegg"
-
-#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
-#: ../../mod/id.php:19
-msgid "Profile Photo"
-msgstr "Profilbilde"
-
-#: ../../include/apps.php:247 ../../mod/settings.php:84
-#: ../../mod/settings.php:609
-msgid "Update"
-msgstr "Oppdater"
-
-#: ../../include/apps.php:247
-msgid "Install"
-msgstr "Installer"
-
-#: ../../include/apps.php:252
-msgid "Purchase"
-msgstr "Kjøp"
-
-#: ../../include/auth.php:131
-msgid "Logged out."
-msgstr "Logget ut."
-
-#: ../../include/auth.php:272
-msgid "Failed authentication"
-msgstr "Mislykket autentisering"
-
-#: ../../include/auth.php:286 ../../mod/openid.php:189
-msgid "Login failed."
-msgstr "Innlogging mislyktes."
+#: ../../include/nav.php:97
+msgid "Your chatrooms"
+msgstr "Dine chatterom"
 
-#: ../../include/bb2diaspora.php:373
-msgid "Attachments:"
-msgstr "Vedlegg:"
+#: ../../include/nav.php:103
+msgid "Your bookmarks"
+msgstr "Dine bokmerker"
 
-#: ../../include/bb2diaspora.php:461
-msgid "$Projectname event notification:"
-msgstr "$Projectname hendelsesvarsling:"
+#: ../../include/nav.php:107
+msgid "Your webpages"
+msgstr "Dine websider"
 
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:793
-#: ../../include/bbcode.php:796 ../../include/bbcode.php:801
-#: ../../include/bbcode.php:804 ../../include/bbcode.php:807
-#: ../../include/bbcode.php:810 ../../include/bbcode.php:815
-#: ../../include/bbcode.php:818 ../../include/bbcode.php:823
-#: ../../include/bbcode.php:826 ../../include/bbcode.php:829
-#: ../../include/bbcode.php:832
-msgid "Image/photo"
-msgstr "Bilde/fotografi"
+#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1488
+msgid "Login"
+msgstr "Logg inn"
 
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:843
-msgid "Encrypted content"
-msgstr "Kryptert innhold"
+#: ../../include/nav.php:111
+msgid "Sign in"
+msgstr "Logg på"
 
-#: ../../include/bbcode.php:179
+#: ../../include/nav.php:128
 #, php-format
-msgid "Install %s element: "
-msgstr "Installer %s element:"
+msgid "%s - click to logout"
+msgstr "%s - klikk for å logge ut"
 
-#: ../../include/bbcode.php:183
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Dette innlegget inneholder det installerbare elementet %s, men du mangler tillatelse til å installere det på dette nettstedet."
+#: ../../include/nav.php:131
+msgid "Remote authentication"
+msgstr "Fjernautentisering"
 
-#: ../../include/bbcode.php:193 ../../mod/impel.php:37
-msgid "webpage"
-msgstr "nettside"
+#: ../../include/nav.php:131
+msgid "Click to authenticate to your home hub"
+msgstr "Klikk for å godkjennes mot din hjemme-hub"
 
-#: ../../include/bbcode.php:196 ../../mod/impel.php:47
-msgid "layout"
-msgstr "layout"
+#: ../../include/nav.php:145
+msgid "Home Page"
+msgstr "Hjemmeside"
 
-#: ../../include/bbcode.php:199 ../../mod/impel.php:42
-msgid "block"
-msgstr "byggekloss"
+#: ../../include/nav.php:149 ../../mod/register.php:226 ../../boot.php:1470
+msgid "Register"
+msgstr "Registrer"
 
-#: ../../include/bbcode.php:202 ../../mod/impel.php:54
-msgid "menu"
-msgstr "meny"
+#: ../../include/nav.php:149
+msgid "Create an account"
+msgstr "Lag en konto"
 
-#: ../../include/bbcode.php:257
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s skrev følgende %2$s %3$s"
+#: ../../include/nav.php:154 ../../include/apps.php:142
+#: ../../mod/layouts.php:176 ../../mod/help.php:204 ../../mod/help.php:209
+msgid "Help"
+msgstr "Hjelp"
 
-#: ../../include/bbcode.php:259 ../../mod/tagger.php:51
-msgid "post"
-msgstr "innlegg"
+#: ../../include/nav.php:154
+msgid "Help and documentation"
+msgstr "Hjelp og dokumentasjon"
 
-#: ../../include/bbcode.php:547
-msgid "Different viewers will see this text differently"
-msgstr "Denne teksten vil se forskjellig ut for ulike besøkende"
+#: ../../include/nav.php:157
+msgid "Applications, utilities, links, games"
+msgstr "Programmer, verktøy, lenker, spill"
 
-#: ../../include/bbcode.php:754
-msgid "$1 spoiler"
-msgstr "$1 avsløring"
+#: ../../include/nav.php:159
+msgid "Search site @name, #tag, ?docs, content"
+msgstr "Søk nettstedet for @navn, #merkelapp, ?dokumentasjon, innhold"
 
-#: ../../include/bbcode.php:781
-msgid "$1 wrote:"
-msgstr "$1 skrev:"
+#: ../../include/nav.php:162 ../../include/apps.php:141
+msgid "Directory"
+msgstr "Katalog"
 
-#: ../../include/account.php:27
-msgid "Not a valid email address"
-msgstr "Ikke en gyldig e-postadresse"
+#: ../../include/nav.php:162
+msgid "Channel Directory"
+msgstr "Kanalkatalog"
 
-#: ../../include/account.php:29
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Ditt e-postdomene er ikke blant de som er tillatt på dette stedet"
+#: ../../include/nav.php:174 ../../include/apps.php:133
+msgid "Grid"
+msgstr "Nett"
 
-#: ../../include/account.php:35
-msgid "Your email address is already registered at this site."
-msgstr "Din e-postadresse er allerede registrert på dette nettstedet."
+#: ../../include/nav.php:174
+msgid "Your grid"
+msgstr "Ditt nett"
 
-#: ../../include/account.php:67
-msgid "An invitation is required."
-msgstr "En invitasjon er påkrevd."
+#: ../../include/nav.php:175
+msgid "Mark all grid notifications seen"
+msgstr "Marker alle nettvarsler som sett"
 
-#: ../../include/account.php:71
-msgid "Invitation could not be verified."
-msgstr "Invitasjon kunne ikke bekreftes."
+#: ../../include/nav.php:177 ../../include/apps.php:137
+msgid "Channel Home"
+msgstr "Kanalhjem"
 
-#: ../../include/account.php:121
-msgid "Please enter the required information."
-msgstr "Vennligst skriv inn nødvendig informasjon."
+#: ../../include/nav.php:177
+msgid "Channel home"
+msgstr "Kanalhjem"
 
-#: ../../include/account.php:188
-msgid "Failed to store account information."
-msgstr "Mislyktes med å lagre kontoinformasjon."
+#: ../../include/nav.php:178
+msgid "Mark all channel notifications seen"
+msgstr "Merk alle kanalvarsler som sett"
 
-#: ../../include/account.php:246
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Registreringsbekreftelse for %s"
+#: ../../include/nav.php:181 ../../mod/connections.php:260
+msgid "Connections"
+msgstr "Forbindelser"
 
-#: ../../include/account.php:312
-#, php-format
-msgid "Registration request at %s"
-msgstr "Registreringsforespørsel hos %s"
+#: ../../include/nav.php:184
+msgid "Notices"
+msgstr "Varsel"
 
-#: ../../include/account.php:336
-msgid "your registration password"
-msgstr "ditt registreringspassord"
+#: ../../include/nav.php:184
+msgid "Notifications"
+msgstr "Varsler"
 
-#: ../../include/account.php:339 ../../include/account.php:399
-#, php-format
-msgid "Registration details for %s"
-msgstr "Registreringsdetaljer for %s"
+#: ../../include/nav.php:185
+msgid "See all notifications"
+msgstr "Se alle varsler"
 
-#: ../../include/account.php:408
-msgid "Account approved."
-msgstr "Konto godkjent."
+#: ../../include/nav.php:186 ../../mod/notifications.php:99
+msgid "Mark all system notifications seen"
+msgstr "Merk alle systemvarsler som sett"
 
-#: ../../include/account.php:447
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrering trukket tilbake for %s"
+#: ../../include/nav.php:188 ../../include/apps.php:143
+msgid "Mail"
+msgstr "Melding"
 
-#: ../../include/account.php:492
-msgid "Account verified. Please login."
-msgstr "Konto bekreftet. Vennligst logg inn."
+#: ../../include/nav.php:188
+msgid "Private mail"
+msgstr "Privat post"
 
-#: ../../include/account.php:705 ../../include/account.php:707
-msgid "Click here to upgrade."
-msgstr "Klikk her for å oppgradere."
+#: ../../include/nav.php:189
+msgid "See all private messages"
+msgstr "Se alle private meldinger"
 
-#: ../../include/account.php:713
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Denne handlingen går utenfor grensene satt i din abonnementsplan."
+#: ../../include/nav.php:190
+msgid "Mark all private messages seen"
+msgstr "Merk alle private meldinger som sett"
 
-#: ../../include/account.php:718
-msgid "This action is not available under your subscription plan."
-msgstr "Denne handlingen er ikke tilgjengelig i din abonnementsplan."
+#: ../../include/nav.php:196 ../../include/apps.php:140
+msgid "Events"
+msgstr "Hendelser"
 
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
-msgstr "Kanalen er blokkert på dette nettstedet."
+#: ../../include/nav.php:196
+msgid "Event Calendar"
+msgstr "Kalender"
 
-#: ../../include/follow.php:33
-msgid "Channel location missing."
-msgstr "Kanalplassering mangler."
+#: ../../include/nav.php:197
+msgid "See all events"
+msgstr "Se alle hendelser"
 
-#: ../../include/follow.php:82
-msgid "Response from remote channel was incomplete."
-msgstr "Svaret fra den andre kanalen var ikke komplett."
+#: ../../include/nav.php:198
+msgid "Mark all events seen"
+msgstr "Merk alle hendelser som sett"
 
-#: ../../include/follow.php:99
-msgid "Channel was deleted and no longer exists."
-msgstr "Kanalen er slettet og finnes ikke lenger."
+#: ../../include/nav.php:200 ../../include/apps.php:132
+#: ../../mod/manage.php:160
+msgid "Channel Manager"
+msgstr "Kanalstyring"
 
-#: ../../include/follow.php:154
-msgid "Protocol disabled."
-msgstr "Protokollen er avskrudd."
+#: ../../include/nav.php:200
+msgid "Manage Your Channels"
+msgstr "HÃ¥ndter dine kanaler"
 
-#: ../../include/follow.php:170
-msgid "Channel discovery failed."
-msgstr "Kanaloppdagelse mislyktes."
+#: ../../include/nav.php:202
+msgid "Account/Channel Settings"
+msgstr "Konto-/kanal-innstillinger"
 
-#: ../../include/follow.php:186
-msgid "local account not found."
-msgstr "lokal konto ble ikke funnet."
+#: ../../include/nav.php:210
+msgid "Site Setup and Configuration"
+msgstr "Nettstedsoppsett og -konfigurasjon"
 
-#: ../../include/follow.php:210
-msgid "Cannot connect to yourself."
-msgstr "Kan ikke lage forbindelse med deg selv."
+#: ../../include/nav.php:246
+msgid "@name, #tag, ?doc, content"
+msgstr "@navn, #merkelapp, ?dokumentasjon, innhold"
+
+#: ../../include/nav.php:247
+msgid "Please wait..."
+msgstr "Vennligst vent..."
 
-#: ../../include/security.php:345
+#: ../../include/security.php:381
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "Skjemaets sikkerhetspollett var ikke gyldig. Dette skjedde antakelig fordi skjemaet har vært åpnet for lenge (>3 timer) før det ble sendt inn."
 
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invitasjon tilgjengelig"
-msgstr[1] "%d invitasjoner tilgjengelig"
-
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:415
-msgid "Advanced"
-msgstr "Avansert"
-
-#: ../../include/contact_widgets.php:22
-msgid "Find Channels"
-msgstr "Finn kanaler"
-
-#: ../../include/contact_widgets.php:23
-msgid "Enter name or interest"
-msgstr "Skriv navn eller interesse"
-
-#: ../../include/contact_widgets.php:24
-msgid "Connect/Follow"
-msgstr "Forbindelse/Følg"
-
-#: ../../include/contact_widgets.php:25
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Eksempler: Ola Nordmann, fisking"
-
-#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379
-#: ../../mod/directory.php:384 ../../mod/connections.php:266
-msgid "Find"
-msgstr "Finn"
-
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383
-#: ../../mod/suggest.php:60
-msgid "Channel Suggestions"
-msgstr "Kanalforslag"
-
-#: ../../include/contact_widgets.php:29
-msgid "Random Profile"
-msgstr "Tilfeldig profil"
-
-#: ../../include/contact_widgets.php:30
-msgid "Invite Friends"
-msgstr "Inviter venner"
+#: ../../include/dir_fns.php:139
+msgid "Directory Options"
+msgstr "Kataloginnstillinger"
 
-#: ../../include/contact_widgets.php:32
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Avansert eksempel: navn=fred og land=island"
+#: ../../include/dir_fns.php:141
+msgid "Safe Mode"
+msgstr "Trygt modus"
 
-#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:98
-#: ../../include/widgets.php:306
-msgid "Everything"
-msgstr "Alt"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:102
+#: ../../mod/admin.php:415 ../../mod/settings.php:577 ../../mod/photos.php:626
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:447
+#: ../../mod/events.php:448 ../../mod/events.php:457 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1492
+msgid "No"
+msgstr "Nei"
 
-#: ../../include/contact_widgets.php:95 ../../include/taxonomy.php:271
-#: ../../include/widgets.php:35
-msgid "Categories"
-msgstr "Kategorier"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/api.php:101 ../../mod/admin.php:417 ../../mod/settings.php:577
+#: ../../mod/photos.php:626 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1492
+msgid "Yes"
+msgstr "Ja"
 
-#: ../../include/contact_widgets.php:128
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d forbindelse felles"
-msgstr[1] "%d forbindelser felles"
+#: ../../include/dir_fns.php:142
+msgid "Public Forums Only"
+msgstr "Bare offentlige forum"
 
-#: ../../include/contact_widgets.php:133
-msgid "show more"
-msgstr "vis mer"
+#: ../../include/dir_fns.php:143
+msgid "This Website Only"
+msgstr "Kun dette nettstedet"
 
 #: ../../include/group.php:26
 msgid ""
@@ -3104,7 +3748,7 @@ msgstr "En slettet gruppe med dette navnet ble gjenopprettet. Eksisterende tilla
 msgid "Add new connections to this collection (privacy group)"
 msgstr "Legg nye forbindelser til denne samlingen (personverngruppe)"
 
-#: ../../include/group.php:251 ../../mod/admin.php:788
+#: ../../include/group.php:251 ../../mod/admin.php:826
 msgid "All Channels"
 msgstr "Alle kanaler"
 
@@ -3128,343 +3772,71 @@ msgstr "Legg til ny samling"
 msgid "Channels not in any collection"
 msgstr "Kanaler som ikke er i noen samling"
 
-#: ../../include/group.php:300 ../../include/widgets.php:274
-msgid "add"
-msgstr "legg til"
-
-#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
-msgid "Tags"
-msgstr "Merkelapper"
-
-#: ../../include/taxonomy.php:294
-msgid "Keywords"
-msgstr "Nøkkelord"
-
-#: ../../include/taxonomy.php:315
-msgid "have"
-msgstr "har"
-
-#: ../../include/taxonomy.php:315
-msgid "has"
-msgstr "har"
-
-#: ../../include/taxonomy.php:316
-msgid "want"
-msgstr "ønsker"
-
-#: ../../include/taxonomy.php:316
-msgid "wants"
-msgstr "ønsker"
-
-#: ../../include/taxonomy.php:317 ../../include/ItemObject.php:254
-msgid "like"
-msgstr "liker"
-
-#: ../../include/taxonomy.php:317
-msgid "likes"
-msgstr "liker"
-
-#: ../../include/taxonomy.php:318 ../../include/ItemObject.php:255
-msgid "dislike"
-msgstr "misliker"
-
-#: ../../include/taxonomy.php:318
-msgid "dislikes"
-msgstr "misliker"
-
-#: ../../include/dir_fns.php:126
-msgid "Directory Options"
-msgstr "Kataloginnstillinger"
-
-#: ../../include/dir_fns.php:128
-msgid "Safe Mode"
-msgstr "Trygt modus"
-
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/connedit.php:631
-#: ../../mod/connedit.php:659 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:386 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
-#: ../../mod/api.php:106 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "No"
-msgstr "Nei"
-
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:388 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
-#: ../../mod/api.php:105 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../include/dir_fns.php:129
-msgid "Public Forums Only"
-msgstr "Bare offentlige forum"
-
-#: ../../include/dir_fns.php:130
-msgid "This Website Only"
-msgstr "Kun dette nettstedet"
-
-#: ../../include/identity.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "Klarer ikke å få tak i identitetsinformasjon fra databasen"
-
-#: ../../include/identity.php:66
-msgid "Empty name"
-msgstr "Mangler navn"
-
-#: ../../include/identity.php:69
-msgid "Name too long"
-msgstr "Navnet er for langt"
-
-#: ../../include/identity.php:181
-msgid "No account identifier"
-msgstr "Ingen kontoidentifikator"
-
-#: ../../include/identity.php:193
-msgid "Nickname is required."
-msgstr "Kallenavn er påkrevd."
-
-#: ../../include/identity.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr "Reservert kallenavn. Vennligst velg et annet."
-
-#: ../../include/identity.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Kallenavnet inneholder tegn som ikke er støttet eller det er allerede i bruk på dette nettstedet."
-
-#: ../../include/identity.php:288
-msgid "Unable to retrieve created identity"
-msgstr "Klarer ikke å hente den lagede identiteten"
-
-#: ../../include/identity.php:346
-msgid "Default Profile"
-msgstr "Standardprofil"
-
-#: ../../include/identity.php:745
-msgid "Requested channel is not available."
-msgstr "Forespurt kanal er ikke tilgjengelig."
-
-#: ../../include/identity.php:791 ../../mod/achievements.php:11
-#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
-#: ../../mod/editblock.php:29 ../../mod/profile.php:16
-#: ../../mod/webpages.php:29 ../../mod/blocks.php:29
-#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/connect.php:13
-msgid "Requested profile is not available."
-msgstr "Forespurt profil er ikke tilgjengelig."
-
-#: ../../include/identity.php:954 ../../mod/profiles.php:774
-msgid "Change profile photo"
-msgstr "Endre profilbilde"
-
-#: ../../include/identity.php:960
-msgid "Profiles"
-msgstr "Profiler"
-
-#: ../../include/identity.php:960
-msgid "Manage/edit profiles"
-msgstr "HÃ¥ndtere/endre profiler"
-
-#: ../../include/identity.php:961 ../../mod/profiles.php:775
-msgid "Create New Profile"
-msgstr "Lag ny profil"
-
-#: ../../include/identity.php:964 ../../include/nav.php:90
-msgid "Edit Profile"
-msgstr "Endre profil"
-
-#: ../../include/identity.php:976 ../../mod/profiles.php:786
-msgid "Profile Image"
-msgstr "Profilbilde"
-
-#: ../../include/identity.php:979
-msgid "visible to everybody"
-msgstr "synlig for alle"
-
-#: ../../include/identity.php:980 ../../mod/profiles.php:669
-#: ../../mod/profiles.php:790
-msgid "Edit visibility"
-msgstr "Endre synlighet"
-
-#: ../../include/identity.php:996 ../../include/identity.php:1236
-msgid "Gender:"
-msgstr "Kjønn:"
-
-#: ../../include/identity.php:997 ../../include/identity.php:1280
-msgid "Status:"
-msgstr "Status:"
-
-#: ../../include/identity.php:998 ../../include/identity.php:1291
-msgid "Homepage:"
-msgstr "Hjemmeside:"
-
-#: ../../include/identity.php:999
-msgid "Online Now"
-msgstr "Online nå"
-
-#: ../../include/identity.php:1083 ../../include/identity.php:1161
-#: ../../mod/ping.php:318
-msgid "g A l F d"
-msgstr "g A l F d"
-
-#: ../../include/identity.php:1084 ../../include/identity.php:1162
-msgid "F d"
-msgstr "F d"
-
-#: ../../include/identity.php:1129 ../../include/identity.php:1201
-#: ../../mod/ping.php:341
-msgid "[today]"
-msgstr "[idag]"
-
-#: ../../include/identity.php:1140
-msgid "Birthday Reminders"
-msgstr "Fødselsdagspåminnnelser"
-
-#: ../../include/identity.php:1141
-msgid "Birthdays this week:"
-msgstr "Fødselsdager denne uken:"
-
-#: ../../include/identity.php:1194
-msgid "[No description]"
-msgstr "[Ingen beskrivelse]"
-
-#: ../../include/identity.php:1212
-msgid "Event Reminders"
-msgstr "Hendelsespåminnelser"
-
-#: ../../include/identity.php:1213
-msgid "Events this week:"
-msgstr "Hendelser denne uken:"
-
-#: ../../include/identity.php:1234 ../../mod/settings.php:1026
-msgid "Full Name:"
-msgstr "Fullt navn:"
-
-#: ../../include/identity.php:1241
-msgid "Like this channel"
-msgstr "Lik denne kanalen"
-
-#: ../../include/identity.php:1265
-msgid "j F, Y"
-msgstr "j F, Y"
-
-#: ../../include/identity.php:1266
-msgid "j F"
-msgstr "j F"
-
-#: ../../include/identity.php:1273
-msgid "Birthday:"
-msgstr "Fødselsdag:"
+#: ../../include/zot.php:676
+msgid "Invalid data packet"
+msgstr "Ugyldig datapakke"
 
-#: ../../include/identity.php:1277 ../../mod/directory.php:297
-msgid "Age:"
-msgstr "Alder:"
+#: ../../include/zot.php:692
+msgid "Unable to verify channel signature"
+msgstr "Ikke i stand til å sjekke kanalsignaturen"
 
-#: ../../include/identity.php:1286
+#: ../../include/zot.php:2268
 #, php-format
-msgid "for %1$d %2$s"
-msgstr "for %1$d %2$s"
-
-#: ../../include/identity.php:1289 ../../mod/profiles.php:691
-msgid "Sexual Preference:"
-msgstr "Seksuell preferanse:"
-
-#: ../../include/identity.php:1293 ../../mod/directory.php:313
-#: ../../mod/profiles.php:693
-msgid "Hometown:"
-msgstr "Hjemby:"
-
-#: ../../include/identity.php:1295
-msgid "Tags:"
-msgstr "Merkelapper:"
-
-#: ../../include/identity.php:1297 ../../mod/profiles.php:694
-msgid "Political Views:"
-msgstr "Politiske synspunkter:"
-
-#: ../../include/identity.php:1299
-msgid "Religion:"
-msgstr "Religion:"
-
-#: ../../include/identity.php:1301 ../../mod/directory.php:315
-msgid "About:"
-msgstr "Om:"
-
-#: ../../include/identity.php:1303
-msgid "Hobbies/Interests:"
-msgstr "Hobbyer/interesser:"
-
-#: ../../include/identity.php:1305 ../../mod/profiles.php:697
-msgid "Likes:"
-msgstr "Liker:"
-
-#: ../../include/identity.php:1307 ../../mod/profiles.php:698
-msgid "Dislikes:"
-msgstr "Misliker:"
-
-#: ../../include/identity.php:1309
-msgid "Contact information and Social Networks:"
-msgstr "Kontaktinformasjon og sosiale nettverk:"
-
-#: ../../include/identity.php:1311
-msgid "My other channels:"
-msgstr "Mine andre kanaler:"
+msgid "Unable to verify site signature for %s"
+msgstr "Ikke i stand til å bekrefte signaturen til %s"
 
-#: ../../include/identity.php:1313
-msgid "Musical interests:"
-msgstr "Musikkinteresse:"
+#: ../../include/zot.php:3584
+msgid "invalid target signature"
+msgstr "MÃ¥lets signatur er ugyldig"
 
-#: ../../include/identity.php:1315
-msgid "Books, literature:"
-msgstr "Bøker, litteratur:"
+#: ../../include/page_widgets.php:6
+msgid "New Page"
+msgstr "Ny side"
 
-#: ../../include/identity.php:1317
-msgid "Television:"
-msgstr "TV:"
+#: ../../include/page_widgets.php:39 ../../mod/blocks.php:159
+#: ../../mod/webpages.php:187 ../../mod/layouts.php:188
+msgid "View"
+msgstr "Vis"
 
-#: ../../include/identity.php:1319
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/dans/kultur/underholdning:"
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
+msgid "Actions"
+msgstr "Handlinger"
 
-#: ../../include/identity.php:1321
-msgid "Love/Romance:"
-msgstr "Kjærlighet/romantikk:"
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
+msgid "Page Link"
+msgstr "Sidelenke"
 
-#: ../../include/identity.php:1323
-msgid "Work/employment:"
-msgstr "Arbeid/sysselsetting:"
+#: ../../include/page_widgets.php:43
+msgid "Title"
+msgstr "Tittel"
 
-#: ../../include/identity.php:1325
-msgid "School/education:"
-msgstr "Skole/utdannelse:"
+#: ../../include/page_widgets.php:44 ../../mod/blocks.php:150
+#: ../../mod/webpages.php:192 ../../mod/layouts.php:181 ../../mod/menu.php:110
+msgid "Created"
+msgstr "Laget"
 
-#: ../../include/identity.php:1345
-msgid "Like this thing"
-msgstr "Lik denne tingen"
+#: ../../include/page_widgets.php:45 ../../mod/blocks.php:151
+#: ../../mod/webpages.php:193 ../../mod/layouts.php:182 ../../mod/menu.php:111
+msgid "Edited"
+msgstr "Endret"
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "Ingen mottaker angitt."
+#: ../../include/network.php:630
+msgid "view full size"
+msgstr "vis full størrelse"
 
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[ikke noe emne]"
+#: ../../include/network.php:1655 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
+msgid "Administrator"
+msgstr "Administrator"
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "Kan ikke avgjøre avsender."
+#: ../../include/network.php:1669
+msgid "No Subject"
+msgstr "Uten emne"
 
-#: ../../include/message.php:203
-msgid "Stored post could not be verified."
-msgstr "Lagret innlegg kunne ikke bekreftes."
+#: ../../include/dba/dba_driver.php:141
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "Kan ikke finne DNS-informasjon om databasetjener '%s'"
 
 #: ../../include/ItemObject.php:130
 msgid "Save to Folder"
@@ -3514,11 +3886,11 @@ msgstr "stjernemerket"
 msgid "Add Tag"
 msgstr "Legg til merkelapp"
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:987
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
 msgid "I like this (toggle)"
 msgstr "Jeg liker dette (skru av og på)"
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:988
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
 msgid "I don't like this (toggle)"
 msgstr "Jeg liker ikke dette (skru av og på)"
 
@@ -3530,760 +3902,629 @@ msgstr "Del dette"
 msgid "share"
 msgstr "del"
 
-#: ../../include/ItemObject.php:276
+#: ../../include/ItemObject.php:268
+msgid "Delivery Report"
+msgstr "Leveringsrapport"
+
+#: ../../include/ItemObject.php:286
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d kommentar"
 msgstr[1] "%d kommentarer"
 
-#: ../../include/ItemObject.php:295 ../../include/ItemObject.php:296
+#: ../../include/ItemObject.php:315 ../../include/ItemObject.php:316
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Vis %s sin profil - %s"
 
-#: ../../include/ItemObject.php:299
+#: ../../include/ItemObject.php:319
 msgid "to"
 msgstr "til"
 
-#: ../../include/ItemObject.php:300
+#: ../../include/ItemObject.php:320
 msgid "via"
 msgstr "via"
 
-#: ../../include/ItemObject.php:301
+#: ../../include/ItemObject.php:321
 msgid "Wall-to-Wall"
 msgstr "vegg-til-vegg"
 
-#: ../../include/ItemObject.php:302
+#: ../../include/ItemObject.php:322
 msgid "via Wall-To-Wall:"
 msgstr "via vegg-til-vegg:"
 
-#: ../../include/ItemObject.php:305
-msgid "Delivery Report"
-msgstr "Leveringsrapport"
-
-#: ../../include/ItemObject.php:339
+#: ../../include/ItemObject.php:362
 msgid "Save Bookmarks"
 msgstr "Lagre bokmerker"
 
-#: ../../include/ItemObject.php:340
+#: ../../include/ItemObject.php:363
 msgid "Add to Calendar"
 msgstr "Legg til i kalender"
 
-#: ../../include/ItemObject.php:349
+#: ../../include/ItemObject.php:372
 msgid "Mark all seen"
 msgstr "Merk alle som sett"
 
-#: ../../include/ItemObject.php:355 ../../mod/photos.php:1173
+#: ../../include/ItemObject.php:378 ../../mod/photos.php:1209
 msgctxt "noun"
 msgid "Likes"
 msgstr "Liker"
 
-#: ../../include/ItemObject.php:356 ../../mod/photos.php:1174
+#: ../../include/ItemObject.php:379 ../../mod/photos.php:1210
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "Liker ikke"
 
-#: ../../include/ItemObject.php:671 ../../mod/photos.php:1006
-#: ../../mod/photos.php:1124
+#: ../../include/ItemObject.php:694 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
 msgid "This is you"
 msgstr "Dette er deg"
 
-#: ../../include/ItemObject.php:680
+#: ../../include/ItemObject.php:703
 msgid "Image"
 msgstr "Bilde"
 
-#: ../../include/ItemObject.php:681
+#: ../../include/ItemObject.php:704
 msgid "Insert Link"
 msgstr "Sett inn lenke"
 
-#: ../../include/ItemObject.php:682
+#: ../../include/ItemObject.php:705
 msgid "Video"
 msgstr "Video"
 
-#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/import_items.php:114 ../../index.php:360
-msgid "Permission denied"
-msgstr "Tillatelse avvist"
-
-#: ../../include/items.php:1128 ../../include/items.php:1174
-msgid "(Unknown)"
-msgstr "(Ukjent)"
-
-#: ../../include/items.php:1371
-msgid "Visible to anybody on the internet."
-msgstr "Synlig for enhver på Internett."
-
-#: ../../include/items.php:1373
-msgid "Visible to you only."
-msgstr "Synlig bare for deg."
-
-#: ../../include/items.php:1375
-msgid "Visible to anybody in this network."
-msgstr "Synlig for enhver i dette nettverket."
-
-#: ../../include/items.php:1377
-msgid "Visible to anybody authenticated."
-msgstr "Synlig for enhver som er autentisert."
-
-#: ../../include/items.php:1379
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Synlig for alle på %s."
-
-#: ../../include/items.php:1381
-msgid "Visible to all connections."
-msgstr "Synlig for alle forbindelser."
-
-#: ../../include/items.php:1383
-msgid "Visible to approved connections."
-msgstr "Synlig for godkjente forbindelser."
-
-#: ../../include/items.php:1385
-msgid "Visible to specific connections."
-msgstr "Synlig for spesifikke forbindelser."
+#: ../../include/apps.php:128
+msgid "Site Admin"
+msgstr "Nettstedsadministrator"
 
-#: ../../include/items.php:4263 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/admin.php:127
-#: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
-msgstr "Elementet ble ikke funnet."
+#: ../../include/apps.php:130
+msgid "Address Book"
+msgstr "Adressebok"
 
-#: ../../include/items.php:4772 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Collection not found."
-msgstr "Samlingen ble ikke funnet."
+#: ../../include/apps.php:144 ../../mod/mood.php:131
+msgid "Mood"
+msgstr "Stemning"
 
-#: ../../include/items.php:4788
-msgid "Collection is empty."
-msgstr "Samlingen er tom."
+#: ../../include/apps.php:148
+msgid "Probe"
+msgstr "Undersøk"
 
-#: ../../include/items.php:4795
-#, php-format
-msgid "Collection: %s"
-msgstr "Samling: %s"
+#: ../../include/apps.php:149
+msgid "Suggest"
+msgstr "Forreslå"
 
-#: ../../include/items.php:4805 ../../mod/connedit.php:658
-#, php-format
-msgid "Connection: %s"
-msgstr "Forbindelse: %s"
+#: ../../include/apps.php:150
+msgid "Random Channel"
+msgstr "Tilfeldig kanal"
 
-#: ../../include/items.php:4807
-msgid "Connection not found."
-msgstr "Forbindelsen ble ikke funnet."
+#: ../../include/apps.php:151
+msgid "Invite"
+msgstr "Inviter"
 
-#: ../../include/widgets.php:91 ../../include/nav.php:157
-#: ../../mod/apps.php:36
-msgid "Apps"
-msgstr "Apper"
+#: ../../include/apps.php:152
+msgid "Features"
+msgstr "Funksjoner"
 
-#: ../../include/widgets.php:92
-msgid "System"
-msgstr "System"
+#: ../../include/apps.php:153 ../../mod/id.php:28
+msgid "Language"
+msgstr "Språk"
 
-#: ../../include/widgets.php:95
-msgid "Create Personal App"
-msgstr "Lag personlig app"
+#: ../../include/apps.php:154
+msgid "Post"
+msgstr "Innlegg"
 
-#: ../../include/widgets.php:96
-msgid "Edit Personal App"
-msgstr "Endre personlig app"
+#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
+#: ../../mod/id.php:19
+msgid "Profile Photo"
+msgstr "Profilbilde"
 
-#: ../../include/widgets.php:138 ../../mod/suggest.php:54
-msgid "Ignore/Hide"
-msgstr "Ignorer/Skjul"
+#: ../../include/apps.php:252 ../../mod/settings.php:84
+#: ../../mod/settings.php:612
+msgid "Update"
+msgstr "Oppdater"
 
-#: ../../include/widgets.php:143 ../../mod/connections.php:125
-msgid "Suggestions"
-msgstr "Forslag"
+#: ../../include/apps.php:252
+msgid "Install"
+msgstr "Installer"
 
-#: ../../include/widgets.php:144
-msgid "See more..."
-msgstr "Se mer..."
+#: ../../include/apps.php:257
+msgid "Purchase"
+msgstr "Kjøp"
 
-#: ../../include/widgets.php:165
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Du har %1$.0f av %2$.0f tillate forbindelser."
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
+msgstr "Kan se min normale strøm og innlegg"
 
-#: ../../include/widgets.php:171
-msgid "Add New Connection"
-msgstr "Legg til ny forbindelse"
+#: ../../include/permissions.php:27
+msgid "Can view my default channel profile"
+msgstr "Kan se min standard kanalprofil"
 
-#: ../../include/widgets.php:172
-msgid "Enter the channel address"
-msgstr "Skriv kanal-adressen"
+#: ../../include/permissions.php:28
+msgid "Can view my connections"
+msgstr "Kan se mine forbindelser"
 
-#: ../../include/widgets.php:173
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Eksempel: ola.nordmann@eksempel.no, http://eksempel.no/karinordmann"
+#: ../../include/permissions.php:29
+msgid "Can view my file storage and photos"
+msgstr "Kan se mine filer og bilder"
 
-#: ../../include/widgets.php:189
-msgid "Notes"
-msgstr "Merknader"
+#: ../../include/permissions.php:30
+msgid "Can view my webpages"
+msgstr "Kan se mine websider"
 
-#: ../../include/widgets.php:265
-msgid "Remove term"
-msgstr "Fjern begrep"
+#: ../../include/permissions.php:33
+msgid "Can send me their channel stream and posts"
+msgstr "Kan sende meg deres kanalstrøm og innlegg"
 
-#: ../../include/widgets.php:348
-msgid "Archives"
-msgstr "Arkiv"
+#: ../../include/permissions.php:34
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Kan lage innlegg på min kanalside (\"vegg\")"
 
-#: ../../include/widgets.php:427 ../../mod/connedit.php:567
-msgid "Me"
-msgstr "Meg"
+#: ../../include/permissions.php:35
+msgid "Can comment on or like my posts"
+msgstr "Kan kommentere på eller like mine innlegg"
 
-#: ../../include/widgets.php:428 ../../mod/connedit.php:568
-msgid "Family"
-msgstr "Familie"
+#: ../../include/permissions.php:36
+msgid "Can send me private mail messages"
+msgstr "Kan sende meg private meldinger"
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:570
-msgid "Acquaintances"
-msgstr "Bekjente"
+#: ../../include/permissions.php:37
+msgid "Can like/dislike stuff"
+msgstr "Kan like/ikke like forskjellige greier"
 
-#: ../../include/widgets.php:431 ../../mod/connedit.php:571
-#: ../../mod/connections.php:88 ../../mod/connections.php:103
-msgid "All"
-msgstr "Alle"
+#: ../../include/permissions.php:37
+msgid "Profiles and things other than posts/comments"
+msgstr "Profiler og andre ting enn innlegg/kommentarer"
 
-#: ../../include/widgets.php:450
-msgid "Refresh"
-msgstr "Forny"
+#: ../../include/permissions.php:39
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Kan videresende til alle mine kanalkontakter via @navn i innlegg"
 
-#: ../../include/widgets.php:484
-msgid "Account settings"
-msgstr "Kontoinnstillinger"
+#: ../../include/permissions.php:39
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Avansert - nyttig for å lage forumkanaler for grupper"
 
-#: ../../include/widgets.php:490
-msgid "Channel settings"
-msgstr "Kanalinnstillinger"
+#: ../../include/permissions.php:40
+msgid "Can chat with me (when available)"
+msgstr "Kan chatte/sende lynmeldinger til meg (når tilgjengelig)"
 
-#: ../../include/widgets.php:496
-msgid "Additional features"
-msgstr "Tilleggsfunksjoner"
+#: ../../include/permissions.php:41
+msgid "Can write to my file storage and photos"
+msgstr "Kan skrive til mitt lager for filer og bilder"
 
-#: ../../include/widgets.php:502
-msgid "Feature/Addon settings"
-msgstr "Funksjons-/Tilleggsinnstillinger"
+#: ../../include/permissions.php:42
+msgid "Can edit my webpages"
+msgstr "Kan endre mine websider"
 
-#: ../../include/widgets.php:508
-msgid "Display settings"
-msgstr "Visningsinnstillinger"
+#: ../../include/permissions.php:44
+msgid "Can source my public posts in derived channels"
+msgstr "Kan bruke mine offentlige innlegg som kanalkilde i egne kanaler"
 
-#: ../../include/widgets.php:514
-msgid "Connected apps"
-msgstr "Tilkoblede app-er"
+#: ../../include/permissions.php:44
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Litt avansert - svært nyttig i åpne fellesskap"
 
-#: ../../include/widgets.php:520
-msgid "Export channel"
-msgstr "Eksporter kanal"
+#: ../../include/permissions.php:46
+msgid "Can administer my channel resources"
+msgstr "Kan administrere mine kanalressurser"
 
-#: ../../include/widgets.php:529 ../../mod/connedit.php:658
-msgid "Connection Default Permissions"
-msgstr "Forbindelsens standard tillatelser"
+#: ../../include/permissions.php:46
+msgid ""
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Ekstremt avansert. La dette være med mindre du vet hva du gjør"
 
-#: ../../include/widgets.php:537
-msgid "Premium Channel Settings"
-msgstr "Premiumkanal-innstillinger"
+#: ../../include/permissions.php:867
+msgid "Social Networking"
+msgstr "Sosialt nettverk"
 
-#: ../../include/widgets.php:567
-msgid "Private Mail Menu"
-msgstr "Meny for privat post"
+#: ../../include/permissions.php:867 ../../include/permissions.php:868
+#: ../../include/permissions.php:869
+msgid "Mostly Public"
+msgstr "Ganske offentlig"
 
-#: ../../include/widgets.php:569
-msgid "Check Mail"
-msgstr "Sjekk meldinger"
+#: ../../include/permissions.php:867 ../../include/permissions.php:868
+#: ../../include/permissions.php:869
+msgid "Restricted"
+msgstr "Begrenset"
 
-#: ../../include/widgets.php:575
-msgid "Combined View"
-msgstr "Kombinert visning"
+#: ../../include/permissions.php:867 ../../include/permissions.php:868
+msgid "Private"
+msgstr "Privat"
 
-#: ../../include/widgets.php:580 ../../include/nav.php:191
-msgid "Inbox"
-msgstr "Innboks"
+#: ../../include/permissions.php:868
+msgid "Community Forum"
+msgstr "Forum for fellesskap"
 
-#: ../../include/widgets.php:585 ../../include/nav.php:192
-msgid "Outbox"
-msgstr "Utboks"
+#: ../../include/permissions.php:869
+msgid "Feed Republish"
+msgstr "Republisering av strømmet innhold"
 
-#: ../../include/widgets.php:590 ../../include/nav.php:193
-msgid "New Message"
-msgstr "Ny melding"
+#: ../../include/permissions.php:870
+msgid "Special Purpose"
+msgstr "Spesiell bruk"
 
-#: ../../include/widgets.php:609 ../../include/widgets.php:621
-msgid "Conversations"
-msgstr "Samtaler"
+#: ../../include/permissions.php:870
+msgid "Celebrity/Soapbox"
+msgstr "Kjendis/Talerstol"
 
-#: ../../include/widgets.php:613
-msgid "Received Messages"
-msgstr "Mottatte meldinger"
+#: ../../include/permissions.php:870
+msgid "Group Repository"
+msgstr "Gruppelager"
 
-#: ../../include/widgets.php:617
-msgid "Sent Messages"
-msgstr "Sendte meldinger"
+#: ../../include/permissions.php:871
+msgid "Custom/Expert Mode"
+msgstr "Tilpasset/Ekspertmodus"
 
-#: ../../include/widgets.php:631
-msgid "No messages."
-msgstr "Ingen meldinger."
+#: ../../include/photo/photo_driver.php:719 ../../mod/profile_photo.php:147
+#: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:379
+#: ../../mod/photos.php:94 ../../mod/photos.php:699
+msgid "Profile Photos"
+msgstr "Profilbilder"
 
-#: ../../include/widgets.php:648
-msgid "Delete conversation"
-msgstr "Slett samtale"
+#: ../../include/account.php:27
+msgid "Not a valid email address"
+msgstr "Ikke en gyldig e-postadresse"
 
-#: ../../include/widgets.php:650
-msgid "D, d M Y - g:i A"
-msgstr "D, d M Y - g:i A"
+#: ../../include/account.php:29
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Ditt e-postdomene er ikke blant de som er tillatt på dette stedet"
 
-#: ../../include/widgets.php:738
-msgid "Chat Rooms"
-msgstr "Chatrom"
+#: ../../include/account.php:35
+msgid "Your email address is already registered at this site."
+msgstr "Din e-postadresse er allerede registrert på dette nettstedet."
 
-#: ../../include/widgets.php:758
-msgid "Bookmarked Chatrooms"
-msgstr "Bokmerkede chatrom"
+#: ../../include/account.php:67
+msgid "An invitation is required."
+msgstr "En invitasjon er påkrevd."
 
-#: ../../include/widgets.php:778
-msgid "Suggested Chatrooms"
-msgstr "Foreslåtte chatrom"
+#: ../../include/account.php:71
+msgid "Invitation could not be verified."
+msgstr "Invitasjon kunne ikke bekreftes."
 
-#: ../../include/widgets.php:905 ../../include/widgets.php:963
-msgid "photo/image"
-msgstr "foto/bilde"
+#: ../../include/account.php:121
+msgid "Please enter the required information."
+msgstr "Vennligst skriv inn nødvendig informasjon."
 
-#: ../../include/widgets.php:1058 ../../include/widgets.php:1060
-msgid "Rate Me"
-msgstr "Vurder meg"
+#: ../../include/account.php:188
+msgid "Failed to store account information."
+msgstr "Mislyktes med å lagre kontoinformasjon."
 
-#: ../../include/widgets.php:1064
-msgid "View Ratings"
-msgstr "Vis vurderinger"
+#: ../../include/account.php:248
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr "Registreringsbekreftelse for %s"
 
-#: ../../include/widgets.php:1075
-msgid "Public Hubs"
-msgstr "Offentlige huber"
+#: ../../include/account.php:314
+#, php-format
+msgid "Registration request at %s"
+msgstr "Registreringsforespørsel hos %s"
 
-#: ../../include/widgets.php:1123
-msgid "Forums"
-msgstr "Forum"
+#: ../../include/account.php:338
+msgid "your registration password"
+msgstr "ditt registreringspassord"
 
-#: ../../include/widgets.php:1150
-msgid "Tasks"
-msgstr "Oppgaver"
+#: ../../include/account.php:341 ../../include/account.php:401
+#, php-format
+msgid "Registration details for %s"
+msgstr "Registreringsdetaljer for %s"
 
-#: ../../include/widgets.php:1159
-msgid "Documentation"
-msgstr "Dokumentasjon"
+#: ../../include/account.php:410
+msgid "Account approved."
+msgstr "Konto godkjent."
 
-#: ../../include/widgets.php:1161
-msgid "Project/Site Information"
-msgstr "Prosjekt-/Nettstedsinformasjon"
+#: ../../include/account.php:449
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registrering trukket tilbake for %s"
 
-#: ../../include/widgets.php:1162
-msgid "For Members"
-msgstr "For medlemmer"
+#: ../../include/account.php:494
+msgid "Account verified. Please login."
+msgstr "Konto bekreftet. Vennligst logg inn."
 
-#: ../../include/widgets.php:1163
-msgid "For Administrators"
-msgstr "For administratorer"
+#: ../../include/account.php:707 ../../include/account.php:709
+msgid "Click here to upgrade."
+msgstr "Klikk her for å oppgradere."
 
-#: ../../include/widgets.php:1164
-msgid "For Developers"
-msgstr "For utviklere"
+#: ../../include/account.php:715
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Denne handlingen går utenfor grensene satt i din abonnementsplan."
 
-#: ../../include/widgets.php:1189 ../../mod/admin.php:410
-msgid "Site"
-msgstr "Nettsted"
+#: ../../include/account.php:720
+msgid "This action is not available under your subscription plan."
+msgstr "Denne handlingen er ikke tilgjengelig i din abonnementsplan."
 
-#: ../../include/widgets.php:1190
-msgid "Accounts"
-msgstr "Kontoer"
+#: ../../mod/filestorage.php:82
+msgid "Permission Denied."
+msgstr "Tillatelse avvist."
 
-#: ../../include/widgets.php:1191 ../../mod/admin.php:939
-msgid "Channels"
-msgstr "Kanaler"
+#: ../../mod/filestorage.php:98
+msgid "File not found."
+msgstr "Filen ble ikke funnet."
 
-#: ../../include/widgets.php:1192 ../../mod/admin.php:1031
-#: ../../mod/admin.php:1071
-msgid "Plugins"
-msgstr "Tilleggsfunksjoner"
+#: ../../mod/filestorage.php:141
+msgid "Edit file permissions"
+msgstr "Endre filtillatelser"
 
-#: ../../include/widgets.php:1193 ../../mod/admin.php:1231
-#: ../../mod/admin.php:1265
-msgid "Themes"
-msgstr "Temaer"
+#: ../../mod/filestorage.php:150
+msgid "Set/edit permissions"
+msgstr "Angi/endre tillatelser"
 
-#: ../../include/widgets.php:1194
-msgid "Inspect queue"
-msgstr "Inspiser kø"
+#: ../../mod/filestorage.php:151
+msgid "Include all files and sub folders"
+msgstr "Inkluder alle filer og undermapper"
 
-#: ../../include/widgets.php:1195
-msgid "Profile Config"
-msgstr "Profilinnstillinger"
+#: ../../mod/filestorage.php:152
+msgid "Return to file list"
+msgstr "GÃ¥ tilbake til filoversikten"
 
-#: ../../include/widgets.php:1196
-msgid "DB updates"
-msgstr "Databaseoppdateringer"
+#: ../../mod/filestorage.php:154
+msgid "Copy/paste this code to attach file to a post"
+msgstr "Kopier og lim inn denne koden for å legge til filen i et innlegg"
 
-#: ../../include/widgets.php:1214 ../../include/widgets.php:1220
-#: ../../mod/admin.php:1350
-msgid "Logs"
-msgstr "Logger"
+#: ../../mod/filestorage.php:155
+msgid "Copy/paste this URL to link file from a web page"
+msgstr "Kopier og lim inn denne URL-en for å lenke til filen fra en webside"
 
-#: ../../include/widgets.php:1218 ../../include/nav.php:210
-msgid "Admin"
-msgstr "Administrator"
+#: ../../mod/filestorage.php:157
+msgid "Share this file"
+msgstr "Del denne filen"
 
-#: ../../include/widgets.php:1219
-msgid "Plugin Features"
-msgstr "Tilleggsfunksjoner"
+#: ../../mod/filestorage.php:158
+msgid "Show URL to this file"
+msgstr "Vis URLen til denne filen"
 
-#: ../../include/widgets.php:1221
-msgid "User registrations waiting for confirmation"
-msgstr "Brukerregistreringer som venter på bekreftelse"
+#: ../../mod/filestorage.php:159
+msgid "Notify your contacts about this file"
+msgstr "Varsle dine kontakter om denne filen"
 
-#: ../../include/zot.php:677
-msgid "Invalid data packet"
-msgstr "Ugyldig datapakke"
+#: ../../mod/group.php:20
+msgid "Collection created."
+msgstr "Samling opprettet."
 
-#: ../../include/zot.php:693
-msgid "Unable to verify channel signature"
-msgstr "Ikke i stand til å sjekke kanalsignaturen"
+#: ../../mod/group.php:26
+msgid "Could not create collection."
+msgstr "Kunne ikke lage samling."
 
-#: ../../include/zot.php:2213
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Ikke i stand til å bekrefte signaturen til %s"
+#: ../../mod/group.php:54
+msgid "Collection updated."
+msgstr "Samlingen er oppdatert."
 
-#: ../../include/zot.php:3511
-msgid "invalid target signature"
-msgstr "MÃ¥lets signatur er ugyldig"
+#: ../../mod/group.php:86
+msgid "Create a collection of channels."
+msgstr "Lag en samling med kanaler."
 
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1496
-msgid "Logout"
-msgstr "Logg ut"
+#: ../../mod/group.php:87 ../../mod/group.php:180
+msgid "Collection Name: "
+msgstr "Navn på samling:"
 
-#: ../../include/nav.php:82 ../../include/nav.php:114
-msgid "End this session"
-msgstr "Avslutt denne økten"
+#: ../../mod/group.php:89 ../../mod/group.php:183
+msgid "Members are visible to other channels"
+msgstr "Medlemmer er synlig for andre kanaler"
 
-#: ../../include/nav.php:85 ../../include/nav.php:145
-msgid "Home"
-msgstr "Hjem"
+#: ../../mod/group.php:107
+msgid "Collection removed."
+msgstr "Samling fjernet."
 
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr "Dine innlegg og samtaler"
+#: ../../mod/group.php:109
+msgid "Unable to remove collection."
+msgstr "Ikke i stand til å fjerne samlingen."
 
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr "Din profilside"
+#: ../../mod/group.php:179
+msgid "Collection Editor"
+msgstr "Samlingsbehandler"
 
-#: ../../include/nav.php:88
-msgid "Edit Profiles"
-msgstr "Endre profiler"
+#: ../../mod/group.php:193
+msgid "Members"
+msgstr "Medlemmer"
 
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr "HÃ¥ndter/endre profiler"
+#: ../../mod/group.php:195
+msgid "All Connected Channels"
+msgstr "Alle tilkoblede kanaler"
 
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr "Endre din profil"
+#: ../../mod/group.php:227
+msgid "Click on a channel to add or remove."
+msgstr "Klikk på en kanal for å legge til eller fjerne."
 
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr "Dine bilder"
+#: ../../mod/item.php:174
+msgid "Unable to locate original post."
+msgstr "Ikke i stand til å finne opprinnelig innlegg."
 
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr "Dine filer"
+#: ../../mod/item.php:418
+msgid "Empty post discarded."
+msgstr "Tomt innlegg forkastet."
 
-#: ../../include/nav.php:97
-msgid "Your chatrooms"
-msgstr "Dine chatterom"
+#: ../../mod/item.php:458
+msgid "Executable content type not permitted to this channel."
+msgstr "Kjørbar innholdstype er ikke tillat for denne kanalen."
 
-#: ../../include/nav.php:103
-msgid "Your bookmarks"
-msgstr "Dine bokmerker"
+#: ../../mod/item.php:823
+msgid "Duplicate post suppressed."
+msgstr "Duplikat av innlegg forhindret."
 
-#: ../../include/nav.php:107
-msgid "Your webpages"
-msgstr "Dine websider"
+#: ../../mod/item.php:954
+msgid "System error. Post not saved."
+msgstr "Systemfeil. Innlegg ble ikke lagret."
 
-#: ../../include/nav.php:111
-msgid "Sign in"
-msgstr "Logg på"
+#: ../../mod/item.php:1221
+msgid "Unable to obtain post information from database."
+msgstr "Ikke i stand til å få tak i informasjon om innlegg fra databasen."
 
-#: ../../include/nav.php:128
+#: ../../mod/item.php:1228
 #, php-format
-msgid "%s - click to logout"
-msgstr "%s - klikk for å logge ut"
-
-#: ../../include/nav.php:131
-msgid "Remote authentication"
-msgstr "Fjernautentisering"
-
-#: ../../include/nav.php:131
-msgid "Click to authenticate to your home hub"
-msgstr "Klikk for å godkjennes mot din hjemme-hub"
-
-#: ../../include/nav.php:145
-msgid "Home Page"
-msgstr "Hjemmeside"
-
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1473
-msgid "Register"
-msgstr "Registrer"
-
-#: ../../include/nav.php:149
-msgid "Create an account"
-msgstr "Lag en konto"
-
-#: ../../include/nav.php:154
-msgid "Help and documentation"
-msgstr "Hjelp og dokumentasjon"
-
-#: ../../include/nav.php:157
-msgid "Applications, utilities, links, games"
-msgstr "Programmer, verktøy, lenker, spill"
-
-#: ../../include/nav.php:159
-msgid "Search site @name, #tag, ?docs, content"
-msgstr "Søk nettstedet for @navn, #merkelapp, ?dokumentasjon, innhold"
-
-#: ../../include/nav.php:162
-msgid "Channel Directory"
-msgstr "Kanalkatalog"
-
-#: ../../include/nav.php:174
-msgid "Grid"
-msgstr "Nett"
-
-#: ../../include/nav.php:174
-msgid "Your grid"
-msgstr "Ditt nett"
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Du har nådd din grense på %1$.0f startinnlegg."
 
-#: ../../include/nav.php:175
-msgid "Mark all grid notifications seen"
-msgstr "Marker alle nettvarsler som sett"
+#: ../../mod/item.php:1235
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Du har nådd din grense på %1$.0f websider."
 
-#: ../../include/nav.php:177
-msgid "Channel home"
-msgstr "Kanalhjem"
+#: ../../mod/common.php:10
+msgid "No channel."
+msgstr "Ingen kanal."
 
-#: ../../include/nav.php:178
-msgid "Mark all channel notifications seen"
-msgstr "Merk alle kanalvarsler som sett"
+#: ../../mod/common.php:39
+msgid "Common connections"
+msgstr "Felles forbindelser"
 
-#: ../../include/nav.php:181 ../../mod/connections.php:260
-msgid "Connections"
-msgstr "Forbindelser"
+#: ../../mod/common.php:44
+msgid "No connections in common."
+msgstr "Ingen forbindelser felles."
 
-#: ../../include/nav.php:184
-msgid "Notices"
-msgstr "Varsel"
+#: ../../mod/connect.php:56 ../../mod/connect.php:104
+msgid "Continue"
+msgstr "Fortsett"
 
-#: ../../include/nav.php:184
-msgid "Notifications"
-msgstr "Varsler"
+#: ../../mod/connect.php:85
+msgid "Premium Channel Setup"
+msgstr "Premiumkanal-oppsett"
 
-#: ../../include/nav.php:185
-msgid "See all notifications"
-msgstr "Se alle varsler"
+#: ../../mod/connect.php:87
+msgid "Enable premium channel connection restrictions"
+msgstr "Slå på restriksjoner for forbindelse med premiumkanal"
 
-#: ../../include/nav.php:186 ../../mod/notifications.php:99
-msgid "Mark all system notifications seen"
-msgstr "Merk alle systemvarsler som sett"
+#: ../../mod/connect.php:88
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Vennligst skriv dine restriksjoner og betingelser, slik som PayPal-kvittering, retningslinjer for bruk, og så videre."
 
-#: ../../include/nav.php:188
-msgid "Private mail"
-msgstr "Privat post"
+#: ../../mod/connect.php:90 ../../mod/connect.php:110
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Denne kanalen kan kreve ytterligere steg og bekreftelse av følgende betingelser før tilkobling:"
 
-#: ../../include/nav.php:189
-msgid "See all private messages"
-msgstr "Se alle private meldinger"
+#: ../../mod/connect.php:91
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Potensielle forbindelser vil da se følgende tekst før de går videre:"
 
-#: ../../include/nav.php:190
-msgid "Mark all private messages seen"
-msgstr "Merk alle private meldinger som sett"
+#: ../../mod/connect.php:92 ../../mod/connect.php:113
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "Ved å fortsette bekrefter jeg at jeg har oppfylt alle instruksjoner gitt på denne siden."
 
-#: ../../include/nav.php:196
-msgid "Event Calendar"
-msgstr "Kalender"
+#: ../../mod/connect.php:101
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Ingen spesifikke instruksjoner er gitt av kanaleieren.)"
 
-#: ../../include/nav.php:197
-msgid "See all events"
-msgstr "Se alle hendelser"
+#: ../../mod/connect.php:109
+msgid "Restricted or Premium Channel"
+msgstr "Begrenset kanal eller premiumkanal"
 
-#: ../../include/nav.php:198
-msgid "Mark all events seen"
-msgstr "Merk alle hendelser som sett"
+#: ../../mod/match.php:22
+msgid "Profile Match"
+msgstr "Profiltreff"
 
-#: ../../include/nav.php:200
-msgid "Manage Your Channels"
-msgstr "HÃ¥ndter dine kanaler"
+#: ../../mod/match.php:31
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Ingen nøkkelord å sammenlikne. Vennligst legg til nøkkelord til din standardprofil."
 
-#: ../../include/nav.php:202
-msgid "Account/Channel Settings"
-msgstr "Konto-/kanal-innstillinger"
+#: ../../mod/match.php:63
+msgid "is interested in:"
+msgstr "er interessert i:"
 
-#: ../../include/nav.php:210
-msgid "Site Setup and Configuration"
-msgstr "Nettstedsoppsett og -konfigurasjon"
+#: ../../mod/match.php:70
+msgid "No matches"
+msgstr "Ingen treff"
 
-#: ../../include/nav.php:246
-msgid "@name, #tag, ?doc, content"
-msgstr "@navn, #merkelapp, ?dokumentasjon, innhold"
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID protokollfeil. Ingen ID ble returnert."
 
-#: ../../include/nav.php:247
-msgid "Please wait..."
-msgstr "Vennligst vent..."
+#: ../../mod/openid.php:72 ../../mod/openid.php:179
+#: ../../Zotlabs/Zot/Auth.php:248
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Velkommen %s. Ekstern autentisering er vellykket."
 
 #: ../../mod/achievements.php:34
 msgid "Some blurb about what to do when you're new here"
 msgstr "En standardtekst om hva du bør gjøre som ny her"
 
-#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
-msgid "Contact not found."
-msgstr "Kontakten ble ikke funnet."
-
-#: ../../mod/fsuggest.php:63
-msgid "Friend suggestion sent."
-msgstr "Venneforespørsel sendt."
-
-#: ../../mod/fsuggest.php:97
-msgid "Suggest Friends"
-msgstr "Foreslå venner"
-
-#: ../../mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Foreslå en venn for %s"
-
-#: ../../mod/directory.php:59 ../../mod/display.php:13 ../../mod/search.php:13
-#: ../../mod/photos.php:453 ../../mod/ratings.php:82
-#: ../../mod/viewconnections.php:17
-msgid "Public access denied."
-msgstr "Offentlig tilgang avvist."
-
-#: ../../mod/directory.php:234
-#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] "%d vurdering"
-msgstr[1] "%d vurderinger"
-
-#: ../../mod/directory.php:245
-msgid "Gender: "
-msgstr "Kjønn:"
-
-#: ../../mod/directory.php:247
-msgid "Status: "
-msgstr "Status:"
-
-#: ../../mod/directory.php:249
-msgid "Homepage: "
-msgstr "Hjemmeside:"
-
-#: ../../mod/directory.php:308 ../../mod/events.php:699
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: ../../mod/directory.php:317
-msgid "Public Forum:"
-msgstr "Offentlig forum:"
-
-#: ../../mod/directory.php:320
-msgid "Keywords: "
-msgstr "Nøkkelord:"
-
-#: ../../mod/directory.php:323
-msgid "Don't suggest"
-msgstr "Ikke foreslå"
-
-#: ../../mod/directory.php:325
-msgid "Common connections:"
-msgstr "Felles forbindelser:"
-
-#: ../../mod/directory.php:374
-msgid "Global Directory"
-msgstr "Global katalog"
-
-#: ../../mod/directory.php:374
-msgid "Local Directory"
-msgstr "Lokal katalog"
+#: ../../mod/chatsvc.php:111
+msgid "Away"
+msgstr "Borte"
 
-#: ../../mod/directory.php:380
-msgid "Finding:"
-msgstr "Finner:"
+#: ../../mod/chatsvc.php:115
+msgid "Online"
+msgstr "Online"
 
-#: ../../mod/directory.php:385
-msgid "next page"
-msgstr "Neste side"
+#: ../../mod/pubsites.php:18
+msgid "Public Sites"
+msgstr "Offentlige nettsteder"
 
-#: ../../mod/directory.php:385
-msgid "previous page"
-msgstr "Forrige side"
+#: ../../mod/pubsites.php:21
+msgid ""
+"The listed sites allow public registration for the $Projectname network. All"
+" sites in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some sites may require subscription or"
+" provide tiered service plans. The provider links <strong>may</strong> "
+"provide additional details."
+msgstr "Nettstedene på listen tillater offentlig registrering i $Projectname-nettverket. Alle nettsteder i nettverket er forbundet så medlemskap på enhver av dem formidler medlemskap i hele matrix. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Tilbyderlenkene <strong>kan</strong> gi tilleggsopplysninger."
 
-#: ../../mod/directory.php:386
-msgid "Sort options"
-msgstr "Sorteringsvalg"
+#: ../../mod/pubsites.php:27
+msgid "Rate this hub"
+msgstr "Vurder denne hubben"
 
-#: ../../mod/directory.php:387
-msgid "Alphabetic"
-msgstr "Alfabetisk"
+#: ../../mod/pubsites.php:28
+msgid "Site URL"
+msgstr "Nettstedets URL"
 
-#: ../../mod/directory.php:388
-msgid "Reverse Alphabetic"
-msgstr "Omvendt alfabetisk"
+#: ../../mod/pubsites.php:28
+msgid "Access Type"
+msgstr "Tilgangstype"
 
-#: ../../mod/directory.php:389
-msgid "Newest to Oldest"
-msgstr "Nyest til eldst"
+#: ../../mod/pubsites.php:28
+msgid "Registration Policy"
+msgstr "Retningslinjer for registrering"
 
-#: ../../mod/directory.php:390
-msgid "Oldest to Newest"
-msgstr "Eldst til nyest"
+#: ../../mod/pubsites.php:28
+msgid "Project"
+msgstr "Prosjekt"
 
-#: ../../mod/directory.php:407
-msgid "No entries (some entries may be hidden)."
-msgstr "Ingen oppføringer (noen oppføringer kan være skjult)."
+#: ../../mod/pubsites.php:28
+msgid "View hub ratings"
+msgstr "Vis vurderinger av hubben"
 
-#: ../../mod/bookmarks.php:40
-msgid "Bookmark added"
-msgstr "Bokmerke lagt til"
+#: ../../mod/pubsites.php:32
+msgid "Rate"
+msgstr "Vurder"
 
-#: ../../mod/bookmarks.php:62
-msgid "My Bookmarks"
-msgstr "Mine bokmerker"
+#: ../../mod/pubsites.php:33
+msgid "View ratings"
+msgstr "Vis vurderinger"
 
-#: ../../mod/bookmarks.php:73
-msgid "My Connections Bookmarks"
-msgstr "Mine forbindelsers bokmerker"
+#: ../../mod/tagger.php:96
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s merket %3$s til %2$s med %4$s"
 
-#: ../../mod/openid.php:26
-msgid "OpenID protocol error. No ID returned."
-msgstr "OpenID protokollfeil. Ingen ID ble returnert."
+#: ../../mod/rate.php:158
+msgid "Website:"
+msgstr "Nettsted:"
 
-#: ../../mod/openid.php:72 ../../mod/openid.php:179 ../../mod/post.php:285
+#: ../../mod/rate.php:161
 #, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Velkommen %s. Ekstern autentisering er vellykket."
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Fjerntliggende kanal [%s] (foreløpig ikke kjent på dette nettstedet)"
 
-#: ../../mod/block.php:27 ../../mod/page.php:36
-msgid "Invalid item."
-msgstr "Ugyldig element."
+#: ../../mod/rate.php:162
+msgid "Rating (this information is public)"
+msgstr "Vurdering (denne informasjonen er offentlig)"
 
-#: ../../mod/block.php:39 ../../mod/page.php:52 ../../mod/wall_upload.php:29
-msgid "Channel not found."
-msgstr "Kanalen ble ikke funnet."
+#: ../../mod/rate.php:163
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Velg om du vil forklare din vurdering (denne informasjonen er offentlig)"
 
-#: ../../mod/block.php:75 ../../mod/display.php:110 ../../mod/help.php:214
-#: ../../mod/page.php:89 ../../index.php:237
-msgid "Page not found."
-msgstr "Siden ikke funnet."
+#: ../../mod/blocks.php:95 ../../mod/blocks.php:148
+msgid "Block Name"
+msgstr "Byggeklossens navn"
+
+#: ../../mod/blocks.php:149
+msgid "Block Title"
+msgstr "Byggeklossens tittel"
 
 #: ../../mod/id.php:11
 msgid "First Name"
@@ -4349,7 +4590,7 @@ msgstr "Fødselsdag"
 msgid "Birthdate"
 msgstr "Fødselsdato"
 
-#: ../../mod/id.php:33 ../../mod/profiles.php:431
+#: ../../mod/id.php:33 ../../mod/profiles.php:441
 msgid "Gender"
 msgstr "Kjønn"
 
@@ -4421,116 +4662,28 @@ msgstr "Handling ferdig."
 msgid "Thank you."
 msgstr "Tusen takk."
 
-#: ../../mod/uexport.php:51 ../../mod/uexport.php:52
-msgid "Export Channel"
-msgstr "Eksporter kanal"
-
-#: ../../mod/uexport.php:53
-msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
-msgstr "Eksporter grunnleggende informasjon om kanalen din til en fil. Denne er en sikkerhetskopi av dine forbindelser, tillatelser, profil og grunnleggende data, som kan brukes til å importere dine data til en ny hub, men den tar ikke med innholdet."
-
-#: ../../mod/uexport.php:54
-msgid "Export Content"
-msgstr "Eksporter innhold"
-
-#: ../../mod/uexport.php:55
-msgid ""
-"Export your channel information and recent content to a JSON backup that can"
-" be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for"
-" this download to begin."
-msgstr "Eksporter din kanalinformasjon og det nyeste innholdet til en JSON-sikkerhetskopi, som kan gjenopprettes eller importeres til en annen hub. Denne lager en sikkerhetskopi av alle dine forbindelser, tillatelser, profildata og flere måneder av innholdet ditt. Denne filen kan være SVÆRT stor. Vennligst vær tålmodig - det kan ta flere minutter før denne nedlastningen begynner."
-
-#: ../../mod/uexport.php:56
-msgid "Export your posts from a given year."
-msgstr "Eksporter dine innlegg fra et bestemt år"
-
-#: ../../mod/uexport.php:58
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
-msgstr "Du kan også eksportere dine innlegg og samtaler for et bestemt år eller måned. Juster datoen i din nettlesers adresselinje for å velge andre datoer. Hvis eksporten feiler (muligens på grunn av utilstrekkelig minne på din hub), vennligst prøv igjen med et mer begrenset datoområde."
+#: ../../mod/page.php:36 ../../mod/block.php:27
+msgid "Invalid item."
+msgstr "Ugyldig element."
 
-#: ../../mod/uexport.php:59
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a "
-"href=\"%1$s\">%2$s</a>"
-msgstr "For å velge alle innlegg for et gitt år, slik som iår, besøk <a href=\"%1$s\">%2$s</a>"
+#: ../../mod/page.php:52 ../../mod/wall_upload.php:29 ../../mod/block.php:39
+msgid "Channel not found."
+msgstr "Kanalen ble ikke funnet."
 
-#: ../../mod/uexport.php:60
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
-msgstr "For å velge alle innlegg fra en gitt måned, slik som januar i år, besøk <a href=\"%1$s\">%2$s</a>"
+#: ../../mod/page.php:89 ../../mod/display.php:110 ../../mod/help.php:216
+#: ../../mod/block.php:75 ../../index.php:241
+msgid "Page not found."
+msgstr "Siden ikke funnet."
 
-#: ../../mod/uexport.php:61
-#, php-format
+#: ../../mod/page.php:126
 msgid ""
-"These content files may be imported or restored by visiting <a "
-"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
-" please import or restore these in date order (oldest first)."
-msgstr "Disse innholdsfilene kan importeres eller gjenopprettes ved å besøke <a href=\"%1$s\">%2$s</a> på ethvert nettsted som inneholder din kanal. For best resultat, vennligst importer eller gjenopprett disse etter dato (eldste først)."
-
-#: ../../mod/chatsvc.php:111
-msgid "Away"
-msgstr "Borte"
-
-#: ../../mod/chatsvc.php:115
-msgid "Online"
-msgstr "Online"
-
-#: ../../mod/tagger.php:96
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s merket %3$s til %2$s med %4$s"
-
-#: ../../mod/common.php:10
-msgid "No channel."
-msgstr "Ingen kanal."
-
-#: ../../mod/common.php:39
-msgid "Common connections"
-msgstr "Felles forbindelser"
-
-#: ../../mod/common.php:44
-msgid "No connections in common."
-msgstr "Ingen forbindelser felles."
-
-#: ../../mod/ping.php:260
-msgid "sent you a private message"
-msgstr "sendte deg en privat melding"
-
-#: ../../mod/ping.php:308
-msgid "added your channel"
-msgstr "la til din kanal"
-
-#: ../../mod/ping.php:350
-msgid "posted an event"
-msgstr "la ut en hendelse"
-
-#: ../../mod/help.php:147
-msgid "Documentation Search"
-msgstr "Søk i dokumentasjon"
-
-#: ../../mod/help.php:184 ../../mod/help.php:190 ../../mod/help.php:196
-msgid "Help:"
-msgstr "Hjelp:"
-
-#: ../../mod/help.php:211 ../../index.php:234
-msgid "Not Found"
-msgstr "Ikke funnet"
-
-#: ../../mod/help.php:235
-msgid "$Projectname Documentation"
-msgstr "$Projectname dokumentasjon"
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
+" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
 #: ../../mod/removeme.php:29
 msgid ""
@@ -4568,137 +4721,801 @@ msgid ""
 "removed from the network"
 msgstr "Som standard vil bare forekomsten av denne kanalen lokalisert på denne hubben bli fjernet fra nettverket"
 
-#: ../../mod/removeme.php:61 ../../mod/settings.php:1109
+#: ../../mod/removeme.php:61 ../../mod/settings.php:1112
 msgid "Remove Channel"
 msgstr "Fjern kanal"
 
-#: ../../mod/filer.php:48
-msgid "- select -"
-msgstr "- velg -"
+#: ../../mod/mood.php:132
+msgid "Set your current mood and tell your friends"
+msgstr "Angi ditt nåværende humør og fortell dine venner"
 
-#: ../../mod/mitem.php:24 ../../mod/menu.php:140
-msgid "Menu not found."
-msgstr "Menyen ble ikke funnet."
+#: ../../mod/new_channel.php:109
+msgid "Add a Channel"
+msgstr "Legg til en kanal"
 
-#: ../../mod/mitem.php:48
-msgid "Unable to create element."
-msgstr "Klarer ikke å lage element."
+#: ../../mod/new_channel.php:110
+msgid ""
+"A channel is your own collection of related web pages. A channel can be used"
+" to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
+msgstr "En kanal er din egen samling av relaterte web-sider. En kanal kan brukes til å samle sosiale nettverksprofiler, blogger, samtalegrupper og forum, kjendissider og mye mer. Du kan lage så mange kanaler som din tjenestetilbyder tillater."
 
-#: ../../mod/mitem.php:72
-msgid "Unable to update menu element."
-msgstr "Ikke i stand til å oppdatere menyelement."
+#: ../../mod/new_channel.php:112 ../../mod/sources.php:103
+#: ../../mod/sources.php:137
+msgid "Channel Name"
+msgstr "Kanalnavn"
 
-#: ../../mod/mitem.php:88
-msgid "Unable to add menu element."
-msgstr "Ikke i stand til å legge til menyelement."
+#: ../../mod/new_channel.php:113
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
+msgstr "Eksempel: \"Ola Nordmann\", \"Lisa og hestene hennes\", \"Fotball\", \"Sykkelgruppa\""
 
-#: ../../mod/mitem.php:116 ../../mod/menu.php:162 ../../mod/xchan.php:37
-msgid "Not found."
-msgstr "Ikke funnet."
+#: ../../mod/new_channel.php:114
+msgid "Choose a short nickname"
+msgstr "Velg et kort kallenavn"
 
-#: ../../mod/mitem.php:149 ../../mod/mitem.php:222
-msgid "Menu Item Permissions"
-msgstr "Menyelement Tillatelser"
+#: ../../mod/new_channel.php:115
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
+msgstr "Ditt kallenavn brukes til å lage en kanaladresse som er enkel å huske (minner om en e-postadresse) og som du kan dele med andre."
 
-#: ../../mod/mitem.php:150 ../../mod/mitem.php:223 ../../mod/settings.php:1053
-msgid "(click to open/close)"
-msgstr "(klikk for å åpne/lukke)"
+#: ../../mod/new_channel.php:116
+msgid "Or <a href=\"import\">import an existing channel</a> from another location"
+msgstr "Eller <a href=\"import\">importerer en eksisterende kanal</a> fra et annet sted."
 
-#: ../../mod/mitem.php:152 ../../mod/mitem.php:168
-msgid "Link Name"
-msgstr "Lenkenavn"
+#: ../../mod/new_channel.php:118
+msgid ""
+"Please choose a channel type (such as social networking or community forum) "
+"and privacy requirements so we can select the best permissions for you"
+msgstr "Vennligst velg en kanaltype (for eksempel sosialt nettverk eller forum for felleskap) og krav til personvern slik at vi kan velge de beste tillatelsene for deg."
 
-#: ../../mod/mitem.php:153 ../../mod/mitem.php:227
-msgid "Link or Submenu Target"
-msgstr "Lenke- eller undermeny-mål"
+#: ../../mod/new_channel.php:119
+msgid "Channel Type"
+msgstr "Kanaltype"
 
-#: ../../mod/mitem.php:153
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr "Skriv URL-en til lenken eller velg et menynavn for å lage en undermeny"
+#: ../../mod/new_channel.php:119
+msgid "Read more about roles"
+msgstr "Les mer om roller"
 
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:228
-msgid "Use magic-auth if available"
-msgstr "Bruk magic-autent hvis mulig"
+#: ../../mod/ratings.php:69
+msgid "No ratings"
+msgstr "Ingen vurderinger"
 
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:229
-msgid "Open link in new window"
-msgstr "Ã…pne lenke i nytt vindu"
+#: ../../mod/ratings.php:82 ../../mod/display.php:13
+#: ../../mod/directory.php:59 ../../mod/photos.php:490 ../../mod/search.php:13
+#: ../../mod/viewconnections.php:17
+msgid "Public access denied."
+msgstr "Offentlig tilgang avvist."
 
-#: ../../mod/mitem.php:156 ../../mod/mitem.php:230
-msgid "Order in list"
-msgstr "Ordne i liste"
+#: ../../mod/ratings.php:99
+msgid "Ratings"
+msgstr "Vurderinger"
 
-#: ../../mod/mitem.php:156 ../../mod/mitem.php:230
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Høyere tall vil synke mot bunnen av listen"
+#: ../../mod/ratings.php:100
+msgid "Rating: "
+msgstr "Vurdering:"
 
-#: ../../mod/mitem.php:157
-msgid "Submit and finish"
-msgstr "Send inn og avslutt"
+#: ../../mod/ratings.php:101
+msgid "Website: "
+msgstr "Nettsted:"
 
-#: ../../mod/mitem.php:158
-msgid "Submit and continue"
-msgstr "Send inn og fortsett"
+#: ../../mod/ratings.php:103
+msgid "Description: "
+msgstr "Beskrivelse:"
 
-#: ../../mod/mitem.php:166
-msgid "Menu:"
-msgstr "Meny:"
+#: ../../mod/setup.php:191
+msgid "$Projectname Server - Setup"
+msgstr "$Projectname-tjener - oppsett"
 
-#: ../../mod/mitem.php:169
-msgid "Link Target"
-msgstr "Lenkemål"
+#: ../../mod/setup.php:195
+msgid "Could not connect to database."
+msgstr "Fikk ikke kontakt med databasen."
 
-#: ../../mod/mitem.php:172
-msgid "Edit menu"
-msgstr "Endre meny"
+#: ../../mod/setup.php:199
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "Fikk ikke kontakt med det angitte nettstedets URL. Problemet kan muligens skyldes SSL-sertifikatet eller DNS."
 
-#: ../../mod/mitem.php:175
-msgid "Edit element"
-msgstr "Endre element"
+#: ../../mod/setup.php:206
+msgid "Could not create table."
+msgstr "Kunne ikke lage tabellen."
 
-#: ../../mod/mitem.php:176
-msgid "Drop element"
-msgstr "Slett element"
+#: ../../mod/setup.php:211
+msgid "Your site database has been installed."
+msgstr "Databasen til ditt nettsted har blitt installert."
 
-#: ../../mod/mitem.php:177
-msgid "New element"
-msgstr "Nytt element"
+#: ../../mod/setup.php:215
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
+msgstr "Du må kanskje importere filen \"install/schmea_xxx.sql\" manuelt ved å bruke en databaseklient."
 
-#: ../../mod/mitem.php:178
-msgid "Edit this menu container"
-msgstr "Endre denne menybeholderen"
+#: ../../mod/setup.php:216 ../../mod/setup.php:284 ../../mod/setup.php:734
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Vennligst les filen \"install/INSTALL.txt\"."
 
-#: ../../mod/mitem.php:179
-msgid "Add menu element"
-msgstr "Legg til menyelement"
+#: ../../mod/setup.php:281
+msgid "System check"
+msgstr "Systemsjekk"
 
-#: ../../mod/mitem.php:180
-msgid "Delete this menu item"
-msgstr "Slett dette menyelementet"
+#: ../../mod/setup.php:285 ../../mod/photos.php:911 ../../mod/events.php:653
+#: ../../mod/events.php:660
+msgid "Next"
+msgstr "Neste"
 
-#: ../../mod/mitem.php:181
-msgid "Edit this menu item"
-msgstr "Endre dette menyelementet"
+#: ../../mod/setup.php:286
+msgid "Check again"
+msgstr "Sjekk igjen"
 
-#: ../../mod/mitem.php:198
-msgid "Menu item not found."
-msgstr "Menyelement ble ikke funnet."
+#: ../../mod/setup.php:308
+msgid "Database connection"
+msgstr "Databaseforbindelse"
 
-#: ../../mod/mitem.php:211
-msgid "Menu item deleted."
-msgstr "Menyelement slettet."
+#: ../../mod/setup.php:309
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
+msgstr "For å installere $Projectname må du oppgi hvordan din database kan kontaktes."
 
-#: ../../mod/mitem.php:213
-msgid "Menu item could not be deleted."
-msgstr "Menyelement kunne ikke bli slettet."
+#: ../../mod/setup.php:310
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Vennligst kontakt din nettstedstilbyder eller nettstedsadministrator hvis du har spørsmål om disse innstillingene."
 
-#: ../../mod/mitem.php:220
-msgid "Edit Menu Element"
-msgstr "Endre menyelement"
+#: ../../mod/setup.php:311
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "Databasen du oppgir nedenfor må finnes på forhånd. Hvis den ikke finnes, vennligst lag den før du fortsetter."
 
-#: ../../mod/mitem.php:226
-msgid "Link text"
-msgstr "Lenketekst"
+#: ../../mod/setup.php:315
+msgid "Database Server Name"
+msgstr "Navn på databasetjener"
+
+#: ../../mod/setup.php:315
+msgid "Default is 127.0.0.1"
+msgstr "Standard er 127.0.0.1"
+
+#: ../../mod/setup.php:316
+msgid "Database Port"
+msgstr "Databaseport"
+
+#: ../../mod/setup.php:316
+msgid "Communication port number - use 0 for default"
+msgstr "Kommunikasjonsportnummer - bruk 0 for standard"
+
+#: ../../mod/setup.php:317
+msgid "Database Login Name"
+msgstr "Database innloggingsnavn"
+
+#: ../../mod/setup.php:318
+msgid "Database Login Password"
+msgstr "Database innloggingspassord"
+
+#: ../../mod/setup.php:319
+msgid "Database Name"
+msgstr "Databasenavn"
+
+#: ../../mod/setup.php:320
+msgid "Database Type"
+msgstr "Databasetype"
+
+#: ../../mod/setup.php:322 ../../mod/setup.php:363
+msgid "Site administrator email address"
+msgstr "E-postadressen til administrator ved nettstedet"
+
+#: ../../mod/setup.php:322 ../../mod/setup.php:363
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Din konto sin e-postadresse må være lik denne for å kunne bruke web-administrasjonspanelet."
+
+#: ../../mod/setup.php:323 ../../mod/setup.php:365
+msgid "Website URL"
+msgstr "Nettstedets URL"
+
+#: ../../mod/setup.php:323 ../../mod/setup.php:365
+msgid "Please use SSL (https) URL if available."
+msgstr "Vennligst bruk SSL (https) URL hvis tilgjengelig."
+
+#: ../../mod/setup.php:325 ../../mod/setup.php:367
+msgid "Please select a default timezone for your website"
+msgstr "Vennligst velg en standard tidssone for ditt nettsted"
+
+#: ../../mod/setup.php:352
+msgid "Site settings"
+msgstr "Nettstedets innstillinger"
+
+#: ../../mod/setup.php:417
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Fant ikke en kommandolinjeversjon av PHP i webtjenerens sti (PATH)."
+
+#: ../../mod/setup.php:418
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr "Hvis du ikke har en kommandolinjeversjon av PHP installert på tjeneren, så vil du ikke kunne kjøre bakgrunnshenting via cron."
+
+#: ../../mod/setup.php:422
+msgid "PHP executable path"
+msgstr "PHP-kjørefilens sti"
+
+#: ../../mod/setup.php:422
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Skriv full sti til kjørefilen for PHP. Du kan la denne stå blank for å fortsette installasjonen."
+
+#: ../../mod/setup.php:427
+msgid "Command line PHP"
+msgstr "Kommandolinje PHP"
+
+#: ../../mod/setup.php:436
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "Kommandolinjeversjonen av PHP på ditt system har ikke \"register_argc_argv\" påskrudd."
+
+#: ../../mod/setup.php:437
+msgid "This is required for message delivery to work."
+msgstr "Dette er påkrevd for at meldingslevering skal virke."
+
+#: ../../mod/setup.php:440
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
+
+#: ../../mod/setup.php:458
+#, php-format
+msgid ""
+"Your max allowed total upload size is set to %s. Maximum size of one file to"
+" upload is set to %s. You are allowed to upload up to %d files at once."
+msgstr "Den største totale opplastingsstørrelsen du er tillatt er satt til %s. Filstørrelsen på en enkelt fil er satt til å maksimalt være %s. Du har lov til å laste opp inntil %d filer samtidig."
+
+#: ../../mod/setup.php:463
+msgid "You can adjust these settings in the servers php.ini."
+msgstr "Du kan justere disse innstillingene i tjenerens php.ini."
+
+#: ../../mod/setup.php:465
+msgid "PHP upload limits"
+msgstr "PHP opplastingsgrenser"
+
+#: ../../mod/setup.php:488
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Feil: \"openssl_pkey_new\"-funksjonen på dette systemet er ikke i stand til å lage krypteringsnøkler"
+
+#: ../../mod/setup.php:489
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Ved kjøring på Windows, vennligst se \"http://www.php.net/manual/en/openssl.installation.php\"."
+
+#: ../../mod/setup.php:492
+msgid "Generate encryption keys"
+msgstr "Lag krypteringsnøkler"
+
+#: ../../mod/setup.php:504
+msgid "libCurl PHP module"
+msgstr "libCurl PHP-modul"
+
+#: ../../mod/setup.php:505
+msgid "GD graphics PHP module"
+msgstr "GD graphics PHP-modul"
+
+#: ../../mod/setup.php:506
+msgid "OpenSSL PHP module"
+msgstr "OpenSSL PHP-modul"
+
+#: ../../mod/setup.php:507
+msgid "mysqli or postgres PHP module"
+msgstr "MySQLi eller Postgres PHP modul"
+
+#: ../../mod/setup.php:508
+msgid "mb_string PHP module"
+msgstr "mb_string PHP-modul"
+
+#: ../../mod/setup.php:509
+msgid "mcrypt PHP module"
+msgstr "mcrypt PHP-modul"
+
+#: ../../mod/setup.php:510
+msgid "xml PHP module"
+msgstr "XML PHP modul"
+
+#: ../../mod/setup.php:514 ../../mod/setup.php:516
+msgid "Apache mod_rewrite module"
+msgstr "Apache mod_rewrite-modul"
+
+#: ../../mod/setup.php:514
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Feil: Apache web-tjenerens mod-rewrite-modul er påkrevd, men ikke installert."
+
+#: ../../mod/setup.php:520 ../../mod/setup.php:523
+msgid "proc_open"
+msgstr "proc_open"
+
+#: ../../mod/setup.php:520
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Feil: proc_open er påkrevd, men er enten ikke installert eller har blitt avskrudd i php.ini"
+
+#: ../../mod/setup.php:528
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Feil: libCURL PHP-modul er påkrevd, men er ikke installert."
+
+#: ../../mod/setup.php:532
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Feil: GD graphics PHP-modul med JPEG-støtte er påkrevd, men er ikke installert."
+
+#: ../../mod/setup.php:536
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Feil: openssl PHP-modul er påkrevd, men er ikke installert."
+
+#: ../../mod/setup.php:540
+msgid ""
+"Error: mysqli or postgres PHP module required but neither are installed."
+msgstr "Feil: mysqli eller postgres PHP modul er påkrevd, men ingen av dem er installert."
+
+#: ../../mod/setup.php:544
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Feil: mb_string PHP-modul er påkrevd, men  er ikke installert."
+
+#: ../../mod/setup.php:548
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Feil: mcrypt PHP-modul er påkrevd, men er ikke installert."
+
+#: ../../mod/setup.php:552
+msgid "Error: xml PHP module required for DAV but not installed."
+msgstr "Feil: XML PHP modul er påkrevet for DAV, men den er ikke installert."
+
+#: ../../mod/setup.php:570
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "Web-installasjonen må kunne lage en fil kalt \".htconfig.php\" i toppkatalogen til web-tjeneren din, men dette får den ikke til."
+
+#: ../../mod/setup.php:571
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Dette er oftest tillatelsesinnstilling, ettersom webtjeneren kanskje kan skrive til filer i din mappe - selv om du kan."
+
+#: ../../mod/setup.php:572
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr "På slutten av denne prosedyren vil vi gi deg en tekst til å lagre i en fil kalt .htconfig.php i toppkatalogen til din Red."
+
+#: ../../mod/setup.php:573
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "Alternativt, så kan du hoppe over denne prosedyren og gjennomføre en manuell installasjon. Vennligst se filen \"install/INSTALL.txt\" for instruksjoner."
+
+#: ../../mod/setup.php:576
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php kan skrives til"
+
+#: ../../mod/setup.php:590
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Red bruker malmotoren Smarty3 for å gjengi sine webvisninger. Smarty3 kompilerer malene om til PHP for å framskynde gjengivelsen."
+
+#: ../../mod/setup.php:591
+#, php-format
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the Red top level folder."
+msgstr "For å kunne lagre disse kompilerte malene, så må webtjeneren ha skrivetilgang til katalogen %s under Red sin hovedmappe."
+
+#: ../../mod/setup.php:592 ../../mod/setup.php:613
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Vennligst sikre at brukeren som din web-tjeneste kjører som (for eksempel www-data) har skrivetilgang til denne katalogen."
+
+#: ../../mod/setup.php:593
+#, php-format
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
+msgstr "Merknad: som et sikkerhetstiltak bør du bare gi webtjerenn skrivetilgang til %s - ikke til malfilene (.tpl) som den inneholder."
+
+#: ../../mod/setup.php:596
+#, php-format
+msgid "%s is writable"
+msgstr "%s kan skrives til"
+
+#: ../../mod/setup.php:612
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to"
+" have write access to the store directory under the Red top level folder"
+msgstr "Red bruker lagringsmappen for å lagre opplastede filer. Webtjeneren trenger å ha skrivetilgang til lagringsmappen under Red sin toppnivåmappe."
+
+#: ../../mod/setup.php:616
+msgid "store is writable"
+msgstr "lageret kan skrives til"
+
+#: ../../mod/setup.php:649
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "SSL-sertifikatet kan ikke kontrolleres. Fiks sertifikatet eller skru av https tilgang til dette nettstedet."
+
+#: ../../mod/setup.php:650
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
+msgstr "Hvis du har HTTPS-tilgang til ditt nettsted eller tillater forbindelser til TCP port 443 (HTTPS-porten), så MÅ du bruke nettlesergodkjent sertifkater. Du MÅ IKKE bruke egensignert sertifikater!"
+
+#: ../../mod/setup.php:651
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr "Denne begrensningen er tatt inn fordi offentlige innlegg fra deg kan for eksempel inneholde referanser til bilder på din egen hub."
+
+#: ../../mod/setup.php:652
+msgid ""
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
+msgstr "Hvis sertifikatet ditt ikke gjenkjennes, så vil medlemmer på andre nettsteder (som selv kan ha godkjente sertifikater) få en beskjed med en advarsel på deres eget nettsted som klager over sikkerhetsproblemer."
+
+#: ../../mod/setup.php:653
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr "Dette kan gi problemer med brukervennlighet (ikke bare på ditt eget nettsted), så vi må insistere på dette kravet."
+
+#: ../../mod/setup.php:654
+msgid ""
+"Providers are available that issue free certificates which are browser-"
+"valid."
+msgstr "Det finnes tilbydere som utsteder gratis sertifikater som er gyldige i nettlesere."
+
+#: ../../mod/setup.php:656
+msgid "SSL certificate validation"
+msgstr "SSL sertifikat-kontroll"
+
+#: ../../mod/setup.php:662
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server "
+"configuration.Test: "
+msgstr "URL omskriving (rewrite) i .htaccess virker ikke. Sjekk konfigurasjonen til tjeneren din. Test:"
+
+#: ../../mod/setup.php:665
+msgid "Url rewrite is working"
+msgstr "URL rewrite virker"
+
+#: ../../mod/setup.php:674
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "Databasekonfigurasjonsfilen \".htconfig.php\" kunne ikke skrives. Vennligst bruk den medfølgende teksten for å lage en konfigurasjonsfil i toppkatalogen av din web-tjener."
+
+#: ../../mod/setup.php:698
+msgid "Errors encountered creating database tables."
+msgstr "Feil oppstod under opprettelsen av databasetabeller."
+
+#: ../../mod/setup.php:732
+msgid "<h1>What next</h1>"
+msgstr "<h1>Hva gjenstår</h1>"
+
+#: ../../mod/setup.php:733
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "VIKTIG: Du må [manuelt] sette opp en automatisert tidfestet oppgave til bakgrunnshenteren."
+
+#: ../../mod/bookmarks.php:40
+msgid "Bookmark added"
+msgstr "Bokmerke lagt til"
+
+#: ../../mod/bookmarks.php:62
+msgid "My Bookmarks"
+msgstr "Mine bokmerker"
+
+#: ../../mod/bookmarks.php:73
+msgid "My Connections Bookmarks"
+msgstr "Mine forbindelsers bokmerker"
+
+#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Denne innstillingen krever spesiell behandling og redigering har blitt blokkert."
+
+#: ../../mod/pconfig.php:49
+msgid "Configuration Editor"
+msgstr "Konfigurasjonsbehandler"
+
+#: ../../mod/pconfig.php:50
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Advarsel: kanalen din kan slutte å virke ved endring av enkelte innstillinger. Vennligst forlat denne siden med mindre du er komfortabel med dette og vet hvordan du bruker denne funksjonen riktig."
+
+#: ../../mod/poke.php:164
+msgid "Poke/Prod"
+msgstr "Prikke/oppildne"
+
+#: ../../mod/poke.php:165
+msgid "poke, prod or do other things to somebody"
+msgstr "prikke, oppildne eller gjør andre ting med noen"
+
+#: ../../mod/poke.php:166
+msgid "Recipient"
+msgstr "Mottaker"
+
+#: ../../mod/poke.php:167
+msgid "Choose what you wish to do to recipient"
+msgstr "Velg hva du ønsker å gjøre med mottakeren"
+
+#: ../../mod/poke.php:170
+msgid "Make this post private"
+msgstr "Gjør dette innlegget privat"
+
+#: ../../mod/profiles.php:19 ../../mod/profiles.php:184
+#: ../../mod/profiles.php:241 ../../mod/profiles.php:608
+msgid "Profile not found."
+msgstr "Profilen ble ikke funnet."
+
+#: ../../mod/profiles.php:39
+msgid "Profile deleted."
+msgstr "Profilen er slettet."
+
+#: ../../mod/profiles.php:63 ../../mod/profiles.php:99
+msgid "Profile-"
+msgstr "Profil-"
+
+#: ../../mod/profiles.php:84 ../../mod/profiles.php:127
+msgid "New profile created."
+msgstr "Ny profil opprettet."
+
+#: ../../mod/profiles.php:105
+msgid "Profile unavailable to clone."
+msgstr "Profilen er utilgjengelig for klonen."
+
+#: ../../mod/profiles.php:146
+msgid "Profile unavailable to export."
+msgstr "Profilen er utilgjengelig for eksport."
+
+#: ../../mod/profiles.php:251
+msgid "Profile Name is required."
+msgstr "Profilnavn er påkrevd."
+
+#: ../../mod/profiles.php:414
+msgid "Marital Status"
+msgstr "Sivilstand"
+
+#: ../../mod/profiles.php:418
+msgid "Romantic Partner"
+msgstr "Romantisk partner"
+
+#: ../../mod/profiles.php:422
+msgid "Likes"
+msgstr "Liker"
+
+#: ../../mod/profiles.php:426
+msgid "Dislikes"
+msgstr "Liker ikke"
+
+#: ../../mod/profiles.php:430
+msgid "Work/Employment"
+msgstr "Arbeid/sysselsetting"
+
+#: ../../mod/profiles.php:433
+msgid "Religion"
+msgstr "Religion"
+
+#: ../../mod/profiles.php:437
+msgid "Political Views"
+msgstr "Politiske synspunkter"
+
+#: ../../mod/profiles.php:445
+msgid "Sexual Preference"
+msgstr "Seksuelle preferanser"
+
+#: ../../mod/profiles.php:449
+msgid "Homepage"
+msgstr "Hjemmeside"
+
+#: ../../mod/profiles.php:453
+msgid "Interests"
+msgstr "Interesser"
+
+#: ../../mod/profiles.php:457 ../../mod/admin.php:986
+msgid "Address"
+msgstr "Adresse"
+
+#: ../../mod/profiles.php:547
+msgid "Profile updated."
+msgstr "Profilen er oppdatert."
+
+#: ../../mod/profiles.php:634
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Skjul kontakt-/vennelisten din fra de som ser på denne profilen?"
+
+#: ../../mod/profiles.php:674
+msgid "Edit Profile Details"
+msgstr "Endre profildetaljer"
+
+#: ../../mod/profiles.php:676
+msgid "View this profile"
+msgstr "Vis denne profilen"
+
+#: ../../mod/profiles.php:678
+msgid "Change Profile Photo"
+msgstr "Endre profilbilde"
+
+#: ../../mod/profiles.php:679
+msgid "Create a new profile using these settings"
+msgstr "Lag en ny profil ved å bruke disse innstillingene"
+
+#: ../../mod/profiles.php:680
+msgid "Clone this profile"
+msgstr "Klon denne profilen"
+
+#: ../../mod/profiles.php:681
+msgid "Delete this profile"
+msgstr "Slett denne profilen"
+
+#: ../../mod/profiles.php:683
+msgid "Import profile from file"
+msgstr "Importer profil fra fil"
+
+#: ../../mod/profiles.php:684
+msgid "Export profile to file"
+msgstr "Eksporter profil til fil"
+
+#: ../../mod/profiles.php:685
+msgid "Profile Name:"
+msgstr "Profilnavn:"
+
+#: ../../mod/profiles.php:686
+msgid "Your Full Name:"
+msgstr "Ditt fulle navn:"
+
+#: ../../mod/profiles.php:687
+msgid "Title/Description:"
+msgstr "Tittel/Beskrivelse:"
+
+#: ../../mod/profiles.php:688
+msgid "Your Gender:"
+msgstr "Ditt kjønn:"
+
+#: ../../mod/profiles.php:689
+msgid "Birthday :"
+msgstr "Fødselsdag:"
+
+#: ../../mod/profiles.php:690
+msgid "Street Address:"
+msgstr "Gateadresse:"
+
+#: ../../mod/profiles.php:691
+msgid "Locality/City:"
+msgstr "Sted/By:"
+
+#: ../../mod/profiles.php:692
+msgid "Postal/Zip Code:"
+msgstr "Postnummer/ZIP-kode:"
+
+#: ../../mod/profiles.php:693
+msgid "Country:"
+msgstr "Land:"
+
+#: ../../mod/profiles.php:694
+msgid "Region/State:"
+msgstr "Region/fylke:"
+
+#: ../../mod/profiles.php:695
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Sivilstand:"
+
+#: ../../mod/profiles.php:696
+msgid "Who: (if applicable)"
+msgstr "Hvem: (hvis det er aktuelt) "
+
+#: ../../mod/profiles.php:697
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Eksempler: kari123, Kari Villiamsen, kari@example.com"
+
+#: ../../mod/profiles.php:698
+msgid "Since [date]:"
+msgstr "Siden [dato]:"
+
+#: ../../mod/profiles.php:700
+msgid "Homepage URL:"
+msgstr "Hjemmeside URL:"
+
+#: ../../mod/profiles.php:703
+msgid "Religious Views:"
+msgstr "Religiøse synspunkter:"
+
+#: ../../mod/profiles.php:704
+msgid "Keywords:"
+msgstr "Nøkkelord:"
+
+#: ../../mod/profiles.php:707
+msgid "Example: fishing photography software"
+msgstr "Eksempel: fisking fotografering programvare"
+
+#: ../../mod/profiles.php:708
+msgid "Used in directory listings"
+msgstr "Brukt i katalogoppføringer"
+
+#: ../../mod/profiles.php:709
+msgid "Tell us about yourself..."
+msgstr "Fortell oss om deg selv..."
+
+#: ../../mod/profiles.php:710
+msgid "Hobbies/Interests"
+msgstr "Hobbier/Interesser"
+
+#: ../../mod/profiles.php:711
+msgid "Contact information and Social Networks"
+msgstr "Kontaktinformasjon og sosiale nettverk"
+
+#: ../../mod/profiles.php:712
+msgid "My other channels"
+msgstr "Mine andre kanaler"
+
+#: ../../mod/profiles.php:713
+msgid "Musical interests"
+msgstr "Musikkinteresser"
+
+#: ../../mod/profiles.php:714
+msgid "Books, literature"
+msgstr "Bøker, litteratur"
+
+#: ../../mod/profiles.php:715
+msgid "Television"
+msgstr "TV/fjernsyn"
+
+#: ../../mod/profiles.php:716
+msgid "Film/dance/culture/entertainment"
+msgstr "Film/dans/kultur/underholdning"
+
+#: ../../mod/profiles.php:717
+msgid "Love/romance"
+msgstr "Kjærlighet/romantikk"
+
+#: ../../mod/profiles.php:718
+msgid "Work/employment"
+msgstr "Arbeid/sysselsetting"
+
+#: ../../mod/profiles.php:719
+msgid "School/education"
+msgstr "Skole/utdanning"
+
+#: ../../mod/profiles.php:725
+msgid "This is your default profile."
+msgstr "Dette er din standardprofil."
+
+#: ../../mod/profiles.php:736
+msgid "Age: "
+msgstr "Alder:"
+
+#: ../../mod/profiles.php:779
+msgid "Edit/Manage Profiles"
+msgstr "Endre/håndter profiler"
+
+#: ../../mod/profiles.php:780
+msgid "Add profile things"
+msgstr "Legg til profilting"
+
+#: ../../mod/profiles.php:781
+msgid "Include desirable objects in your profile"
+msgstr "Inkluder ønskverdige objekter i din profil"
 
 #: ../../mod/connedit.php:75
 msgid "Could not access contact record."
@@ -4708,240 +5525,249 @@ msgstr "Fikk ikke tilgang til kontaktinformasjonen."
 msgid "Could not locate selected profile."
 msgstr "Fant ikke valgt profil."
 
-#: ../../mod/connedit.php:219
+#: ../../mod/connedit.php:223
 msgid "Connection updated."
 msgstr "Forbindelsen er oppdatert."
 
-#: ../../mod/connedit.php:221
+#: ../../mod/connedit.php:225
 msgid "Failed to update connection record."
 msgstr "Mislyktes med å oppdatere forbindelsesinformasjonen."
 
-#: ../../mod/connedit.php:268
+#: ../../mod/connedit.php:272
 msgid "is now connected to"
 msgstr "er nå forbundet til"
 
-#: ../../mod/connedit.php:391
+#: ../../mod/connedit.php:395
 msgid "Could not access address book record."
 msgstr "Fikk ikke tilgang til informasjonen i adresseboken."
 
-#: ../../mod/connedit.php:405
+#: ../../mod/connedit.php:409
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Oppfrisking mislyktes - kanalen er for øyeblikket utilgjengelig."
 
-#: ../../mod/connedit.php:414 ../../mod/connedit.php:423
-#: ../../mod/connedit.php:432 ../../mod/connedit.php:441
-#: ../../mod/connedit.php:454
+#: ../../mod/connedit.php:418 ../../mod/connedit.php:427
+#: ../../mod/connedit.php:436 ../../mod/connedit.php:445
+#: ../../mod/connedit.php:458
 msgid "Unable to set address book parameters."
 msgstr "Ikke i stand til å angi parametre for adresseboken."
 
-#: ../../mod/connedit.php:478
+#: ../../mod/connedit.php:482
 msgid "Connection has been removed."
 msgstr "Forbindelsen har blitt fjernet."
 
-#: ../../mod/connedit.php:497
+#: ../../mod/connedit.php:501
 #, php-format
 msgid "View %s's profile"
 msgstr "Vis %s sin profil"
 
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:505
 msgid "Refresh Permissions"
 msgstr "Oppfrisk tillatelser"
 
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:508
 msgid "Fetch updated permissions"
 msgstr "Hent oppdaterte tillatelser"
 
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:512
 msgid "Recent Activity"
 msgstr "Nylig aktivitet"
 
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:515
 msgid "View recent posts and comments"
 msgstr "Vis nylige innlegg og kommentarer"
 
-#: ../../mod/connedit.php:515 ../../mod/admin.php:785
+#: ../../mod/connedit.php:519 ../../mod/admin.php:823
 msgid "Unblock"
 msgstr "Ikke blokker lenger"
 
-#: ../../mod/connedit.php:515 ../../mod/admin.php:784
+#: ../../mod/connedit.php:519 ../../mod/admin.php:822
 msgid "Block"
 msgstr "Blokker"
 
-#: ../../mod/connedit.php:518
+#: ../../mod/connedit.php:522
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Blokker eller fjern blokkering av all kommunikasjon med denne forbindelsen"
 
-#: ../../mod/connedit.php:519
+#: ../../mod/connedit.php:523
 msgid "This connection is blocked!"
 msgstr "Denne forbindelsen er blokkert!"
 
-#: ../../mod/connedit.php:523
+#: ../../mod/connedit.php:527
 msgid "Unignore"
 msgstr "Ikke ignorer lenger"
 
-#: ../../mod/connedit.php:523 ../../mod/notifications.php:51
+#: ../../mod/connedit.php:527 ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../../mod/connedit.php:526
+#: ../../mod/connedit.php:530
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignorer eller fjern ignorering av all inngående kommunikasjon fra denne forbindelsen"
 
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:531
 msgid "This connection is ignored!"
 msgstr "Denne forbindelsen er ignorert!"
 
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:535
 msgid "Unarchive"
 msgstr "Ikke arkiver lenger"
 
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:535
 msgid "Archive"
 msgstr "Arkiver"
 
-#: ../../mod/connedit.php:534
+#: ../../mod/connedit.php:538
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Arkiver eller fjern arkivering av denne forbindelsen - marker kanal som død, men behold innhold"
 
-#: ../../mod/connedit.php:535
+#: ../../mod/connedit.php:539
 msgid "This connection is archived!"
 msgstr "Denne forbindelsen er arkivert!"
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:543
 msgid "Unhide"
 msgstr "Ikke skjul lenger"
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:543
 msgid "Hide"
 msgstr "Skjul"
 
-#: ../../mod/connedit.php:542
+#: ../../mod/connedit.php:546
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Skjul eller fjern skjuling av denne forbindelsen fra dine andre forbindelser"
 
-#: ../../mod/connedit.php:543
+#: ../../mod/connedit.php:547
 msgid "This connection is hidden!"
 msgstr "Denne forbindelsen er skjult!"
 
-#: ../../mod/connedit.php:550
+#: ../../mod/connedit.php:554
 msgid "Delete this connection"
 msgstr "Slett denne forbindelsen"
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:635
 msgid "Approve this connection"
 msgstr "Godta denne forbindelsen"
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:635
 msgid "Accept connection to allow communication"
 msgstr "Godta denne forbindelsen for å tillate kommunikasjon"
 
-#: ../../mod/connedit.php:636
+#: ../../mod/connedit.php:640
 msgid "Set Affinity"
 msgstr "Angi nærhet"
 
-#: ../../mod/connedit.php:639
+#: ../../mod/connedit.php:643
 msgid "Set Profile"
 msgstr "Angi profil"
 
-#: ../../mod/connedit.php:642
+#: ../../mod/connedit.php:646
 msgid "Set Affinity & Profile"
 msgstr "Angi nærhet og profil"
 
-#: ../../mod/connedit.php:659
+#: ../../mod/connedit.php:679
+msgid "none"
+msgstr "ingen"
+
+#: ../../mod/connedit.php:684
 msgid "Apply these permissions automatically"
 msgstr "Bruk disse tillatelsene automatisk"
 
-#: ../../mod/connedit.php:661
-msgid "This connection's address is"
-msgstr "Denne forbindelsens adresse er"
+#: ../../mod/connedit.php:686
+msgid "This connection's primary address is"
+msgstr "Denne forbindelsens primære adresse er"
+
+#: ../../mod/connedit.php:687
+msgid "Available locations:"
+msgstr "Tilgjengelige plasseringer:"
 
-#: ../../mod/connedit.php:664
+#: ../../mod/connedit.php:691
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Tillatelsene angitt på denne siden gjøres gjeldende for alle nye forbindelser."
 
-#: ../../mod/connedit.php:666
+#: ../../mod/connedit.php:693
 msgid "Slide to adjust your degree of friendship"
 msgstr "Flytt for å justere din grad av vennskap"
 
-#: ../../mod/connedit.php:668
+#: ../../mod/connedit.php:695
 msgid "Slide to adjust your rating"
 msgstr "Flytt for å justere din vurdering"
 
-#: ../../mod/connedit.php:669 ../../mod/connedit.php:674
+#: ../../mod/connedit.php:696 ../../mod/connedit.php:701
 msgid "Optionally explain your rating"
 msgstr "Velg om du vil forklare vurderingen"
 
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:698
 msgid "Custom Filter"
 msgstr "Tilpasset filter"
 
-#: ../../mod/connedit.php:672
+#: ../../mod/connedit.php:699
 msgid "Only import posts with this text"
 msgstr "Bare importer innlegg med disse ordene"
 
-#: ../../mod/connedit.php:672 ../../mod/connedit.php:673
+#: ../../mod/connedit.php:699 ../../mod/connedit.php:700
 msgid ""
-"words one per line or #tags or /patterns/, leave blank to import all posts"
-msgstr "ett ord per linje eller #merkelapper eller /mønstre/, la feltet stå tomt for å importere alle innlegg"
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr "ord per linje eller #merkelapper eller /mønster/ eller språk lang=xx, la stå blankt for å importere alle innlegg"
 
-#: ../../mod/connedit.php:673
+#: ../../mod/connedit.php:700
 msgid "Do not import posts with this text"
 msgstr "Ikke importer innlegg med denne teksten"
 
-#: ../../mod/connedit.php:675
+#: ../../mod/connedit.php:702
 msgid "This information is public!"
 msgstr "Denne informasjonen er offentlig!"
 
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:707
 msgid "Connection Pending Approval"
 msgstr "Forbindelse venter på godkjenning"
 
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:708
 msgid "Connection Request"
 msgstr "Forespørsel om forbindelse"
 
-#: ../../mod/connedit.php:682
+#: ../../mod/connedit.php:709
 #, php-format
 msgid ""
 "(%s) would like to connect with you. Please approve this connection to allow"
 " communication."
 msgstr "(%s) ønsker forbindelse med deg. Vennligst godkjenn denne forbindelsen for å tillate kommunikasjon."
 
-#: ../../mod/connedit.php:683 ../../mod/admin.php:781
+#: ../../mod/connedit.php:710 ../../mod/admin.php:819
 msgid "Approve"
 msgstr "Godkjenn"
 
-#: ../../mod/connedit.php:684
+#: ../../mod/connedit.php:711
 msgid "Approve Later"
 msgstr "Godkjenn senere"
 
-#: ../../mod/connedit.php:687
+#: ../../mod/connedit.php:714
 msgid "inherited"
 msgstr "arvet"
 
-#: ../../mod/connedit.php:689
+#: ../../mod/connedit.php:716
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Vennligst velg profilen du ønsker å vise %s når profilen din ses på en sikret måte. "
 
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:718
 msgid "Their Settings"
 msgstr "Deres innstillinger"
 
-#: ../../mod/connedit.php:692
+#: ../../mod/connedit.php:719
 msgid "My Settings"
 msgstr "Mine innstillinger"
 
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:721
 msgid "Individual Permissions"
 msgstr "Individuelle tillatelser"
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:722
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4949,7 +5775,7 @@ msgid ""
 " settings here."
 msgstr "Noen tillatelser kan være arvet fra din kanals <a ref=\"settings\"><strong>personverninnstillinger</strong></a>, som har høyere prioritet enn individuelle innstillinger. Du kan <strong>ikke</strong> endre arvede innstillingene her."
 
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:723
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4957,323 +5783,766 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Noen tillatelser kan være arvet fra din kanals <a ref=\"settings\"><strong>personverninnstillinger</strong></a>, som har høyere prioritet enn individuelle innstillinger. Du kan endre disse innstillingene her, men de vil ikke få noen effekt før de arvede innstillingene endres."
 
-#: ../../mod/connedit.php:697
+#: ../../mod/connedit.php:724
 msgid "Last update:"
 msgstr "Siste oppdatering:"
 
-#: ../../mod/mood.php:132
-msgid "Set your current mood and tell your friends"
-msgstr "Angi ditt nåværende humør og fortell dine venner"
+#: ../../mod/acl.php:222
+msgid "network"
+msgstr "nettverk"
 
-#: ../../mod/magic.php:69
-msgid "Hub not found."
-msgstr "Hubben ble ikke funnet."
+#: ../../mod/acl.php:232
+msgid "RSS"
+msgstr "RSS"
 
-#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
-msgid "This setting requires special processing and editing has been blocked."
-msgstr "Denne innstillingen krever spesiell behandling og redigering har blitt blokkert."
+#: ../../mod/dav.php:121
+msgid "$Projectname channel"
+msgstr "$Projectname-kanal"
 
-#: ../../mod/pconfig.php:49
-msgid "Configuration Editor"
-msgstr "Konfigurasjonsbehandler"
+#: ../../mod/dreport.php:23
+msgid "Invalid message"
+msgstr "Ugyldig melding"
 
-#: ../../mod/pconfig.php:50
+#: ../../mod/dreport.php:55
+msgid "no results"
+msgstr "ingen resultater"
+
+#: ../../mod/dreport.php:60
+#, php-format
+msgid "Delivery report for %1$s"
+msgstr "Leveringsrapport for %1$s"
+
+#: ../../mod/dreport.php:74
+msgid "channel sync processed"
+msgstr "Kanalsynkronisering er behandlet"
+
+#: ../../mod/dreport.php:78
+msgid "queued"
+msgstr "lagt i kø"
+
+#: ../../mod/dreport.php:82
+msgid "posted"
+msgstr "lagt inn"
+
+#: ../../mod/dreport.php:86
+msgid "accepted for delivery"
+msgstr "akseptert for levering"
+
+#: ../../mod/dreport.php:90
+msgid "updated"
+msgstr "oppdatert"
+
+#: ../../mod/dreport.php:93
+msgid "update ignored"
+msgstr "oppdatering ignorert"
+
+#: ../../mod/dreport.php:96
+msgid "permission denied"
+msgstr "tillatelse avvist"
+
+#: ../../mod/dreport.php:100
+msgid "recipient not found"
+msgstr "mottaker ble ikke funnet"
+
+#: ../../mod/dreport.php:103
+msgid "mail recalled"
+msgstr "melding tilbakekalt"
+
+#: ../../mod/dreport.php:106
+msgid "duplicate mail received"
+msgstr "duplikat av melding mottatt"
+
+#: ../../mod/dreport.php:109
+msgid "mail delivered"
+msgstr "melding mottatt"
+
+#: ../../mod/editwebpage.php:77 ../../mod/editblock.php:78
+#: ../../mod/editblock.php:94 ../../mod/editlayout.php:76
+#: ../../mod/editpost.php:20
+msgid "Item not found"
+msgstr "Elementet ble ikke funnet."
+
+#: ../../mod/editwebpage.php:153
+msgid "Delete webpage?"
+msgstr "Slett webside?"
+
+#: ../../mod/editwebpage.php:172
+msgid "Page link title"
+msgstr "Sidens lenketittel"
+
+#: ../../mod/editwebpage.php:185 ../../mod/editblock.php:145
+#: ../../mod/editlayout.php:143 ../../mod/editpost.php:121
+msgid "Insert YouTube video"
+msgstr "Sett inn YouTube-video"
+
+#: ../../mod/editwebpage.php:186 ../../mod/editblock.php:146
+#: ../../mod/editlayout.php:144 ../../mod/editpost.php:122
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Sett inn Vorbis [.ogg] video"
+
+#: ../../mod/editwebpage.php:187 ../../mod/editblock.php:147
+#: ../../mod/editlayout.php:145 ../../mod/editpost.php:123
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Legg i"
+
+#: ../../mod/editwebpage.php:222
+msgid "Edit Webpage"
+msgstr "Endre webside"
+
+#: ../../mod/oexchange.php:23
+msgid "Unable to find your hub."
+msgstr "Ikke i stand til å finne hubben din."
+
+#: ../../mod/oexchange.php:37
+msgid "Post successful."
+msgstr "Innlegg vellykket."
+
+#: ../../mod/ping.php:260
+msgid "sent you a private message"
+msgstr "sendte deg en privat melding"
+
+#: ../../mod/ping.php:308
+msgid "added your channel"
+msgstr "la til din kanal"
+
+#: ../../mod/ping.php:350
+msgid "posted an event"
+msgstr "la ut en hendelse"
+
+#: ../../mod/api.php:74 ../../mod/api.php:98
+msgid "Authorize application connection"
+msgstr "Tillat programforbindelse"
+
+#: ../../mod/api.php:75
+msgid "Return to your app and insert this Securty Code:"
+msgstr "GÃ¥ tilbake til din app og legg inn denne sikkerhetskoden:"
+
+#: ../../mod/api.php:85
+msgid "Please login to continue."
+msgstr "Vennligst logg inn for å fortsette."
+
+#: ../../mod/api.php:100
 msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please"
-" leave this page unless you are comfortable with and knowledgeable about how"
-" to correctly use this feature."
-msgstr "Advarsel: kanalen din kan slutte å virke ved endring av enkelte innstillinger. Vennligst forlat denne siden med mindre du er komfortabel med dette og vet hvordan du bruker denne funksjonen riktig."
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Vil du tillate dette programmet å få tilgang til dine innlegg og kontakter, og/eller lage nye innlegg for deg?"
 
-#: ../../mod/pubsites.php:16
-msgid "Public Sites"
-msgstr "Offentlige nettsteder"
+#: ../../mod/notify.php:53 ../../mod/notifications.php:94
+msgid "No more system notifications."
+msgstr "Ingen flere systemvarsler."
+
+#: ../../mod/notify.php:57 ../../mod/notifications.php:98
+msgid "System Notifications"
+msgstr "Systemvarsler"
+
+#: ../../mod/rbmark.php:90
+msgid "Select a bookmark folder"
+msgstr "Velg en bokmerkemappe"
+
+#: ../../mod/rbmark.php:95
+msgid "Save Bookmark"
+msgstr "Lagre bokmerke"
+
+#: ../../mod/rbmark.php:96
+msgid "URL of bookmark"
+msgstr "URL-en til bokmerket"
+
+#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:450
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: ../../mod/rbmark.php:101
+msgid "Or enter new bookmark folder name"
+msgstr "Eller skriv nytt navn på bokmerkemappe"
+
+#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+msgid "Contact not found."
+msgstr "Kontakten ble ikke funnet."
+
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
+msgstr "Venneforespørsel sendt."
+
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
+msgstr "Foreslå venner"
+
+#: ../../mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Foreslå en venn for %s"
+
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
+msgstr "Mislyktes med å lage kilde. Ingen kanal er valgt."
+
+#: ../../mod/sources.php:45
+msgid "Source created."
+msgstr "Kilden er laget."
 
-#: ../../mod/pubsites.php:19
+#: ../../mod/sources.php:57
+msgid "Source updated."
+msgstr "Kilden er oppdatert."
+
+#: ../../mod/sources.php:82
+msgid "*"
+msgstr "*"
+
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
+msgstr "HÃ¥ndtere eksterne innholdskilder til din kanal."
+
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
+msgstr "Ny kilde"
+
+#: ../../mod/sources.php:101 ../../mod/sources.php:133
 msgid ""
-"The listed sites allow public registration for the $Projectname network. All"
-" sites in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some sites may require subscription or"
-" provide tiered service plans. The provider links <strong>may</strong> "
-"provide additional details."
-msgstr "Nettstedene på listen tillater offentlig registrering i $Projectname-nettverket. Alle nettsteder i nettverket er forbundet så medlemskap på enhver av dem formidler medlemskap i hele matrix. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Tilbyderlenkene <strong>kan</strong> gi tilleggsopplysninger."
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+msgstr "Importer alt eller et utvalgt av innhold fra følgende kanal inn i denne kanalen og distribuer det i henhold til dine egne kanalinnstillinger."
 
-#: ../../mod/pubsites.php:25
-msgid "Rate this hub"
-msgstr "Vurder denne hubben"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
+msgstr "Bare importer innhold med disse ordene (ett ord per linje)"
 
-#: ../../mod/pubsites.php:26
-msgid "Site URL"
-msgstr "Nettstedets URL"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
+msgstr "La stå tomt for å importere alt offentlig innhold"
 
-#: ../../mod/pubsites.php:26
-msgid "Access Type"
-msgstr "Tilgangstype"
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
+msgstr "Kilden ble ikke funnet."
 
-#: ../../mod/pubsites.php:26
-msgid "Registration Policy"
-msgstr "Retningslinjer for registrering"
+#: ../../mod/sources.php:130
+msgid "Edit Source"
+msgstr "Endre kilde"
 
-#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
-msgid "Location"
-msgstr "Plassering"
+#: ../../mod/sources.php:131
+msgid "Delete Source"
+msgstr "Slett kilde"
 
-#: ../../mod/pubsites.php:26
-msgid "View hub ratings"
-msgstr "Vis vurderinger av hubben"
+#: ../../mod/sources.php:158
+msgid "Source removed"
+msgstr "Kilden er fjernet"
 
-#: ../../mod/pubsites.php:30
-msgid "Rate"
-msgstr "Vurder"
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
+msgstr "Ikke i stand til å fjerne kilde."
 
-#: ../../mod/pubsites.php:31
-msgid "View ratings"
-msgstr "Vis vurderinger"
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr "Ugyldig forespørselsidentifikator."
 
-#: ../../mod/filestorage.php:82
-msgid "Permission Denied."
-msgstr "Tillatelse avvist."
+#: ../../mod/notifications.php:35
+msgid "Discard"
+msgstr "Forkast"
 
-#: ../../mod/filestorage.php:98
-msgid "File not found."
-msgstr "Filen ble ikke funnet."
+#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
+msgid "Tag removed"
+msgstr "Merkelapp fjernet"
 
-#: ../../mod/filestorage.php:141
-msgid "Edit file permissions"
-msgstr "Endre filtillatelser"
+#: ../../mod/tagrm.php:119
+msgid "Remove Item Tag"
+msgstr "Fjern merkelapp fra element"
 
-#: ../../mod/filestorage.php:150
-msgid "Set/edit permissions"
-msgstr "Angi/endre tillatelser"
+#: ../../mod/tagrm.php:121
+msgid "Select a tag to remove: "
+msgstr "Velg merkelapp å fjerne:"
 
-#: ../../mod/filestorage.php:151
-msgid "Include all files and sub folders"
-msgstr "Inkluder alle filer og undermapper"
+#: ../../mod/tagrm.php:133 ../../mod/photos.php:951
+msgid "Remove"
+msgstr "Fjern"
 
-#: ../../mod/filestorage.php:152
-msgid "Return to file list"
-msgstr "GÃ¥ tilbake til filoversikten"
+#: ../../mod/directory.php:236
+#, php-format
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] "%d vurdering"
+msgstr[1] "%d vurderinger"
 
-#: ../../mod/filestorage.php:154
-msgid "Copy/paste this code to attach file to a post"
-msgstr "Kopier og lim inn denne koden for å legge til filen i et innlegg"
+#: ../../mod/directory.php:247
+msgid "Gender: "
+msgstr "Kjønn:"
 
-#: ../../mod/filestorage.php:155
-msgid "Copy/paste this URL to link file from a web page"
-msgstr "Kopier og lim inn denne URL-en for å lenke til filen fra en webside"
+#: ../../mod/directory.php:249
+msgid "Status: "
+msgstr "Status:"
 
-#: ../../mod/filestorage.php:157
-msgid "Share this file"
-msgstr "Del denne filen"
+#: ../../mod/directory.php:251
+msgid "Homepage: "
+msgstr "Hjemmeside:"
 
-#: ../../mod/filestorage.php:158
-msgid "Show URL to this file"
-msgstr "Vis URLen til denne filen"
+#: ../../mod/directory.php:310
+msgid "Description:"
+msgstr "Beskrivelse:"
 
-#: ../../mod/filestorage.php:159
-msgid "Notify your contacts about this file"
-msgstr "Varsle dine kontakter om denne filen"
+#: ../../mod/directory.php:319
+msgid "Public Forum:"
+msgstr "Offentlig forum:"
 
-#: ../../mod/layouts.php:121 ../../mod/layouts.php:179
-#: ../../mod/editlayout.php:161
-msgid "Layout Name"
-msgstr "Layout-navn"
+#: ../../mod/directory.php:322
+msgid "Keywords: "
+msgstr "Nøkkelord:"
 
-#: ../../mod/layouts.php:124 ../../mod/editlayout.php:159
-msgid "Layout Description (Optional)"
-msgstr "Layoutens beskrivelse (valgfritt)"
+#: ../../mod/directory.php:325
+msgid "Don't suggest"
+msgstr "Ikke foreslå"
 
-#: ../../mod/layouts.php:176
-msgid "Comanche page description language help"
-msgstr "Hjelp med Comanche sidebeskrivelsesspråk"
+#: ../../mod/directory.php:327
+msgid "Common connections:"
+msgstr "Felles forbindelser:"
 
-#: ../../mod/layouts.php:180
-msgid "Layout Description"
-msgstr "Layout-beskrivelse"
+#: ../../mod/directory.php:376
+msgid "Global Directory"
+msgstr "Global katalog"
 
-#: ../../mod/layouts.php:185
-msgid "Download PDL file"
-msgstr "Last ned PDL-fil"
+#: ../../mod/directory.php:376
+msgid "Local Directory"
+msgstr "Lokal katalog"
 
-#: ../../mod/poke.php:164
-msgid "Poke/Prod"
-msgstr "Prikke/oppildne"
+#: ../../mod/directory.php:382
+msgid "Finding:"
+msgstr "Finner:"
 
-#: ../../mod/poke.php:165
-msgid "poke, prod or do other things to somebody"
-msgstr "prikke, oppildne eller gjør andre ting med noen"
+#: ../../mod/directory.php:387
+msgid "next page"
+msgstr "Neste side"
 
-#: ../../mod/poke.php:166
-msgid "Recipient"
-msgstr "Mottaker"
+#: ../../mod/directory.php:387
+msgid "previous page"
+msgstr "Forrige side"
 
-#: ../../mod/poke.php:167
-msgid "Choose what you wish to do to recipient"
-msgstr "Velg hva du ønsker å gjøre med mottakeren"
+#: ../../mod/directory.php:388
+msgid "Sort options"
+msgstr "Sorteringsvalg"
 
-#: ../../mod/poke.php:170
-msgid "Make this post private"
-msgstr "Gjør dette innlegget privat"
+#: ../../mod/directory.php:389
+msgid "Alphabetic"
+msgstr "Alfabetisk"
 
-#: ../../mod/network.php:91
-msgid "No such group"
-msgstr "Gruppen finnes ikke"
+#: ../../mod/directory.php:390
+msgid "Reverse Alphabetic"
+msgstr "Omvendt alfabetisk"
 
-#: ../../mod/network.php:131
-msgid "No such channel"
-msgstr "Ingen slik kanal"
+#: ../../mod/directory.php:391
+msgid "Newest to Oldest"
+msgstr "Nyest til eldst"
 
-#: ../../mod/network.php:136
-msgid "forum"
-msgstr "forum"
+#: ../../mod/directory.php:392
+msgid "Oldest to Newest"
+msgstr "Eldst til nyest"
 
-#: ../../mod/network.php:148
-msgid "Search Results For:"
-msgstr "Søkeresultat for:"
+#: ../../mod/directory.php:409
+msgid "No entries (some entries may be hidden)."
+msgstr "Ingen oppføringer (noen oppføringer kan være skjult)."
 
-#: ../../mod/network.php:207
-msgid "Collection is empty"
-msgstr "Samlingen er tom"
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
+msgstr "Ingen gyldig konto funnet."
 
-#: ../../mod/network.php:216
-msgid "Collection: "
-msgstr "Samling:"
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
+msgstr "Forespørsel om å tilbakestille passord er mottatt. Sjekk e-posten din."
 
-#: ../../mod/network.php:242
-msgid "Invalid connection."
-msgstr "Ugyldig forbindelse."
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Nettstedsmedlem (%s)"
 
-#: ../../mod/chat.php:19 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr "Du må være innloegget for å se denne siden."
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Forespurt om å tilbakestille passord hos %s"
 
-#: ../../mod/chat.php:171
-msgid "Room not found"
-msgstr "Rommet ble ikke funnet"
+#: ../../mod/lostpass.php:63
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Forespørsel kunne ikke bekreftes. (Du kan ha sendt den inn tidligere.) Tilbakestilling av passord mislyktes."
 
-#: ../../mod/chat.php:182
-msgid "Leave Room"
-msgstr "Forlat rom"
+#: ../../mod/lostpass.php:86 ../../boot.php:1496
+msgid "Password Reset"
+msgstr "Tilbakestill passord"
 
-#: ../../mod/chat.php:183
-msgid "Delete This Room"
-msgstr "Slett dette rommet"
+#: ../../mod/lostpass.php:87
+msgid "Your password has been reset as requested."
+msgstr "Ditt passord har blitt tilbakestilt som forespurt."
 
-#: ../../mod/chat.php:184
-msgid "I am away right now"
-msgstr "Jeg er borte akkurat nå"
+#: ../../mod/lostpass.php:88
+msgid "Your new password is"
+msgstr "Ditt nye passord er"
 
-#: ../../mod/chat.php:185
-msgid "I am online"
-msgstr "Jeg er online"
+#: ../../mod/lostpass.php:89
+msgid "Save or copy your new password - and then"
+msgstr "Lagre eller kopier ditt nye passord, og deretter kan du"
 
-#: ../../mod/chat.php:187
-msgid "Bookmark this room"
-msgstr "Bokmerk dette rommet"
+#: ../../mod/lostpass.php:90
+msgid "click here to login"
+msgstr "klikke her for å logge inn"
 
-#: ../../mod/chat.php:205 ../../mod/chat.php:227
-msgid "New Chatroom"
-msgstr "Nytt chatrom"
+#: ../../mod/lostpass.php:91
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Ditt passord kan endres på siden <em>Innstillinger</em> etter vellykket innlogging."
 
-#: ../../mod/chat.php:206
-msgid "Chatroom Name"
-msgstr "Navn på chatrom"
+#: ../../mod/lostpass.php:108
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Ditt passord er endret hos %s"
+
+#: ../../mod/lostpass.php:123
+msgid "Forgot your Password?"
+msgstr "Glemt passord ditt?"
+
+#: ../../mod/lostpass.php:124
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Skriv e-postadressen din og send inn for å tilbakestille passordet ditt. Sjekk deretter din e-post for videre instruksjoner."
+
+#: ../../mod/lostpass.php:125
+msgid "Email Address"
+msgstr "E-postadresse"
+
+#: ../../mod/lostpass.php:126
+msgid "Reset"
+msgstr "Tilbakestill"
 
-#: ../../mod/chat.php:223
+#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Dette nettstedet er ikke en katalogtjener"
+
+#: ../../mod/impel.php:192
 #, php-format
-msgid "%1$s's Chatrooms"
-msgstr "%1$s sine chatrom"
+msgid "%s element installed"
+msgstr "%s element installert"
 
-#: ../../mod/search.php:209
+#: ../../mod/impel.php:195
 #, php-format
-msgid "Items tagged with: %s"
-msgstr "Elementer merket med: %s"
+msgid "%s element installation failed"
+msgstr "Installasjon av %s-element mislyktes"
 
-#: ../../mod/search.php:211
+#: ../../mod/subthread.php:114
 #, php-format
-msgid "Search results for: %s"
-msgstr "Søkeresultater for: %s"
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s følger %2$s sin %3$s"
 
-#: ../../mod/message.php:34
-msgid "Conversation removed."
-msgstr "Samtale fjernet."
+#: ../../mod/subthread.php:116
+#, php-format
+msgid "%1$s stopped following %2$s's %3$s"
+msgstr "%1$s stopped å følge %2$s sin %3$s"
 
-#: ../../mod/channel.php:97
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Utilstrekkelig tillatelse. Forespørsel omdirigert til profilsiden."
+#: ../../mod/import.php:28
+#, php-format
+msgid "Your service plan only allows %d channels."
+msgstr "Din tjenesteplan tillater bare %d kanaler."
 
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
-#: ../../mod/editblock.php:94 ../../mod/editlayout.php:76
-#: ../../mod/editwebpage.php:77
-msgid "Item not found"
-msgstr "Elementet ble ikke funnet."
+#: ../../mod/import.php:66 ../../mod/import_items.php:38
+msgid "Nothing to import."
+msgstr "Ingenting å importere."
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "Elementet kan ikke endres"
+#: ../../mod/import.php:90 ../../mod/import_items.php:62
+msgid "Unable to download data from old server"
+msgstr "Ikke i stand til å laste ned data fra gammel tjener"
 
-#: ../../mod/editpost.php:55
-msgid "Delete item?"
-msgstr "Slett element?"
+#: ../../mod/import.php:96 ../../mod/import_items.php:68
+msgid "Imported file is empty."
+msgstr "Importert fil er tom."
 
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:145
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
-msgid "Insert YouTube video"
-msgstr "Sett inn YouTube-video"
+#: ../../mod/import.php:116 ../../mod/import_items.php:82
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Advarsel: databaseversjoner avviker med %1$d oppdateringer."
 
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:146
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Sett inn Vorbis [.ogg] video"
+#: ../../mod/import.php:149
+msgid "No channel. Import failed."
+msgstr "Ingen kanal. Import mislyktes."
 
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:147
-#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Legg i"
+#: ../../mod/import.php:509
+msgid "You must be logged in to use this feature."
+msgstr "Du må være innlogget for å bruke denne funksjonen."
 
-#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
-msgid "Edit post"
-msgstr "Endre innlegg"
+#: ../../mod/import.php:514
+msgid "Import Channel"
+msgstr "Importer kanal"
 
-#: ../../mod/dreport.php:15
-msgid "Invalid message"
-msgstr "Ugyldig melding"
+#: ../../mod/import.php:515
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You"
+" may retrieve the channel identity from the old server/hub via the network "
+"or provide an export file."
+msgstr "Bruk dette skjemaet for å importere en eksisterende kanal fra en annen tjener/hub. Du kan hente inn kanalidentiteten fra den gamle tjeneren/huben via nettverket eller ved å bruke en eksportfil."
 
-#: ../../mod/dreport.php:25
-msgid "no results"
-msgstr "ingen resultater"
+#: ../../mod/import.php:516 ../../mod/import_items.php:121
+msgid "File to Upload"
+msgstr "Fil som skal lastes opp"
+
+#: ../../mod/import.php:517
+msgid "Or provide the old server/hub details"
+msgstr "Eller oppgi detaljene fra den gamle tjeneren/hub-en"
+
+#: ../../mod/import.php:518
+msgid "Your old identity address (xyz@example.com)"
+msgstr "Din gamle identitetsadresse (xyz@example.com)"
+
+#: ../../mod/import.php:519
+msgid "Your old login email address"
+msgstr "Din gamle innloggings e-postadresse"
+
+#: ../../mod/import.php:520
+msgid "Your old login password"
+msgstr "Ditt gamle innloggingspassord"
+
+#: ../../mod/import.php:521
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be"
+" able to post from either location, but only one can be marked as the "
+"primary location for files, photos, and media."
+msgstr "Enten du tar det ene eller det andre valget, vennligst angi om du vil at denne hubben skal være din nye primære adresse, eller om din gamle plassering skal fortsette å ha denne rollen. Du kan lage innlegg fra den ene eller den andre plasseringen, men bare en av dem kan markeres som den primære plasseringen for filer, bilder og media."
+
+#: ../../mod/import.php:522
+msgid "Make this hub my primary location"
+msgstr "Gjør dette nettstedet til min primære plassering"
 
-#: ../../mod/dreport.php:30
+#: ../../mod/import.php:523
+msgid ""
+"Import existing posts if possible (experimental - limited by available "
+"memory"
+msgstr "Importer eksisterende innlegg om mulig (eksperimentelt - begrenset av tilgjengelig minne)"
+
+#: ../../mod/import.php:524
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Denne prosessen kan ta flere minutter å fullføre. Vennligst send inn dette skjemaet bare en gang og la siden være åpen inntil den er ferdig."
+
+#: ../../mod/invite.php:25
+msgid "Total invitation limit exceeded."
+msgstr "Grensen for totalt antall invitasjoner er overskredet."
+
+#: ../../mod/invite.php:49
 #, php-format
-msgid "Delivery report for %1$s"
-msgstr "Leveringsrapport for %1$s"
+msgid "%s : Not a valid email address."
+msgstr "%s : ikke en gyldig e-postadresse."
 
-#: ../../mod/dreport.php:39
-msgid "channel sync processed"
-msgstr "Kanalsynkronisering er behandlet"
+#: ../../mod/invite.php:59
+msgid "Please join us on $Projectname"
+msgstr "Bli med oss på $Projectname"
 
-#: ../../mod/dreport.php:43
-msgid "queued"
-msgstr "lagt i kø"
+#: ../../mod/invite.php:70
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Invitasjonsgrensen er overskredet. Vennligst kontakt administratoren ved ditt nettsted."
 
-#: ../../mod/dreport.php:47
-msgid "posted"
-msgstr "lagt inn"
+#: ../../mod/invite.php:75
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : meldingslevering feilet."
 
-#: ../../mod/dreport.php:51
-msgid "accepted for delivery"
-msgstr "akseptert for levering"
+#: ../../mod/invite.php:79
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d melding sendt."
+msgstr[1] "%d meldinger sendt."
 
-#: ../../mod/dreport.php:55
-msgid "updated"
-msgstr "oppdatert"
+#: ../../mod/invite.php:98
+msgid "You have no more invitations available"
+msgstr "Du har ikke flere invitasjoner tilgjengelig"
 
-#: ../../mod/dreport.php:58
-msgid "update ignored"
-msgstr "oppdatering ignorert"
+#: ../../mod/invite.php:129
+msgid "Send invitations"
+msgstr "Send invitasjoner"
 
-#: ../../mod/dreport.php:61
-msgid "permission denied"
-msgstr "tillatelse avvist"
+#: ../../mod/invite.php:130
+msgid "Enter email addresses, one per line:"
+msgstr "Skriv e-postadresser, en per linje:"
+
+#: ../../mod/invite.php:131 ../../mod/mail.php:246
+msgid "Your message:"
+msgstr "Din melding:"
+
+#: ../../mod/invite.php:132
+msgid "Please join my community on $Projectname."
+msgstr "Du er velkommen til å bli med i mitt fellesskap på $Projectname."
+
+#: ../../mod/invite.php:134
+msgid "You will need to supply this invitation code: "
+msgstr "Du må oppgi denne invitasjonskoden:"
+
+#: ../../mod/invite.php:135
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Registrer ved enhver $Projectname-lokasjon (de er alle forbundet med hverandre)"
+
+#: ../../mod/invite.php:137
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Skriv inn min $Projectname-adresse i nettstedets søkefelt."
+
+#: ../../mod/invite.php:138
+msgid "or visit "
+msgstr "eller besøk"
+
+#: ../../mod/invite.php:140
+msgid "3. Click [Connect]"
+msgstr "3. Klikk [Forbindelse]"
+
+#: ../../mod/probe.php:24 ../../mod/probe.php:30
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr "Henting av URL gir følgende feil: %1$s"
+
+#: ../../mod/profile_photo.php:112
+msgid "Image uploaded but image cropping failed."
+msgstr "Bildet ble lastet opp, men beskjæring av bildet mislyktes."
+
+#: ../../mod/profile_photo.php:166
+msgid "Image resize failed."
+msgstr "Endring av bildestørrelse mislyktes."
+
+#: ../../mod/profile_photo.php:212
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Hold nede Shift-knappen og last siden på nytt eller tøm nettleserens mellomlager hvis det nye bildet ikke vises umiddelbart."
+
+#: ../../mod/profile_photo.php:250
+msgid "Image upload failed."
+msgstr "Opplasting av bildet mislyktes."
+
+#: ../../mod/profile_photo.php:269
+msgid "Unable to process image."
+msgstr "Kan ikke behandle bildet."
+
+#: ../../mod/profile_photo.php:297
+msgid "female"
+msgstr "kvinne"
+
+#: ../../mod/profile_photo.php:298
+#, php-format
+msgid "%1$s updated her %2$s"
+msgstr "%1$s oppdaterte %2$s sitt"
+
+#: ../../mod/profile_photo.php:299
+msgid "male"
+msgstr "mann"
+
+#: ../../mod/profile_photo.php:300
+#, php-format
+msgid "%1$s updated his %2$s"
+msgstr "%1$s oppdaterte %2$s sitt"
+
+#: ../../mod/profile_photo.php:302
+#, php-format
+msgid "%1$s updated their %2$s"
+msgstr "%1$s oppdaterte %2$s deres"
+
+#: ../../mod/profile_photo.php:304
+msgid "profile photo"
+msgstr "profilbilde"
+
+#: ../../mod/profile_photo.php:368 ../../mod/profile_photo.php:409
+msgid "Photo not available."
+msgstr "Bildet er ikke tilgjengelig."
+
+#: ../../mod/profile_photo.php:450
+msgid "Upload File:"
+msgstr "Last opp fil:"
+
+#: ../../mod/profile_photo.php:451
+msgid "Select a profile:"
+msgstr "Velg en profil:"
+
+#: ../../mod/profile_photo.php:452
+msgid "Upload Profile Photo"
+msgstr "Last opp profilbilde:"
+
+#: ../../mod/profile_photo.php:457 ../../mod/settings.php:975
+msgid "or"
+msgstr "eller"
+
+#: ../../mod/profile_photo.php:457
+msgid "skip this step"
+msgstr "hopp over dette steget"
+
+#: ../../mod/profile_photo.php:457
+msgid "select a photo from your photo albums"
+msgstr "velg et bilde fra dine fotoalbum"
+
+#: ../../mod/profile_photo.php:473
+msgid "Crop Image"
+msgstr "Beskjær bildet"
+
+#: ../../mod/profile_photo.php:474
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Vennligst juster bildebeskjæringen for optimal visning."
+
+#: ../../mod/profile_photo.php:476
+msgid "Done Editing"
+msgstr "Avslutt redigering"
+
+#: ../../mod/thing.php:111
+msgid "Thing updated"
+msgstr "Tingen er oppdatert"
+
+#: ../../mod/thing.php:163
+msgid "Object store: failed"
+msgstr "Objektlagring: mislyktes"
+
+#: ../../mod/thing.php:167
+msgid "Thing added"
+msgstr "Ting lagt til"
+
+#: ../../mod/thing.php:193
+#, php-format
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr "OBJ: %1$s %2$s %3$s"
+
+#: ../../mod/thing.php:256
+msgid "Show Thing"
+msgstr "Vis ting"
+
+#: ../../mod/thing.php:263
+msgid "item not found."
+msgstr "element ble ikke funnet."
+
+#: ../../mod/thing.php:296
+msgid "Edit Thing"
+msgstr "Endre ting"
+
+#: ../../mod/thing.php:298 ../../mod/thing.php:348
+msgid "Select a profile"
+msgstr "Velg en profil"
+
+#: ../../mod/thing.php:302 ../../mod/thing.php:351
+msgid "Post an activity"
+msgstr "Legg inn en aktivitet"
+
+#: ../../mod/thing.php:302 ../../mod/thing.php:351
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Sender bare til seere av den aktuelle profilen"
+
+#: ../../mod/thing.php:304 ../../mod/thing.php:353
+msgid "Name of thing e.g. something"
+msgstr "Navn på ting for eksempel noe"
+
+#: ../../mod/thing.php:306 ../../mod/thing.php:354
+msgid "URL of thing (optional)"
+msgstr "URL til ting (valgfritt)"
+
+#: ../../mod/thing.php:308 ../../mod/thing.php:355
+msgid "URL for photo of thing (optional)"
+msgstr "URL til bilde av ting (valgfritt)"
+
+#: ../../mod/thing.php:346
+msgid "Add Thing to your Profile"
+msgstr "Legg til ting i din profil"
+
+#: ../../mod/dirsearch.php:29
+msgid "This directory server requires an access token"
+msgstr "Denne katalogtjeneren krever en tilgangsnøkkel (access token)"
 
 #: ../../mod/editblock.php:118
 msgid "Delete block?"
@@ -5283,2131 +6552,942 @@ msgstr "Slett byggeklossen?"
 msgid "Edit Block"
 msgstr "Endre byggekloss"
 
-#: ../../mod/home.php:57 ../../mod/home.php:63 ../../mod/siteinfo.php:157
-msgid "$Projectname"
-msgstr "$Projectname"
+#: ../../mod/removeaccount.php:30
+msgid ""
+"Account removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr "Sletting av kontoer er ikke tillatt innen 48 timer etter endring av kontopassordet."
 
-#: ../../mod/home.php:73
-#, php-format
-msgid "Welcome to %s"
-msgstr "Velkommen til %s"
+#: ../../mod/removeaccount.php:57
+msgid "Remove This Account"
+msgstr "Slett denne kontoen"
 
-#: ../../mod/item.php:174
-msgid "Unable to locate original post."
-msgstr "Ikke i stand til å finne opprinnelig innlegg."
+#: ../../mod/removeaccount.php:58
+msgid ""
+"This account and all its channels will be completely removed from the "
+"network. "
+msgstr "Denne kontoen og alle dens kanaler vil bli fullstendig fjernet fra nettverket."
 
-#: ../../mod/item.php:407
-msgid "Empty post discarded."
-msgstr "Tomt innlegg forkastet."
+#: ../../mod/removeaccount.php:60
+msgid ""
+"Remove this account, all its channels and all its channel clones from the "
+"network"
+msgstr "Slett denne kontoen, alle dens kanaler og alle dens kanalkloner fra dette nettverket"
 
-#: ../../mod/item.php:447
-msgid "Executable content type not permitted to this channel."
-msgstr "Kjørbar innholdstype er ikke tillat for denne kanalen."
+#: ../../mod/removeaccount.php:60
+msgid ""
+"By default only the instances of the channels located on this hub will be "
+"removed from the network"
+msgstr "Som standard vil bare forekomster av kanalene lokalisert på denne hubben bli slettet fra nettverket"
 
-#: ../../mod/item.php:896
-msgid "System error. Post not saved."
-msgstr "Systemfeil. Innlegg ble ikke lagret."
+#: ../../mod/removeaccount.php:61 ../../mod/settings.php:700
+msgid "Remove Account"
+msgstr "Slett konto"
 
-#: ../../mod/item.php:1163
-msgid "Unable to obtain post information from database."
-msgstr "Ikke i stand til å få tak i informasjon om innlegg fra databasen."
+#: ../../mod/import_items.php:101
+msgid "Import completed"
+msgstr "Import ferdig"
+
+#: ../../mod/import_items.php:119
+msgid "Import Items"
+msgstr "Importer elementer"
+
+#: ../../mod/import_items.php:120
+msgid ""
+"Use this form to import existing posts and content from an export file."
+msgstr "Bruk dette skjemaet for å importere eksisterende innlegg og innhold fra en eksportfil."
+
+#: ../../mod/network.php:91
+msgid "No such group"
+msgstr "Gruppen finnes ikke"
+
+#: ../../mod/network.php:131
+msgid "No such channel"
+msgstr "Ingen slik kanal"
+
+#: ../../mod/network.php:136
+msgid "forum"
+msgstr "forum"
+
+#: ../../mod/network.php:148
+msgid "Search Results For:"
+msgstr "Søkeresultat for:"
+
+#: ../../mod/network.php:207
+msgid "Collection is empty"
+msgstr "Samlingen er tom"
+
+#: ../../mod/network.php:216
+msgid "Collection: "
+msgstr "Samling:"
+
+#: ../../mod/network.php:242
+msgid "Invalid connection."
+msgstr "Ugyldig forbindelse."
+
+#: ../../mod/pdledit.php:13
+msgid "Layout updated."
+msgstr "Layout er oppdatert."
+
+#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
+msgid "Edit System Page Description"
+msgstr "Endre beskrivelsen av systemsiden"
+
+#: ../../mod/pdledit.php:48
+msgid "Layout not found."
+msgstr "Layouten ble ikke funnet."
+
+#: ../../mod/pdledit.php:54
+msgid "Module Name:"
+msgstr "Modulnavn:"
+
+#: ../../mod/pdledit.php:55
+msgid "Layout Help"
+msgstr "Layout-hjelp"
+
+#: ../../mod/register.php:44
+msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
+msgstr "Antallet daglige registreringer ved nettstedet er overskredet. Vær vennlig å prøve igjen imorgen."
+
+#: ../../mod/register.php:50
+msgid ""
+"Please indicate acceptance of the Terms of Service. Registration failed."
+msgstr "Vennligst angi at tjenesteavtalen er akseptert. Registrering mislyktes."
+
+#: ../../mod/register.php:84
+msgid "Passwords do not match."
+msgstr "Passordene er ikke like."
+
+#: ../../mod/register.php:119
+msgid ""
+"Registration successful. Please check your email for validation "
+"instructions."
+msgstr "Registreringen er vellykket. Vennligst sjekk e-posten din for å bekrefte opprettelsen."
+
+#: ../../mod/register.php:125
+msgid "Your registration is pending approval by the site owner."
+msgstr "Din registrering venter på godkjenning av nettstedets eier."
+
+#: ../../mod/register.php:128
+msgid "Your registration can not be processed."
+msgstr "Din registrering kan ikke behandles."
 
-#: ../../mod/item.php:1170
+#: ../../mod/register.php:165
+msgid "Registration on this site/hub is by approval only."
+msgstr "Registrering på dette nettstedet/denne hubben skjer bare gjennom godkjenning."
+
+#: ../../mod/register.php:166
+msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
+msgstr "<a href=\"pubsites\">Registrer på et annet tilknyttet nettsted/hub</a>"
+
+#: ../../mod/register.php:176
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Dette nettstedet har overskredet antallet tillate kontoregistreringer per dag. Vennligst prøv igjen imorgen."
+
+#: ../../mod/register.php:187
+msgid "Terms of Service"
+msgstr "Tjenesteavtale"
+
+#: ../../mod/register.php:193
 #, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Du har nådd din grense på %1$.0f startinnlegg."
+msgid "I accept the %s for this website"
+msgstr "Jeg godtar %s for dette nettstedet"
 
-#: ../../mod/item.php:1177
+#: ../../mod/register.php:195
 #, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Du har nådd din grense på %1$.0f websider."
+msgid "I am over 13 years of age and accept the %s for this website"
+msgstr "Jeg er over 13 år gammel og aksepterer %s for dette nettstedet."
 
-#: ../../mod/oexchange.php:23
-msgid "Unable to find your hub."
-msgstr "Ikke i stand til å finne hubben din."
+#: ../../mod/register.php:209 ../../mod/admin.php:448
+msgid "Registration"
+msgstr "Registrering"
 
-#: ../../mod/oexchange.php:37
-msgid "Post successful."
-msgstr "Innlegg vellykket."
+#: ../../mod/register.php:214
+msgid "Membership on this site is by invitation only."
+msgstr "Medlemskap ved dette nettstedet skjer kun via invitasjon."
+
+#: ../../mod/register.php:215
+msgid "Please enter your invitation code"
+msgstr "Vennligst skriv din invitasjonskode"
 
-#: ../../mod/admin.php:52
+#: ../../mod/register.php:218
+msgid "Your email address"
+msgstr "Din e-postadresse"
+
+#: ../../mod/register.php:219
+msgid "Choose a password"
+msgstr "Velg et passord"
+
+#: ../../mod/register.php:220
+msgid "Please re-enter your password"
+msgstr "Vennligst skriv ditt passord en gang til"
+
+#: ../../mod/admin.php:54
 msgid "Theme settings updated."
 msgstr "Temainnstillinger er oppdatert."
 
-#: ../../mod/admin.php:160
+#: ../../mod/admin.php:162
 msgid "# Accounts"
 msgstr "# Kontoer"
 
-#: ../../mod/admin.php:161
+#: ../../mod/admin.php:163
 msgid "# blocked accounts"
 msgstr "# blokkerte kontoer"
 
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:164
 msgid "# expired accounts"
 msgstr "# utgåtte kontoer"
 
-#: ../../mod/admin.php:163
+#: ../../mod/admin.php:165
 msgid "# expiring accounts"
 msgstr "# kontoer som holder på å gå ut"
 
-#: ../../mod/admin.php:174
+#: ../../mod/admin.php:176
 msgid "# Channels"
 msgstr "# Kanaler"
 
-#: ../../mod/admin.php:175
+#: ../../mod/admin.php:177
 msgid "# primary"
 msgstr "# hoved"
 
-#: ../../mod/admin.php:176
+#: ../../mod/admin.php:178
 msgid "# clones"
 msgstr "# kloner"
 
-#: ../../mod/admin.php:182
+#: ../../mod/admin.php:184
 msgid "Message queues"
 msgstr "Meldingskøer"
 
-#: ../../mod/admin.php:198 ../../mod/admin.php:409 ../../mod/admin.php:506
-#: ../../mod/admin.php:774 ../../mod/admin.php:938 ../../mod/admin.php:1030
-#: ../../mod/admin.php:1070 ../../mod/admin.php:1230 ../../mod/admin.php:1264
-#: ../../mod/admin.php:1349
+#: ../../mod/admin.php:200 ../../mod/admin.php:445 ../../mod/admin.php:545
+#: ../../mod/admin.php:812 ../../mod/admin.php:976 ../../mod/admin.php:1073
+#: ../../mod/admin.php:1113 ../../mod/admin.php:1273 ../../mod/admin.php:1307
+#: ../../mod/admin.php:1392
 msgid "Administration"
 msgstr "Administrasjon"
 
-#: ../../mod/admin.php:199
+#: ../../mod/admin.php:201
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: ../../mod/admin.php:202
+#: ../../mod/admin.php:204
 msgid "Registered accounts"
 msgstr "Registrerte kontoer"
 
-#: ../../mod/admin.php:203 ../../mod/admin.php:510
+#: ../../mod/admin.php:205 ../../mod/admin.php:549
 msgid "Pending registrations"
 msgstr "Ventende registreringer"
 
-#: ../../mod/admin.php:204
+#: ../../mod/admin.php:206
 msgid "Registered channels"
 msgstr "Registrerte kanaler"
 
-#: ../../mod/admin.php:205 ../../mod/admin.php:511
+#: ../../mod/admin.php:207 ../../mod/admin.php:550
 msgid "Active plugins"
 msgstr "Aktive tilleggsfunksjoner"
 
-#: ../../mod/admin.php:206
+#: ../../mod/admin.php:208
 msgid "Version"
 msgstr "Versjon"
 
-#: ../../mod/admin.php:321
+#: ../../mod/admin.php:329
 msgid "Site settings updated."
 msgstr "Nettstedsinnstillinger er oppdatert."
 
-#: ../../mod/admin.php:358 ../../mod/settings.php:790
+#: ../../mod/admin.php:366 ../../mod/settings.php:793
 msgid "mobile"
 msgstr "mobil"
 
-#: ../../mod/admin.php:360
+#: ../../mod/admin.php:368
 msgid "experimental"
 msgstr "eksperimentell"
 
-#: ../../mod/admin.php:362
+#: ../../mod/admin.php:370
 msgid "unsupported"
 msgstr "ikke støttet"
 
-#: ../../mod/admin.php:387
+#: ../../mod/admin.php:416
 msgid "Yes - with approval"
 msgstr "Ja - med godkjenning"
 
-#: ../../mod/admin.php:393
+#: ../../mod/admin.php:422
 msgid "My site is not a public server"
 msgstr "Mitt nettsted er ikke en offentlig tjeneste"
 
-#: ../../mod/admin.php:394
+#: ../../mod/admin.php:423
 msgid "My site has paid access only"
 msgstr "Mitt nettsted gir kun tilgang mot betaling"
 
-#: ../../mod/admin.php:395
+#: ../../mod/admin.php:424
 msgid "My site has free access only"
 msgstr "Mitt nettsted har kun gratis tilgang"
 
-#: ../../mod/admin.php:396
+#: ../../mod/admin.php:425
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mitt nettsted tilbyr gratis konto med valgfri oppgradering til betalt tjeneste"
 
-#: ../../mod/admin.php:412 ../../mod/register.php:207
-msgid "Registration"
-msgstr "Registrering"
-
-#: ../../mod/admin.php:413
+#: ../../mod/admin.php:449
 msgid "File upload"
 msgstr "Last opp fil"
 
-#: ../../mod/admin.php:414
+#: ../../mod/admin.php:450
 msgid "Policies"
 msgstr "Retningslinjer"
 
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:455
 msgid "Site name"
 msgstr "Nettstedets navn"
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:456
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:457
 msgid "Administrator Information"
 msgstr "Administratorinformasjon"
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:457
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Kontaktinformasjon til nettstedsadministratorer. Vises på siteinfo-siden. BBCode kan brukes her"
 
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:458
 msgid "System language"
 msgstr "Systemspråk"
 
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:459
 msgid "System theme"
 msgstr "Systemtema"
 
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:459
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Standard systemtema - kan overstyres av brukerprofiler - <a href='#' id='cnftheme'>endre temainnstillinger</a>"
 
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:460
 msgid "Mobile system theme"
 msgstr "Mobilt systemtema"
 
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:460
 msgid "Theme for mobile devices"
 msgstr "Tema for mobile enheter"
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:462
 msgid "Allow Feeds as Connections"
 msgstr "Tillat strømmer som forbindelser"
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:462
 msgid "(Heavy system resource usage)"
 msgstr "(Tung bruk av systemressurser)"
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:463
 msgid "Maximum image size"
 msgstr "Største bildestørrelse"
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:463
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Største størrelse i bytes for opplastede bilder. Standard er 0, som betyr ubegrenset."
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:464
 msgid "Does this site allow new member registration?"
 msgstr "Tillater dette nettstedet registrering av nye medlemmer?"
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:465
+msgid "Invitation only"
+msgstr "Kun inviterte"
+
+#: ../../mod/admin.php:465
+msgid ""
+"Only allow new member registrations with an invitation code. Above register "
+"policy must be set to Yes."
+msgstr "Tillat bare nye medlemsregistreringer med en invitasjonskode. Ovenstående retningslinjer for registrering må være satt til Ja."
+
+#: ../../mod/admin.php:466
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Hvilket alternativ beskriver best hva slags kontotype som tilbys av dette nettstedet/denne hubben?"
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:467
 msgid "Register text"
 msgstr "Registreringstekst"
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:467
 msgid "Will be displayed prominently on the registration page."
 msgstr "Vil bli vist på en fremtredende måte på registreringssiden."
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:468
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Nettstedets hjemmeside som vises til besøkende (standard: innloggingsboks)"
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:468
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "eksempel: 'public' for å vise offentlig strøm av innlegg, 'page/sys/home/ for å vise en system-webside called 'home\" eller 'include:home.html' for å inkludere en fil."
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:469
 msgid "Preserve site homepage URL"
 msgstr "Bevar URL-en til nettstedets hjemmeside"
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:469
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Presenter hjemmesiden til nettstedet i en ramme fra den opprinnelige plasseringen i stedet for å omdirigere"
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:470
 msgid "Accounts abandoned after x days"
 msgstr "Kontoer forlatt etter x dager"
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:470
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Vil ikke kaste bort systemressurser på å spørre eksterne nettsteder etter forlatte kontoer. Skriv 0 for å ikke sette noen tidsgrense."
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:471
 msgid "Allowed friend domains"
 msgstr "Tillatte vennedomener"
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:471
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Kommaseparert liste over domener som har lov til å etablere vennskap med dette nettstedet. Jokertegn er akseptert. Tøm for å tillate alle domener."
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:472
 msgid "Allowed email domains"
 msgstr "Tillate e-postdomener"
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:472
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Kommaseparert liste med domener som er tillatt i e-postadresser ved registrering på dette nettstedet. Jokertegn er akseptert. Tomt betyr at alle domener er tillatt"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:473
 msgid "Not allowed email domains"
 msgstr "Ikke tillatte e-postdomener"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:473
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Kommaseparert liste med domener som ikke er tillatt i e-postadresser ved registrering på dette nettstedet. Jokertegn er akseptert. Tomt betyr at alle domener er tillatt, med mindre tillate domener er blitt definert."
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:474
 msgid "Block public"
 msgstr "Blokker offentlig tilgang"
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:474
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Kryss av for å blokkere tilgang til alle personlige sider som ellers ville vært offentlig tilgjengelige på dette nettstedet med mindre du er logget inn."
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:475
 msgid "Verify Email Addresses"
 msgstr "Bekreft e-postadresser"
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:475
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Sett hake for å sjekke e-postadresser brukt ved kontoregistrering (anbefales)."
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:476
 msgid "Force publish"
 msgstr "Tving publisering"
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:476
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Kryss av for å tvinge alle profiler på dette nettstedet til å bli oppført i nettstedet sin katalog."
 
-#: ../../mod/admin.php:440
-msgid "Disable discovery tab"
-msgstr "Skru av oppdagelsesfanen"
+#: ../../mod/admin.php:477
+msgid "Import Public Streams"
+msgstr "Importer offentlige innholdsstrømmer"
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:477
 msgid ""
-"Remove the tab in the network view with public content pulled from sources "
-"chosen for this site."
-msgstr "Fjern fanen fra nettverksvisningen med offentlig innhold trukket inn fra kilder valg for dette nettstedet."
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
+msgstr "Importer og gi tilgang til offentlig innhold trukket inn fra andre nettsteder. Advarsel: dette innholdet er ikke moderert."
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:478
 msgid "login on Homepage"
 msgstr "Logg inn på hjemmesiden"
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:478
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Presenter en innloggingsboks til besøkende på hjemmesiden hvis ikke noe annet innhold har blitt konfigurert."
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:480
+msgid "Directory Server URL"
+msgstr "Katalogtjener URL"
+
+#: ../../mod/admin.php:480
+msgid "Default directory server"
+msgstr "Standard katalogtjener"
+
+#: ../../mod/admin.php:482
 msgid "Proxy user"
 msgstr "Brukernavn mellomtjener"
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:483
 msgid "Proxy URL"
 msgstr "Mellomtjener URL"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:484
 msgid "Network timeout"
 msgstr "Nettverk tidsavbrudd"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:484
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Verdien i sekunder. Skriv 0 for ubegrenset (ikke anbefalt)."
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:485
 msgid "Delivery interval"
 msgstr "Leveringsinterval"
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:485
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Forsink leveringsprosessene i bakgrunnen med dette antall sekunder for å redusere systembelastningen. Anbefaling: 4-5 for delte tjenere, 2-3 for virtuelle tjenere, 0-1 for større dedikerte tjenere."
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:486
 msgid "Deliveries per process"
 msgstr "Leveranser per prosess"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:486
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Antall leveranser som forsøkes i en enkelt operativsystemprosess. Juster om nødvendig for å fininnstille systemets yteevne. Anbefaling: 1-5."
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:487
 msgid "Poll interval"
 msgstr "Spørreintervall"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:487
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Forsink spørreprosessene i bakgrunnen med dette antall sekunder for å redusere systembelastningen. Hvis 0, bruk dette leveringsintervallet."
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:488
 msgid "Maximum Load Average"
 msgstr "Største belastningsgjennomsnitt"
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:488
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Største systembelastning før leverings- og spørreprosesser blir utsatt - standard 50."
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:489
 msgid "Expiration period in days for imported (matrix/network) content"
 msgstr "Antall dager før importert innhold (matrix/nettverk) utgår"
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:489
 msgid "0 for no expiration of imported content"
 msgstr "0 dersom importert innhold ikke skal utgå"
 
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:537
 msgid "No server found"
 msgstr "Ingen tjener funnet"
 
-#: ../../mod/admin.php:505 ../../mod/admin.php:788
+#: ../../mod/admin.php:544 ../../mod/admin.php:826
 msgid "ID"
 msgstr "ID"
 
-#: ../../mod/admin.php:505
+#: ../../mod/admin.php:544
 msgid "for channel"
 msgstr "for kanalen"
 
-#: ../../mod/admin.php:505
+#: ../../mod/admin.php:544
 msgid "on server"
 msgstr "på tjener"
 
-#: ../../mod/admin.php:505
+#: ../../mod/admin.php:544
 msgid "Status"
 msgstr "Status"
 
-#: ../../mod/admin.php:507
+#: ../../mod/admin.php:546
 msgid "Server"
 msgstr "Tjener"
 
-#: ../../mod/admin.php:524
+#: ../../mod/admin.php:563
 msgid "Update has been marked successful"
 msgstr "Oppdateringen har blitt merket som en suksess"
 
-#: ../../mod/admin.php:534
+#: ../../mod/admin.php:573
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Utføring av %s feilet. Sjekk systemlogger."
 
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:576
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Oppdatering %s ble gjennomført med suksess."
 
-#: ../../mod/admin.php:541
+#: ../../mod/admin.php:580
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Oppdatering %s returnerte ingen status. Det er ukjent om den ble vellykket."
 
-#: ../../mod/admin.php:544
+#: ../../mod/admin.php:583
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Oppdatering av funksjon %s kunne ikke finnes."
 
-#: ../../mod/admin.php:560
+#: ../../mod/admin.php:599
 msgid "No failed updates."
 msgstr "Ingen mislykkede oppdateringer."
 
-#: ../../mod/admin.php:564
+#: ../../mod/admin.php:603
 msgid "Failed Updates"
 msgstr "Mislykkede oppdateringer"
 
-#: ../../mod/admin.php:566
+#: ../../mod/admin.php:605
 msgid "Mark success (if update was manually applied)"
 msgstr "Marker suksess (hvis oppdateringen ble gjennomført manuelt)"
 
-#: ../../mod/admin.php:567
+#: ../../mod/admin.php:606
 msgid "Attempt to execute this update step automatically"
 msgstr "Prøv å gjennomføre dette oppdateringstrinnet automatisk"
 
-#: ../../mod/admin.php:599
+#: ../../mod/admin.php:637
 msgid "Queue Statistics"
 msgstr "Køstatistikk"
 
-#: ../../mod/admin.php:600
+#: ../../mod/admin.php:638
 msgid "Total Entries"
 msgstr "Totalt antall oppføringer"
 
-#: ../../mod/admin.php:601
+#: ../../mod/admin.php:639
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../../mod/admin.php:602
+#: ../../mod/admin.php:640
 msgid "Destination URL"
 msgstr "MÃ¥l-URL"
 
-#: ../../mod/admin.php:603
+#: ../../mod/admin.php:641
 msgid "Mark hub permanently offline"
 msgstr "Merk hub som permanent offline"
 
-#: ../../mod/admin.php:604
+#: ../../mod/admin.php:642
 msgid "Empty queue for this hub"
 msgstr "Tøm køen for denne hubben"
 
-#: ../../mod/admin.php:605
+#: ../../mod/admin.php:643
 msgid "Last known contact"
 msgstr "Siste kjente kontakt"
 
-#: ../../mod/admin.php:641
+#: ../../mod/admin.php:679
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s konto blokkert/ikke blokkert lenger"
 msgstr[1] "%s kontoer blokkert/ikke blokkert lenger"
 
-#: ../../mod/admin.php:649
+#: ../../mod/admin.php:687
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s konto slettet"
 msgstr[1] "%s kontoer slettet"
 
-#: ../../mod/admin.php:685
+#: ../../mod/admin.php:723
 msgid "Account not found"
 msgstr "Kontoen ble ikke funnet"
 
-#: ../../mod/admin.php:697
+#: ../../mod/admin.php:735
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Kontoen '%s' slettet"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:743
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Kontoen '%s' blokkert"
 
-#: ../../mod/admin.php:713
+#: ../../mod/admin.php:751
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Kontoen '%s' er ikke blokkert lenger"
 
-#: ../../mod/admin.php:775 ../../mod/admin.php:787
+#: ../../mod/admin.php:813 ../../mod/admin.php:825
 msgid "Users"
 msgstr "Brukere"
 
-#: ../../mod/admin.php:777 ../../mod/admin.php:941
+#: ../../mod/admin.php:815 ../../mod/admin.php:979
 msgid "select all"
 msgstr "velg alle"
 
-#: ../../mod/admin.php:778
+#: ../../mod/admin.php:816
 msgid "User registrations waiting for confirm"
 msgstr "Brukerregistreringer som venter på bekreftelse"
 
-#: ../../mod/admin.php:779
+#: ../../mod/admin.php:817
 msgid "Request date"
 msgstr "Dato for forespørsel"
 
-#: ../../mod/admin.php:780
+#: ../../mod/admin.php:818
 msgid "No registrations."
 msgstr "Ingen registreringer."
 
-#: ../../mod/admin.php:782
+#: ../../mod/admin.php:820
 msgid "Deny"
 msgstr "Avslå"
 
-#: ../../mod/admin.php:788
+#: ../../mod/admin.php:826
 msgid "Register date"
 msgstr "Registreringsdato"
 
-#: ../../mod/admin.php:788
+#: ../../mod/admin.php:826
 msgid "Last login"
 msgstr "Siste innlogging"
 
-#: ../../mod/admin.php:788
+#: ../../mod/admin.php:826
 msgid "Expires"
 msgstr "Utløper"
 
-#: ../../mod/admin.php:788
+#: ../../mod/admin.php:826
 msgid "Service Class"
 msgstr "Tjenesteklasse"
 
-#: ../../mod/admin.php:790
+#: ../../mod/admin.php:828
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Valgte kontoer vil bli slettet!\\n\\nAlt disse kontoene har lagt inn på dette nettstedet vil bli slettet permanent!\\n\\nEr du sikker på at du vil slette disse valgte kontoene?"
 
-#: ../../mod/admin.php:791
+#: ../../mod/admin.php:829
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Kontoen {0} vl bli slettet!\\n\\nAlt denne kontoen har lagt inn på dette nettstedet vil bli slettet permanent!\\n\\nEr du sikker på at du vil slette denne kontoen?"
 
-#: ../../mod/admin.php:827
+#: ../../mod/admin.php:865
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s kanal er sensurert/ikke sensurert lenger"
 msgstr[1] "%s kanaler er sensurert/ikke sensurert lenger"
 
-#: ../../mod/admin.php:836
+#: ../../mod/admin.php:874
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "%s kanal med kode tillatt/ikke tillatt"
 msgstr[1] "%s kanaler med kode tillatt/ikke tillatt"
 
-#: ../../mod/admin.php:843
+#: ../../mod/admin.php:881
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s kanal slettet"
 msgstr[1] "%s kanaler slettet"
 
-#: ../../mod/admin.php:863
+#: ../../mod/admin.php:901
 msgid "Channel not found"
 msgstr "Kanalen ble ikke funnet"
 
-#: ../../mod/admin.php:874
+#: ../../mod/admin.php:912
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Kanalen '%s' er slettet"
 
-#: ../../mod/admin.php:886
+#: ../../mod/admin.php:924
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Kanalen '%s' er sensurert"
 
-#: ../../mod/admin.php:886
+#: ../../mod/admin.php:924
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Kanalen '%s' er ikke sensurert lenger"
 
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:935
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Kanal '%s' kode tillatt"
 
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:935
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Kanal '%s' kode ikke tillatt"
 
-#: ../../mod/admin.php:943
+#: ../../mod/admin.php:981
 msgid "Censor"
 msgstr "Sensurer"
 
-#: ../../mod/admin.php:944
+#: ../../mod/admin.php:982
 msgid "Uncensor"
 msgstr "Ikke sensurer lenger"
 
-#: ../../mod/admin.php:945
+#: ../../mod/admin.php:983
 msgid "Allow Code"
 msgstr "Tillat kode"
 
-#: ../../mod/admin.php:946
+#: ../../mod/admin.php:984
 msgid "Disallow Code"
 msgstr "Ikke tillat kode"
 
-#: ../../mod/admin.php:948
+#: ../../mod/admin.php:986
 msgid "UID"
 msgstr "UID"
 
-#: ../../mod/admin.php:948 ../../mod/profiles.php:447
-msgid "Address"
-msgstr "Adresse"
-
-#: ../../mod/admin.php:950
+#: ../../mod/admin.php:988
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Valgte kanaler vil bli slettet!\\n\\nAlt innhold som er lagt inn i disse kanalene på dette nettstedet vil bli slettet for alltid!\\n\\nEr du sikker på at du vil slette disse kanalene med alt innhold?"
 
-#: ../../mod/admin.php:951
+#: ../../mod/admin.php:989
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Kanalen {0} vil bli slettet!\\n\\nAlt innhold som er lagt inn i denne kanalen på dettet nettstedet vil bli slettet for alltid!\\n\\nEr du sikker på at du vil slette denne kanalen med alt innhold?"
 
-#: ../../mod/admin.php:991
+#: ../../mod/admin.php:1029
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Tilleggsfunksjonen %s er avskrudd."
 
-#: ../../mod/admin.php:995
+#: ../../mod/admin.php:1033
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Tilleggsfunksjonen %s er påskrudd."
 
-#: ../../mod/admin.php:1005 ../../mod/admin.php:1203
+#: ../../mod/admin.php:1043 ../../mod/admin.php:1246
 msgid "Disable"
 msgstr "Skru av"
 
-#: ../../mod/admin.php:1008 ../../mod/admin.php:1205
+#: ../../mod/admin.php:1046 ../../mod/admin.php:1248
 msgid "Enable"
 msgstr "Skru på"
 
-#: ../../mod/admin.php:1032 ../../mod/admin.php:1232
+#: ../../mod/admin.php:1075 ../../mod/admin.php:1275
 msgid "Toggle"
 msgstr "Skru av og på"
 
-#: ../../mod/admin.php:1040 ../../mod/admin.php:1242
+#: ../../mod/admin.php:1083 ../../mod/admin.php:1285
 msgid "Author: "
 msgstr "Forfatter:"
 
-#: ../../mod/admin.php:1041 ../../mod/admin.php:1243
+#: ../../mod/admin.php:1084 ../../mod/admin.php:1286
 msgid "Maintainer: "
 msgstr "Vedlikeholder:"
 
-#: ../../mod/admin.php:1168
+#: ../../mod/admin.php:1211
 msgid "No themes found."
 msgstr "Ingen temaer er funnet."
 
-#: ../../mod/admin.php:1224
+#: ../../mod/admin.php:1267
 msgid "Screenshot"
 msgstr "Skjermbilde"
 
-#: ../../mod/admin.php:1270
+#: ../../mod/admin.php:1313
 msgid "[Experimental]"
 msgstr "[Eksperimentelt]"
 
-#: ../../mod/admin.php:1271
+#: ../../mod/admin.php:1314
 msgid "[Unsupported]"
 msgstr "[Ingen støtte]"
 
-#: ../../mod/admin.php:1295
+#: ../../mod/admin.php:1338
 msgid "Log settings updated."
 msgstr "Logginnstillinger er oppdatert."
 
-#: ../../mod/admin.php:1352
+#: ../../mod/admin.php:1395
 msgid "Clear"
 msgstr "Tøm"
 
-#: ../../mod/admin.php:1358
+#: ../../mod/admin.php:1401
 msgid "Debugging"
 msgstr "Feilsøking"
 
-#: ../../mod/admin.php:1359
+#: ../../mod/admin.php:1402
 msgid "Log file"
 msgstr "Loggfil"
 
-#: ../../mod/admin.php:1359
+#: ../../mod/admin.php:1402
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr "Må kunne skrives til av webtjenesten. Relativ til din Red sin toppnivåkatalog."
 
-#: ../../mod/admin.php:1360
+#: ../../mod/admin.php:1403
 msgid "Log level"
 msgstr "Loggnivå"
 
-#: ../../mod/admin.php:1406
+#: ../../mod/admin.php:1449
 msgid "New Profile Field"
 msgstr "Nytt profilfelt"
 
-#: ../../mod/admin.php:1407 ../../mod/admin.php:1427
+#: ../../mod/admin.php:1450 ../../mod/admin.php:1470
 msgid "Field nickname"
 msgstr "Feltets kallenavn"
 
-#: ../../mod/admin.php:1407 ../../mod/admin.php:1427
+#: ../../mod/admin.php:1450 ../../mod/admin.php:1470
 msgid "System name of field"
 msgstr "Systemnavnet til feltet"
 
-#: ../../mod/admin.php:1408 ../../mod/admin.php:1428
+#: ../../mod/admin.php:1451 ../../mod/admin.php:1471
 msgid "Input type"
 msgstr "Inndata-type"
 
-#: ../../mod/admin.php:1409 ../../mod/admin.php:1429
+#: ../../mod/admin.php:1452 ../../mod/admin.php:1472
 msgid "Field Name"
 msgstr "Feltnavn"
 
-#: ../../mod/admin.php:1409 ../../mod/admin.php:1429
+#: ../../mod/admin.php:1452 ../../mod/admin.php:1472
 msgid "Label on profile pages"
 msgstr "Merkelapp på profilsider"
 
-#: ../../mod/admin.php:1410 ../../mod/admin.php:1430
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "Help text"
 msgstr "Hjelpetekst"
 
-#: ../../mod/admin.php:1410 ../../mod/admin.php:1430
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "Additional info (optional)"
 msgstr "Tilleggsinformasjon (valgfritt)"
 
-#: ../../mod/admin.php:1420
+#: ../../mod/admin.php:1463
 msgid "Field definition not found"
 msgstr "Feltdefinisjonen ble ikke funnet"
 
-#: ../../mod/admin.php:1426
+#: ../../mod/admin.php:1469
 msgid "Edit Profile Field"
 msgstr "Endre profilfelt"
 
-#: ../../mod/appman.php:28 ../../mod/appman.php:44
-msgid "App installed."
-msgstr "App installert."
-
-#: ../../mod/appman.php:37
-msgid "Malformed app."
-msgstr "Feil oppsett for app-en."
-
-#: ../../mod/appman.php:80
-msgid "Embed code"
-msgstr "Innbyggingskode"
-
-#: ../../mod/appman.php:86
-msgid "Edit App"
-msgstr "Endre app"
-
-#: ../../mod/appman.php:86
-msgid "Create App"
-msgstr "Lag app"
-
-#: ../../mod/appman.php:91
-msgid "Name of app"
-msgstr "Navn på app"
-
-#: ../../mod/appman.php:92
-msgid "Location (URL) of app"
-msgstr "Plassering (URL) til app"
-
-#: ../../mod/appman.php:93 ../../mod/rbmark.php:95
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: ../../mod/appman.php:94
-msgid "Photo icon URL"
-msgstr "Bildeikon URL"
-
-#: ../../mod/appman.php:94
-msgid "80 x 80 pixels - optional"
-msgstr "80 x80 pixler - valgfritt"
-
-#: ../../mod/appman.php:95
-msgid "Version ID"
-msgstr "Versjons-ID"
-
-#: ../../mod/appman.php:96
-msgid "Price of app"
-msgstr "Pris på app"
-
-#: ../../mod/appman.php:97
-msgid "Location (URL) to purchase app"
-msgstr "Plassering (URL) for å kjøpe app"
-
-#: ../../mod/menu.php:45
-msgid "Unable to update menu."
-msgstr "Ikke i stand til å oppdatere meny."
-
-#: ../../mod/menu.php:56
-msgid "Unable to create menu."
-msgstr "Ikke i stand til å lage meny."
-
-#: ../../mod/menu.php:94 ../../mod/menu.php:106
-msgid "Menu Name"
-msgstr "Menynavn"
-
-#: ../../mod/menu.php:94
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Unikt navn (ikke synlig på websiden) - påkrevet"
-
-#: ../../mod/menu.php:95 ../../mod/menu.php:107
-msgid "Menu Title"
-msgstr "Menytittel"
-
-#: ../../mod/menu.php:95
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Synlig på websiden - la stå tomt for ingen tittel"
-
-#: ../../mod/menu.php:96
-msgid "Allow Bookmarks"
-msgstr "Tillat bokmerker"
-
-#: ../../mod/menu.php:96 ../../mod/menu.php:153
-msgid "Menu may be used to store saved bookmarks"
-msgstr "Menyen kan brukes til å lagre lagrede bokmerker"
-
-#: ../../mod/menu.php:97 ../../mod/menu.php:155
-msgid "Submit and proceed"
-msgstr "Send inn og fortsett"
-
-#: ../../mod/menu.php:109
-msgid "Drop"
-msgstr "Slett"
-
-#: ../../mod/menu.php:113
-msgid "Bookmarks allowed"
-msgstr "Bokmerker tillatt"
-
-#: ../../mod/menu.php:115
-msgid "Delete this menu"
-msgstr "Slett denne menyen"
-
-#: ../../mod/menu.php:116 ../../mod/menu.php:150
-msgid "Edit menu contents"
-msgstr "Endre menyinnholdet"
-
-#: ../../mod/menu.php:117
-msgid "Edit this menu"
-msgstr "Endre denne menyen"
-
-#: ../../mod/menu.php:132
-msgid "Menu could not be deleted."
-msgstr "Menyen kunne ikke bli slettet."
-
-#: ../../mod/menu.php:145
-msgid "Edit Menu"
-msgstr "Endre meny"
-
-#: ../../mod/menu.php:149
-msgid "Add or remove entries to this menu"
-msgstr "Legg til eller fjern punkter i denne menyen"
-
-#: ../../mod/menu.php:151
-msgid "Menu name"
-msgstr "Menynavn"
-
-#: ../../mod/menu.php:151
-msgid "Must be unique, only seen by you"
-msgstr "Må være unik, ses bare av deg"
-
-#: ../../mod/menu.php:152
-msgid "Menu title"
-msgstr "Menytittel"
-
-#: ../../mod/menu.php:152
-msgid "Menu title as seen by others"
-msgstr "Menytittelen andre ser"
-
-#: ../../mod/menu.php:153
-msgid "Allow bookmarks"
-msgstr "Tillat bokmerker"
-
-#: ../../mod/notify.php:53 ../../mod/notifications.php:94
-msgid "No more system notifications."
-msgstr "Ingen flere systemvarsler."
-
-#: ../../mod/notify.php:57 ../../mod/notifications.php:98
-msgid "System Notifications"
-msgstr "Systemvarsler"
-
-#: ../../mod/page.php:126
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
-" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-#: ../../mod/new_channel.php:109
-msgid "Add a Channel"
-msgstr "Legg til en kanal"
-
-#: ../../mod/new_channel.php:110
-msgid ""
-"A channel is your own collection of related web pages. A channel can be used"
-" to hold social network profiles, blogs, conversation groups and forums, "
-"celebrity pages, and much more. You may create as many channels as your "
-"service provider allows."
-msgstr "En kanal er din egen samling av relaterte web-sider. En kanal kan brukes til å samle sosiale nettverksprofiler, blogger, samtalegrupper og forum, kjendissider og mye mer. Du kan lage så mange kanaler som din tjenestetilbyder tillater."
-
-#: ../../mod/new_channel.php:112 ../../mod/sources.php:103
-#: ../../mod/sources.php:137
-msgid "Channel Name"
-msgstr "Kanalnavn"
-
-#: ../../mod/new_channel.php:113
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
-msgstr "Eksempel: \"Ola Nordmann\", \"Lisa og hestene hennes\", \"Fotball\", \"Sykkelgruppa\""
-
-#: ../../mod/new_channel.php:114
-msgid "Choose a short nickname"
-msgstr "Velg et kort kallenavn"
-
-#: ../../mod/new_channel.php:115
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
-msgstr "Ditt kallenavn brukes til å lage en kanaladresse som er enkel å huske (minner om en e-postadresse) og som du kan dele med andre."
-
-#: ../../mod/new_channel.php:116
-msgid "Or <a href=\"import\">import an existing channel</a> from another location"
-msgstr "Eller <a href=\"import\">importerer en eksisterende kanal</a> fra et annet sted."
-
-#: ../../mod/new_channel.php:118
-msgid ""
-"Please choose a channel type (such as social networking or community forum) "
-"and privacy requirements so we can select the best permissions for you"
-msgstr "Vennligst velg en kanaltype (for eksempel sosialt nettverk eller forum for felleskap) og krav til personvern slik at vi kan velge de beste tillatelsene for deg."
-
-#: ../../mod/new_channel.php:119
-msgid "Channel Type"
-msgstr "Kanaltype"
-
-#: ../../mod/new_channel.php:119
-msgid "Read more about roles"
-msgstr "Les mer om roller"
-
-#: ../../mod/notifications.php:26
-msgid "Invalid request identifier."
-msgstr "Ugyldig forespørselsidentifikator."
-
-#: ../../mod/notifications.php:35
-msgid "Discard"
-msgstr "Forkast"
-
-#: ../../mod/pdledit.php:13
-msgid "Layout updated."
-msgstr "Layout er oppdatert."
-
-#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
-msgid "Edit System Page Description"
-msgstr "Endre beskrivelsen av systemsiden"
-
-#: ../../mod/pdledit.php:48
-msgid "Layout not found."
-msgstr "Layouten ble ikke funnet."
-
-#: ../../mod/pdledit.php:54
-msgid "Module Name:"
-msgstr "Modulnavn:"
-
-#: ../../mod/pdledit.php:55
-msgid "Layout Help"
-msgstr "Layout-hjelp"
-
-#: ../../mod/subthread.php:102
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s følger %2$s sin %3$s"
-
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
-msgstr "Ingen gyldig konto funnet."
-
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
-msgstr "Forespørsel om å tilbakestille passord er mottatt. Sjekk e-posten din."
-
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Nettstedsmedlem (%s)"
-
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Forespurt om å tilbakestille passord hos %s"
-
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Forespørsel kunne ikke bekreftes. (Du kan ha sendt den inn tidligere.) Tilbakestilling av passord mislyktes."
-
-#: ../../mod/lostpass.php:86 ../../boot.php:1505
-msgid "Password Reset"
-msgstr "Tilbakestill passord"
-
-#: ../../mod/lostpass.php:87
-msgid "Your password has been reset as requested."
-msgstr "Ditt passord har blitt tilbakestilt som forespurt."
-
-#: ../../mod/lostpass.php:88
-msgid "Your new password is"
-msgstr "Ditt nye passord er"
-
-#: ../../mod/lostpass.php:89
-msgid "Save or copy your new password - and then"
-msgstr "Lagre eller kopier ditt nye passord, og deretter kan du"
-
-#: ../../mod/lostpass.php:90
-msgid "click here to login"
-msgstr "klikke her for å logge inn"
-
-#: ../../mod/lostpass.php:91
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Ditt passord kan endres på siden <em>Innstillinger</em> etter vellykket innlogging."
-
-#: ../../mod/lostpass.php:108
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Ditt passord er endret hos %s"
-
-#: ../../mod/lostpass.php:123
-msgid "Forgot your Password?"
-msgstr "Glemt passord ditt?"
-
-#: ../../mod/lostpass.php:124
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Skriv e-postadressen din og send inn for å tilbakestille passordet ditt. Sjekk deretter din e-post for videre instruksjoner."
-
-#: ../../mod/lostpass.php:125
-msgid "Email Address"
-msgstr "E-postadresse"
-
-#: ../../mod/lostpass.php:126
-msgid "Reset"
-msgstr "Tilbakestill"
-
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr "Informasjon om sideeier kunne ikke hentes."
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr "Albumet ble ikke funnet."
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr "Slett album"
-
-#: ../../mod/photos.php:170 ../../mod/photos.php:970
-msgid "Delete Photo"
-msgstr "Slett bilde"
-
-#: ../../mod/photos.php:464
-msgid "No photos selected"
-msgstr "Ingen bilder valgt"
-
-#: ../../mod/photos.php:513
-msgid "Access to this item is restricted."
-msgstr "Tilgang til dette elementet er begrenset."
-
-#: ../../mod/photos.php:552
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt."
-
-#: ../../mod/photos.php:555
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB lagringsplass til bilder er brukt."
-
-#: ../../mod/photos.php:583
-msgid "Upload Photos"
-msgstr "Last opp bilder"
-
-#: ../../mod/photos.php:587
-msgid "Enter an album name"
-msgstr "Skriv et albumnavn"
-
-#: ../../mod/photos.php:588
-msgid "or select an existing album (doubleclick)"
-msgstr "eller velg et eksisterende album (dobbeltklikk)"
-
-#: ../../mod/photos.php:589
-msgid "Create a status post for this upload"
-msgstr "Lag et statusinnlegg for denne opplastingen"
-
-#: ../../mod/photos.php:616
-msgid "Album name could not be decoded"
-msgstr "Albumnavnet kunne ikke dekodes"
-
-#: ../../mod/photos.php:660 ../../mod/photos.php:1197
-#: ../../mod/photos.php:1214
-msgid "Contact Photos"
-msgstr "Kontaktbilder"
-
-#: ../../mod/photos.php:688
-msgid "Show Newest First"
-msgstr "Vis nyeste først"
-
-#: ../../mod/photos.php:690
-msgid "Show Oldest First"
-msgstr "Vis eldste først"
-
-#: ../../mod/photos.php:714 ../../mod/photos.php:1247
-msgid "View Photo"
-msgstr "Vis foto"
-
-#: ../../mod/photos.php:743
-msgid "Edit Album"
-msgstr "Endre album"
-
-#: ../../mod/photos.php:788
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Tillatelse avvist. Tilgang til dette elementet kan være begrenset."
-
-#: ../../mod/photos.php:790
-msgid "Photo not available"
-msgstr "Bilde er utilgjengelig"
-
-#: ../../mod/photos.php:848
-msgid "Use as profile photo"
-msgstr "Bruk som profilbilde"
-
-#: ../../mod/photos.php:855
-msgid "Private Photo"
-msgstr "Privat bilde"
-
-#: ../../mod/photos.php:866 ../../mod/events.php:528
-msgid "Previous"
-msgstr "Forrige"
-
-#: ../../mod/photos.php:870
-msgid "View Full Size"
-msgstr "Vis i full størrelse"
-
-#: ../../mod/photos.php:875 ../../mod/events.php:529 ../../mod/setup.php:285
-msgid "Next"
-msgstr "Neste"
-
-#: ../../mod/photos.php:915 ../../mod/tagrm.php:133
-msgid "Remove"
-msgstr "Fjern"
-
-#: ../../mod/photos.php:949
-msgid "Edit photo"
-msgstr "Endre bilde"
-
-#: ../../mod/photos.php:951
-msgid "Rotate CW (right)"
-msgstr "Roter med klokka (mot høyre)"
-
-#: ../../mod/photos.php:952
-msgid "Rotate CCW (left)"
-msgstr "Roter mot klokka (venstre)"
-
-#: ../../mod/photos.php:955
-msgid "Enter a new album name"
-msgstr "Skriv et nytt albumnavn"
-
-#: ../../mod/photos.php:956
-msgid "or select an existing one (doubleclick)"
-msgstr "eller velg et eksisterende album (dobbeltklikk)"
-
-#: ../../mod/photos.php:959
-msgid "Caption"
-msgstr "Overskrift"
-
-#: ../../mod/photos.php:961
-msgid "Add a Tag"
-msgstr "Legg til merkelapp"
-
-#: ../../mod/photos.php:965
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Eksempel: @bob, @Barbara_Jensen, @jim@example.com"
-
-#: ../../mod/photos.php:968
-msgid "Flag as adult in album view"
-msgstr "Flag som voksent i albumvisning"
-
-#: ../../mod/photos.php:1160
-msgid "In This Photo:"
-msgstr "I dette bildet:"
-
-#: ../../mod/photos.php:1165
-msgid "Map"
-msgstr "Kart"
-
-#: ../../mod/photos.php:1253
-msgid "View Album"
-msgstr "Vis album"
-
-#: ../../mod/photos.php:1276
-msgid "Recent Photos"
-msgstr "Nye bilder"
-
-#: ../../mod/dav.php:121
-msgid "$Projectname channel"
-msgstr "$Projectname-kanal"
-
-#: ../../mod/rate.php:157
-msgid "Website:"
-msgstr "Nettsted:"
-
-#: ../../mod/rate.php:160
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Fjerntliggende kanal [%s] (foreløpig ikke kjent på dette nettstedet)"
-
-#: ../../mod/rate.php:161
-msgid "Rating (this information is public)"
-msgstr "Vurdering (denne informasjonen er offentlig)"
-
-#: ../../mod/rate.php:162
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Velg om du vil forklare din vurdering (denne informasjonen er offentlig)"
-
-#: ../../mod/events.php:21
-msgid "Calendar entries imported."
-msgstr "Kalenderhendelsene er importert."
-
-#: ../../mod/events.php:23
-msgid "No calendar entries found."
-msgstr "Ingen kalenderhendelser funnet."
-
-#: ../../mod/events.php:96
-msgid "Event can not end before it has started."
-msgstr "Hendelsen kan ikke slutte før den starter."
-
-#: ../../mod/events.php:98 ../../mod/events.php:107 ../../mod/events.php:127
-msgid "Unable to generate preview."
-msgstr "Klarer ikke å lage forhåndsvisning."
-
-#: ../../mod/events.php:105
-msgid "Event title and start time are required."
-msgstr "Hendelsestittel og starttidspunkt er påkrevd."
-
-#: ../../mod/events.php:125 ../../mod/events.php:250
-msgid "Event not found."
-msgstr "Hendelsen ble ikke funnet."
-
-#: ../../mod/events.php:448
-msgid "l, F j"
-msgstr "l, F j"
-
-#: ../../mod/events.php:470
-msgid "Edit event"
-msgstr "Endre hendelse"
-
-#: ../../mod/events.php:472
-msgid "Delete event"
-msgstr "Slett hendelse"
-
-#: ../../mod/events.php:506
-msgid "calendar"
-msgstr "kalender"
-
-#: ../../mod/events.php:527
-msgid "Create New Event"
-msgstr "Lag ny hendelse"
-
-#: ../../mod/events.php:530
-msgid "Export"
-msgstr "Eksport"
-
-#: ../../mod/events.php:533
-msgid "Import"
-msgstr "Importer"
-
-#: ../../mod/events.php:564
-msgid "Event removed"
-msgstr "Hendelse slettet"
-
-#: ../../mod/events.php:567
-msgid "Failed to remove event"
-msgstr "Mislyktes med å slette hendelse"
-
-#: ../../mod/events.php:681
-msgid "Event details"
-msgstr "Hendelsesdetaljer"
-
-#: ../../mod/events.php:682
-msgid "Starting date and Title are required."
-msgstr "Startdato og Tittel er påkrevd."
-
-#: ../../mod/events.php:684
-msgid "Categories (comma-separated list)"
-msgstr "Kategorier (kommaseparert liste)"
-
-#: ../../mod/events.php:686
-msgid "Event Starts:"
-msgstr "Hendelsen starter:"
-
-#: ../../mod/events.php:693
-msgid "Finish date/time is not known or not relevant"
-msgstr "Sluttdato/-tidspunkt er ikke kjent eller ikke relevant"
-
-#: ../../mod/events.php:695
-msgid "Event Finishes:"
-msgstr "Hendelsen slutter:"
-
-#: ../../mod/events.php:697 ../../mod/events.php:698
-msgid "Adjust for viewer timezone"
-msgstr "Juster i forhold til tilskuerens tidssone"
-
-#: ../../mod/events.php:697
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr "Viktig for hendelser som skjer på et bestemt sted. Ikke praktisk for globale ferier eller fridager."
-
-#: ../../mod/events.php:703
-msgid "Title:"
-msgstr "Tittel:"
-
-#: ../../mod/events.php:705
-msgid "Share this event"
-msgstr "Del denne hendelsen"
-
-#: ../../mod/impel.php:192
-#, php-format
-msgid "%s element installed"
-msgstr "%s element installert"
-
-#: ../../mod/impel.php:195
-#, php-format
-msgid "%s element installation failed"
-msgstr "Installasjon av %s-element mislyktes"
-
-#: ../../mod/probe.php:24 ../../mod/probe.php:30
-#, php-format
-msgid "Fetching URL returns error: %1$s"
-msgstr "Henting av URL gir følgende feil: %1$s"
-
-#: ../../mod/match.php:22
-msgid "Profile Match"
-msgstr "Profiltreff"
-
-#: ../../mod/match.php:31
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Ingen nøkkelord å sammenlikne. Vennligst legg til nøkkelord til din standardprofil."
-
-#: ../../mod/match.php:63
-msgid "is interested in:"
-msgstr "er interessert i:"
-
-#: ../../mod/match.php:70
-msgid "No matches"
-msgstr "Ingen treff"
-
-#: ../../mod/profile_photo.php:111
-msgid "Image uploaded but image cropping failed."
-msgstr "Bildet ble lastet opp, men beskjæring av bildet mislyktes."
-
-#: ../../mod/profile_photo.php:165
-msgid "Image resize failed."
-msgstr "Endring av bildestørrelse mislyktes."
-
-#: ../../mod/profile_photo.php:209
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Hold nede Shift-knappen og last siden på nytt eller tøm nettleserens mellomlager hvis det nye bildet ikke vises umiddelbart."
-
-#: ../../mod/profile_photo.php:247
-msgid "Image upload failed."
-msgstr "Opplasting av bildet mislyktes."
-
-#: ../../mod/profile_photo.php:266
-msgid "Unable to process image."
-msgstr "Kan ikke behandle bildet."
-
-#: ../../mod/profile_photo.php:294
-msgid "female"
-msgstr "kvinne"
-
-#: ../../mod/profile_photo.php:295
-#, php-format
-msgid "%1$s updated her %2$s"
-msgstr "%1$s oppdaterte %2$s sitt"
-
-#: ../../mod/profile_photo.php:296
-msgid "male"
-msgstr "mann"
-
-#: ../../mod/profile_photo.php:297
-#, php-format
-msgid "%1$s updated his %2$s"
-msgstr "%1$s oppdaterte %2$s sitt"
-
-#: ../../mod/profile_photo.php:299
-#, php-format
-msgid "%1$s updated their %2$s"
-msgstr "%1$s oppdaterte %2$s deres"
-
-#: ../../mod/profile_photo.php:301
-msgid "profile photo"
-msgstr "profilbilde"
-
-#: ../../mod/profile_photo.php:365 ../../mod/profile_photo.php:406
-msgid "Photo not available."
-msgstr "Bildet er ikke tilgjengelig."
-
-#: ../../mod/profile_photo.php:447
-msgid "Upload File:"
-msgstr "Last opp fil:"
-
-#: ../../mod/profile_photo.php:448
-msgid "Select a profile:"
-msgstr "Velg en profil:"
-
-#: ../../mod/profile_photo.php:449
-msgid "Upload Profile Photo"
-msgstr "Last opp profilbilde:"
-
-#: ../../mod/profile_photo.php:454 ../../mod/settings.php:972
-msgid "or"
-msgstr "eller"
-
-#: ../../mod/profile_photo.php:454
-msgid "skip this step"
-msgstr "hopp over dette steget"
-
-#: ../../mod/profile_photo.php:454
-msgid "select a photo from your photo albums"
-msgstr "velg et bilde fra dine fotoalbum"
-
-#: ../../mod/profile_photo.php:470
-msgid "Crop Image"
-msgstr "Beskjær bildet"
-
-#: ../../mod/profile_photo.php:471
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Vennligst juster bildebeskjæringen for optimal visning."
-
-#: ../../mod/profile_photo.php:473
-msgid "Done Editing"
-msgstr "Avslutt redigering"
-
-#: ../../mod/follow.php:25
-msgid "Channel added."
-msgstr "Kanal lagt til."
-
-#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
-msgid "Tag removed"
-msgstr "Merkelapp fjernet"
-
-#: ../../mod/tagrm.php:119
-msgid "Remove Item Tag"
-msgstr "Fjern merkelapp fra element"
-
-#: ../../mod/tagrm.php:121
-msgid "Select a tag to remove: "
-msgstr "Velg merkelapp å fjerne:"
-
-#: ../../mod/ratings.php:69
-msgid "No ratings"
-msgstr "Ingen vurderinger"
-
-#: ../../mod/ratings.php:99
-msgid "Ratings"
-msgstr "Vurderinger"
-
-#: ../../mod/ratings.php:100
-msgid "Rating: "
-msgstr "Vurdering:"
-
-#: ../../mod/ratings.php:101
-msgid "Website: "
-msgstr "Nettsted:"
-
-#: ../../mod/ratings.php:103
-msgid "Description: "
-msgstr "Beskrivelse:"
-
-#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Dette nettstedet er ikke en katalogtjener"
-
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr "Ikke i stand til å slå opp mottaker."
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr "Ikke i stand til å kommunisere med forespurt kanal."
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr "Kan ikke bekrefte forespurt kanal."
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "Valgt kanal har restriksjoner for private meldinger. Sending feilet."
-
-#: ../../mod/mail.php:128
-msgid "Messages"
-msgstr "Meldinger"
-
-#: ../../mod/mail.php:138
-msgid "Message deleted."
-msgstr "Melding slettet."
-
-#: ../../mod/mail.php:154
-msgid "Message recalled."
-msgstr "Innlegg tilbakekalt."
-
-#: ../../mod/mail.php:221
-msgid "Send Private Message"
-msgstr "Send privat melding"
-
-#: ../../mod/mail.php:222 ../../mod/mail.php:352
-msgid "To:"
-msgstr "Til:"
-
-#: ../../mod/mail.php:227 ../../mod/mail.php:341 ../../mod/mail.php:354
-msgid "Subject:"
-msgstr "Emne:"
-
-#: ../../mod/mail.php:231 ../../mod/mail.php:357 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr "Din melding:"
-
-#: ../../mod/mail.php:238
-msgid "Send"
-msgstr "Send"
-
-#: ../../mod/mail.php:322
-msgid "Delete message"
-msgstr "Slett melding"
-
-#: ../../mod/mail.php:323
-msgid "Recall message"
-msgstr "Tilbakekall innlegg"
-
-#: ../../mod/mail.php:325
-msgid "Message has been recalled."
-msgstr "Innlegget har blitt tilbakekalt."
-
-#: ../../mod/mail.php:345
-msgid "Delete Conversation"
-msgstr "Slett samtale"
-
-#: ../../mod/mail.php:347
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Ingen sikret kommunikasjon tilgjengelig. Du kan <strong>muligens</strong> greie å svare via senderens profilside."
-
-#: ../../mod/mail.php:351
-msgid "Send Reply"
-msgstr "Send svar"
-
-#: ../../mod/webpages.php:191
-msgid "Page Title"
-msgstr "Sidetittel"
-
-#: ../../mod/register.php:44
-msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
-msgstr "Antallet daglige registreringer ved nettstedet er overskredet. Vær vennlig å prøve igjen imorgen."
-
-#: ../../mod/register.php:50
-msgid ""
-"Please indicate acceptance of the Terms of Service. Registration failed."
-msgstr "Vennligst angi at tjenesteavtalen er akseptert. Registrering mislyktes."
-
-#: ../../mod/register.php:84
-msgid "Passwords do not match."
-msgstr "Passordene er ikke like."
-
-#: ../../mod/register.php:117
-msgid ""
-"Registration successful. Please check your email for validation "
-"instructions."
-msgstr "Registreringen er vellykket. Vennligst sjekk e-posten din for å bekrefte opprettelsen."
-
-#: ../../mod/register.php:123
-msgid "Your registration is pending approval by the site owner."
-msgstr "Din registrering venter på godkjenning av nettstedets eier."
-
-#: ../../mod/register.php:126
-msgid "Your registration can not be processed."
-msgstr "Din registrering kan ikke behandles."
-
-#: ../../mod/register.php:163
-msgid "Registration on this site/hub is by approval only."
-msgstr "Registrering på dette nettstedet/denne hubben skjer bare gjennom godkjenning."
-
-#: ../../mod/register.php:164
-msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
-msgstr "<a href=\"pubsites\">Registrer på et annet tilknyttet nettsted/hub</a>"
-
-#: ../../mod/register.php:174
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "Dette nettstedet har overskredet antallet tillate kontoregistreringer per dag. Vennligst prøv igjen imorgen."
-
-#: ../../mod/register.php:185
-msgid "Terms of Service"
-msgstr "Tjenesteavtale"
-
-#: ../../mod/register.php:191
-#, php-format
-msgid "I accept the %s for this website"
-msgstr "Jeg godtar %s for dette nettstedet"
-
-#: ../../mod/register.php:193
-#, php-format
-msgid "I am over 13 years of age and accept the %s for this website"
-msgstr "Jeg er over 13 år gammel og aksepterer %s for dette nettstedet."
-
-#: ../../mod/register.php:212
-msgid "Membership on this site is by invitation only."
-msgstr "Medlemskap ved dette nettstedet skjer kun via invitasjon."
-
-#: ../../mod/register.php:213
-msgid "Please enter your invitation code"
-msgstr "Vennligst skriv din invitasjonskode"
-
-#: ../../mod/register.php:216
-msgid "Your email address"
-msgstr "Din e-postadresse"
-
-#: ../../mod/register.php:217
-msgid "Choose a password"
-msgstr "Velg et passord"
-
-#: ../../mod/register.php:218
-msgid "Please re-enter your password"
-msgstr "Vennligst skriv ditt passord en gang til"
-
-#: ../../mod/blocks.php:95 ../../mod/blocks.php:148
-msgid "Block Name"
-msgstr "Byggeklossens navn"
-
-#: ../../mod/blocks.php:149
-msgid "Block Title"
-msgstr "Byggeklossens tittel"
-
-#: ../../mod/removeaccount.php:30
-msgid ""
-"Account removals are not allowed within 48 hours of changing the account "
-"password."
-msgstr "Sletting av kontoer er ikke tillatt innen 48 timer etter endring av kontopassordet."
-
-#: ../../mod/removeaccount.php:57
-msgid "Remove This Account"
-msgstr "Slett denne kontoen"
-
-#: ../../mod/removeaccount.php:58
-msgid ""
-"This account and all its channels will be completely removed from the "
-"network. "
-msgstr "Denne kontoen og alle dens kanaler vil bli fullstendig fjernet fra nettverket."
-
-#: ../../mod/removeaccount.php:60
-msgid ""
-"Remove this account, all its channels and all its channel clones from the "
-"network"
-msgstr "Slett denne kontoen, alle dens kanaler og alle dens kanalkloner fra dette nettverket"
-
-#: ../../mod/removeaccount.php:60
-msgid ""
-"By default only the instances of the channels located on this hub will be "
-"removed from the network"
-msgstr "Som standard vil bare forekomster av kanalene lokalisert på denne hubben bli slettet fra nettverket"
-
-#: ../../mod/removeaccount.php:61 ../../mod/settings.php:697
-msgid "Remove Account"
-msgstr "Slett konto"
-
-#: ../../mod/service_limits.php:19
-msgid "No service class restrictions found."
-msgstr "Ingen restriksjoner er funnet i tjenesteklasse."
-
-#: ../../mod/attach.php:9
-msgid "Item not available."
-msgstr "Elementet er ikke tilgjengelig."
-
-#: ../../mod/sources.php:32
-msgid "Failed to create source. No channel selected."
-msgstr "Mislyktes med å lage kilde. Ingen kanal er valgt."
-
-#: ../../mod/sources.php:45
-msgid "Source created."
-msgstr "Kilden er laget."
-
-#: ../../mod/sources.php:57
-msgid "Source updated."
-msgstr "Kilden er oppdatert."
-
-#: ../../mod/sources.php:82
-msgid "*"
-msgstr "*"
-
-#: ../../mod/sources.php:89
-msgid "Manage remote sources of content for your channel."
-msgstr "HÃ¥ndtere eksterne innholdskilder til din kanal."
-
-#: ../../mod/sources.php:90 ../../mod/sources.php:100
-msgid "New Source"
-msgstr "Ny kilde"
-
-#: ../../mod/sources.php:101 ../../mod/sources.php:133
-msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
-msgstr "Importer alt eller et utvalgt av innhold fra følgende kanal inn i denne kanalen og distribuer det i henhold til dine egne kanalinnstillinger."
-
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Only import content with these words (one per line)"
-msgstr "Bare importer innhold med disse ordene (ett ord per linje)"
-
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Leave blank to import all public content"
-msgstr "La stå tomt for å importere alt offentlig innhold"
-
-#: ../../mod/sources.php:123 ../../mod/sources.php:150
-msgid "Source not found."
-msgstr "Kilden ble ikke funnet."
-
-#: ../../mod/sources.php:130
-msgid "Edit Source"
-msgstr "Endre kilde"
-
-#: ../../mod/sources.php:131
-msgid "Delete Source"
-msgstr "Slett kilde"
-
-#: ../../mod/sources.php:158
-msgid "Source removed"
-msgstr "Kilden er fjernet"
-
-#: ../../mod/sources.php:160
-msgid "Unable to remove source."
-msgstr "Ikke i stand til å fjerne kilde."
-
-#: ../../mod/lockview.php:37
-msgid "Remote privacy information not available."
-msgstr "Ekstern personverninformasjon er ikke tilgjengelig."
-
-#: ../../mod/lockview.php:58
-msgid "Visible to:"
-msgstr "Synlig for:"
-
-#: ../../mod/acl.php:222
-msgid "network"
-msgstr "nettverk"
-
-#: ../../mod/acl.php:232
-msgid "RSS"
-msgstr "RSS"
-
-#: ../../mod/regmod.php:11
-msgid "Please login."
-msgstr "Vennligst logg inn."
-
-#: ../../mod/rmagic.php:40
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Vi støtte på et problem under innloggingen med din OpenID. Vennligst sjekk at ID-en er stavet riktig."
-
-#: ../../mod/rmagic.php:40
-msgid "The error message was:"
-msgstr "Feilmeldingen var:"
-
-#: ../../mod/rmagic.php:44
-msgid "Authentication failed."
-msgstr "Autentisering mislyktes."
-
-#: ../../mod/rmagic.php:84
-msgid "Remote Authentication"
-msgstr "Fjernautentisering"
-
-#: ../../mod/rmagic.php:85
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Skriv din kanaladresse (for eksempel channel@exampel.com)"
-
-#: ../../mod/rmagic.php:86
-msgid "Authenticate"
-msgstr "Autentiser"
-
-#: ../../mod/dirsearch.php:29
-msgid "This directory server requires an access token"
-msgstr "Denne katalogtjeneren krever en tilgangsnøkkel (access token)"
-
-#: ../../mod/siteinfo.php:111
-#, php-format
-msgid "Version %s"
-msgstr "Versjon %s"
-
-#: ../../mod/siteinfo.php:132
-msgid "Installed plugins/addons/apps:"
-msgstr "Installerte tilleggsfunksjoner/tillegg/apper:"
-
-#: ../../mod/siteinfo.php:145
-msgid "No installed plugins/addons/apps"
-msgstr "Ingen installerte tilleggsfunksjoner/tillegg/apper"
-
-#: ../../mod/siteinfo.php:158
-msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
-msgstr "Dette er en $Projectname-hub - et globalt samhandlende nettverk av desentraliserte nettsteder med innbygget personvern."
-
-#: ../../mod/siteinfo.php:160
-msgid "Tag: "
-msgstr "Merkelapp:"
-
-#: ../../mod/siteinfo.php:162
-msgid "Last background fetch: "
-msgstr "Siste innhenting i bakgrunnen:"
-
-#: ../../mod/siteinfo.php:164
-msgid "Current load average: "
-msgstr "Gjeldende belastningsgjennomsnitt:"
-
-#: ../../mod/siteinfo.php:167
-msgid "Running at web location"
-msgstr "Kjører på webplasseringen"
-
-#: ../../mod/siteinfo.php:168
-msgid ""
-"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more"
-" about $Projectname."
-msgstr "Vennligst besøk <a href=\"https://redmatrix.me\">redmatrix.me</a> for å lære mer om $Projectname."
-
-#: ../../mod/siteinfo.php:169
-msgid "Bug reports and issues: please visit"
-msgstr "Feilmeldinger og feilretting: vennligst besøk"
-
-#: ../../mod/siteinfo.php:171
-msgid "$projectname issues"
-msgstr "$projectname problemer"
-
-#: ../../mod/siteinfo.php:172
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Forslag, ros og så videre - vennligst e-post \"redmatrix\" hos librelist - punktum com"
-
-#: ../../mod/siteinfo.php:174
-msgid "Site Administrators"
-msgstr "Nettstedsadministratorer"
-
-#: ../../mod/import.php:27
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr "Din tjenesteplan tillater bare %d kanaler."
-
-#: ../../mod/import.php:65 ../../mod/import_items.php:38
-msgid "Nothing to import."
-msgstr "Ingenting å importere."
-
-#: ../../mod/import.php:89 ../../mod/import_items.php:62
-msgid "Unable to download data from old server"
-msgstr "Ikke i stand til å laste ned data fra gammel tjener"
-
-#: ../../mod/import.php:95 ../../mod/import_items.php:68
-msgid "Imported file is empty."
-msgstr "Importert fil er tom."
-
-#: ../../mod/import.php:115 ../../mod/import_items.php:82
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr "Advarsel: databaseversjoner avviker med %1$d oppdateringer."
-
-#: ../../mod/import.php:148
-msgid "No channel. Import failed."
-msgstr "Ingen kanal. Import mislyktes."
-
-#: ../../mod/import.php:493
-msgid "You must be logged in to use this feature."
-msgstr "Du må være innlogget for å bruke denne funksjonen."
-
-#: ../../mod/import.php:498
-msgid "Import Channel"
-msgstr "Importer kanal"
-
-#: ../../mod/import.php:499
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You"
-" may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file."
-msgstr "Bruk dette skjemaet for å importere en eksisterende kanal fra en annen tjener/hub. Du kan hente inn kanalidentiteten fra den gamle tjeneren/huben via nettverket eller ved å bruke en eksportfil."
-
-#: ../../mod/import.php:500 ../../mod/import_items.php:121
-msgid "File to Upload"
-msgstr "Fil som skal lastes opp"
-
-#: ../../mod/import.php:501
-msgid "Or provide the old server/hub details"
-msgstr "Eller oppgi detaljene fra den gamle tjeneren/hub-en"
-
-#: ../../mod/import.php:502
-msgid "Your old identity address (xyz@example.com)"
-msgstr "Din gamle identitetsadresse (xyz@example.com)"
-
-#: ../../mod/import.php:503
-msgid "Your old login email address"
-msgstr "Din gamle innloggings e-postadresse"
-
-#: ../../mod/import.php:504
-msgid "Your old login password"
-msgstr "Ditt gamle innloggingspassord"
-
-#: ../../mod/import.php:505
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be"
-" able to post from either location, but only one can be marked as the "
-"primary location for files, photos, and media."
-msgstr "Enten du tar det ene eller det andre valget, vennligst angi om du vil at denne hubben skal være din nye primære adresse, eller om din gamle plassering skal fortsette å ha denne rollen. Du kan lage innlegg fra den ene eller den andre plasseringen, men bare en av dem kan markeres som den primære plasseringen for filer, bilder og media."
-
-#: ../../mod/import.php:506
-msgid "Make this hub my primary location"
-msgstr "Gjør dette nettstedet til min primære plassering"
-
-#: ../../mod/import.php:507
-msgid ""
-"Import existing posts if possible (experimental - limited by available "
-"memory"
-msgstr "Importer eksisterende innlegg om mulig (eksperimentelt - begrenset av tilgjengelig minne)"
-
-#: ../../mod/import.php:508
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
-msgstr "Denne prosessen kan ta flere minutter å fullføre. Vennligst send inn dette skjemaet bare en gang og la siden være åpen inntil den er ferdig."
-
-#: ../../mod/thing.php:111
-msgid "Thing updated"
-msgstr "Tingen er oppdatert"
-
-#: ../../mod/thing.php:163
-msgid "Object store: failed"
-msgstr "Objektlagring: mislyktes"
-
-#: ../../mod/thing.php:167
-msgid "Thing added"
-msgstr "Ting lagt til"
-
-#: ../../mod/thing.php:193
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr "OBJ: %1$s %2$s %3$s"
-
-#: ../../mod/thing.php:256
-msgid "Show Thing"
-msgstr "Vis ting"
-
-#: ../../mod/thing.php:263
-msgid "item not found."
-msgstr "element ble ikke funnet."
-
-#: ../../mod/thing.php:296
-msgid "Edit Thing"
-msgstr "Endre ting"
-
-#: ../../mod/thing.php:298 ../../mod/thing.php:348
-msgid "Select a profile"
-msgstr "Velg en profil"
-
-#: ../../mod/thing.php:302 ../../mod/thing.php:351
-msgid "Post an activity"
-msgstr "Legg inn en aktivitet"
-
-#: ../../mod/thing.php:302 ../../mod/thing.php:351
-msgid "Only sends to viewers of the applicable profile"
-msgstr "Sender bare til seere av den aktuelle profilen"
-
-#: ../../mod/thing.php:304 ../../mod/thing.php:353
-msgid "Name of thing e.g. something"
-msgstr "Navn på ting for eksempel noe"
-
-#: ../../mod/thing.php:306 ../../mod/thing.php:354
-msgid "URL of thing (optional)"
-msgstr "URL til ting (valgfritt)"
-
-#: ../../mod/thing.php:308 ../../mod/thing.php:355
-msgid "URL for photo of thing (optional)"
-msgstr "URL til bilde av ting (valgfritt)"
-
-#: ../../mod/thing.php:346
-msgid "Add Thing to your Profile"
-msgstr "Legg til ting i din profil"
-
-#: ../../mod/invite.php:25
-msgid "Total invitation limit exceeded."
-msgstr "Grensen for totalt antall invitasjoner er overskredet."
-
-#: ../../mod/invite.php:49
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : ikke en gyldig e-postadresse."
-
-#: ../../mod/invite.php:76
-msgid "Please join us on $Projectname"
-msgstr "Bli med oss på $Projectname"
-
-#: ../../mod/invite.php:87
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Invitasjonsgrensen er overskredet. Vennligst kontakt administratoren ved ditt nettsted."
-
-#: ../../mod/invite.php:92
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : meldingslevering feilet."
-
-#: ../../mod/invite.php:96
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d melding sendt."
-msgstr[1] "%d meldinger sendt."
-
-#: ../../mod/invite.php:115
-msgid "You have no more invitations available"
-msgstr "Du har ikke flere invitasjoner tilgjengelig"
-
-#: ../../mod/invite.php:129
-msgid "Send invitations"
-msgstr "Send invitasjoner"
-
-#: ../../mod/invite.php:130
-msgid "Enter email addresses, one per line:"
-msgstr "Skriv e-postadresser, en per linje:"
-
-#: ../../mod/invite.php:132
-msgid "Please join my community on $Projectname."
-msgstr "Du er velkommen til å bli med i mitt fellesskap på $Projectname."
-
-#: ../../mod/invite.php:134
-msgid "You will need to supply this invitation code: "
-msgstr "Du må oppgi denne invitasjonskoden:"
-
-#: ../../mod/invite.php:135
-msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Registrer ved enhver $Projectname-lokasjon (de er alle forbundet med hverandre)"
-
-#: ../../mod/invite.php:137
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Skriv inn min $Projectname-adresse i nettstedets søkefelt."
-
-#: ../../mod/invite.php:138
-msgid "or visit "
-msgstr "eller besøk"
+#: ../../mod/editlayout.php:112
+msgid "Delete layout?"
+msgstr "Slett layout?"
 
-#: ../../mod/invite.php:140
-msgid "3. Click [Connect]"
-msgstr "3. Klikk [Forbindelse]"
+#: ../../mod/editlayout.php:159 ../../mod/layouts.php:124
+msgid "Layout Description (Optional)"
+msgstr "Layoutens beskrivelse (valgfritt)"
 
-#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25
-#: ../../mod/update_home.php:21 ../../mod/update_network.php:23
-#: ../../mod/update_search.php:46 ../../mod/update_public.php:21
-msgid "[Embedded content - reload page to view]"
-msgstr "[Innebygget innhold - last siden på nytt for å se]"
+#: ../../mod/editlayout.php:161 ../../mod/layouts.php:121
+#: ../../mod/layouts.php:179
+msgid "Layout Name"
+msgstr "Layout-navn"
 
-#: ../../mod/viewsrc.php:40
-msgid "Source of Item"
-msgstr "Kilde til element"
+#: ../../mod/editlayout.php:178
+msgid "Edit Layout"
+msgstr "Endre layout"
 
 #: ../../mod/settings.php:76
 msgid "Name is required"
@@ -7417,556 +7497,709 @@ msgstr "Navn er påkrevd"
 msgid "Key and Secret are required"
 msgstr "Nøkkel og hemmelighet er påkrevd"
 
-#: ../../mod/settings.php:231
+#: ../../mod/settings.php:232
 msgid "Passwords do not match. Password unchanged."
 msgstr "Passordene stemmer ikke overens. Passord uforandret."
 
-#: ../../mod/settings.php:235
+#: ../../mod/settings.php:236
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Tomme passord er ikke tillatt. Passord uforandret."
 
-#: ../../mod/settings.php:249
+#: ../../mod/settings.php:250
 msgid "Password changed."
 msgstr "Passord endret."
 
-#: ../../mod/settings.php:251
+#: ../../mod/settings.php:252
 msgid "Password update failed. Please try again."
 msgstr "Passord oppdatering mislyktes. Vennligst prøv igjen."
 
-#: ../../mod/settings.php:265
+#: ../../mod/settings.php:266
 msgid "Not valid email."
 msgstr "Ikke gyldig e-post."
 
-#: ../../mod/settings.php:268
+#: ../../mod/settings.php:269
 msgid "Protected email address. Cannot change to that email."
 msgstr "Beskyttet e-postadresse. Kan ikke endre til den e-postadressen."
 
-#: ../../mod/settings.php:277
+#: ../../mod/settings.php:278
 msgid "System failure storing new email. Please try again."
 msgstr "Systemfeil ved lagring av ny e-post. Vennligst prøv igjen."
 
-#: ../../mod/settings.php:518
+#: ../../mod/settings.php:521
 msgid "Settings updated."
 msgstr "Innstillinger oppdatert."
 
-#: ../../mod/settings.php:582 ../../mod/settings.php:608
-#: ../../mod/settings.php:644
+#: ../../mod/settings.php:585 ../../mod/settings.php:611
+#: ../../mod/settings.php:647
 msgid "Add application"
 msgstr "Legg til program"
 
-#: ../../mod/settings.php:585
+#: ../../mod/settings.php:588
 msgid "Name of application"
 msgstr "Navn på program"
 
-#: ../../mod/settings.php:586 ../../mod/settings.php:612
+#: ../../mod/settings.php:589 ../../mod/settings.php:615
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:586 ../../mod/settings.php:587
+#: ../../mod/settings.php:589 ../../mod/settings.php:590
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Automatisk laget - kan endres om du vil. Største lengde 20"
 
-#: ../../mod/settings.php:587 ../../mod/settings.php:613
+#: ../../mod/settings.php:590 ../../mod/settings.php:616
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:588 ../../mod/settings.php:614
+#: ../../mod/settings.php:591 ../../mod/settings.php:617
 msgid "Redirect"
 msgstr "Omdirigering"
 
-#: ../../mod/settings.php:588
+#: ../../mod/settings.php:591
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "Omdirigerings-URI - la stå tomt hvis ikke ditt program spesifikt krever dette"
 
-#: ../../mod/settings.php:589 ../../mod/settings.php:615
+#: ../../mod/settings.php:592 ../../mod/settings.php:618
 msgid "Icon url"
 msgstr "Ikon-URL"
 
-#: ../../mod/settings.php:589
+#: ../../mod/settings.php:592
 msgid "Optional"
 msgstr "Valgfritt"
 
-#: ../../mod/settings.php:600
+#: ../../mod/settings.php:603
 msgid "You can't edit this application."
 msgstr "Du kan ikke endre dette programmet."
 
-#: ../../mod/settings.php:643
+#: ../../mod/settings.php:646
 msgid "Connected Apps"
 msgstr "Tilkoblede app-er"
 
-#: ../../mod/settings.php:647
+#: ../../mod/settings.php:650
 msgid "Client key starts with"
 msgstr "Klientnøkkel starter med"
 
-#: ../../mod/settings.php:648
+#: ../../mod/settings.php:651
 msgid "No name"
 msgstr "Ikke noe navn"
 
-#: ../../mod/settings.php:649
+#: ../../mod/settings.php:652
 msgid "Remove authorization"
 msgstr "Fjern tillatelse"
 
-#: ../../mod/settings.php:662
+#: ../../mod/settings.php:665
 msgid "No feature settings configured"
 msgstr "Ingen funksjonsinnstillinger er konfigurert"
 
-#: ../../mod/settings.php:669
+#: ../../mod/settings.php:672
 msgid "Feature/Addon Settings"
 msgstr "Funksjons-/Tilleggsinnstillinger"
 
-#: ../../mod/settings.php:692
+#: ../../mod/settings.php:695
 msgid "Account Settings"
 msgstr "Kontoinnstillinger"
 
-#: ../../mod/settings.php:693
+#: ../../mod/settings.php:696
 msgid "Enter New Password:"
 msgstr "Skriv nytt passord:"
 
-#: ../../mod/settings.php:694
+#: ../../mod/settings.php:697
 msgid "Confirm New Password:"
 msgstr "Bekreft nytt passord:"
 
-#: ../../mod/settings.php:694
+#: ../../mod/settings.php:697
 msgid "Leave password fields blank unless changing"
 msgstr "La passordfeltene stå blanke om det ikke skal endres"
 
-#: ../../mod/settings.php:696 ../../mod/settings.php:1027
+#: ../../mod/settings.php:699 ../../mod/settings.php:1030
 msgid "Email Address:"
 msgstr "E-postadresse:"
 
-#: ../../mod/settings.php:698
+#: ../../mod/settings.php:701
 msgid "Remove this account including all its channels"
 msgstr "Slett denne kontoen inkludert alle dens kanaler"
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:717
 msgid "Off"
 msgstr "Av"
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:717
 msgid "On"
 msgstr "PÃ¥"
 
-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:724
 msgid "Additional Features"
 msgstr "Ekstra funksjoner"
 
-#: ../../mod/settings.php:745
+#: ../../mod/settings.php:748
 msgid "Connector Settings"
 msgstr "Koblingsinnstillinger"
 
-#: ../../mod/settings.php:784
+#: ../../mod/settings.php:787
 msgid "No special theme for mobile devices"
 msgstr "Ikke noe spesielt tema for mobile enheter"
 
-#: ../../mod/settings.php:787
+#: ../../mod/settings.php:790
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Eksperimentelt)"
 
-#: ../../mod/settings.php:826
+#: ../../mod/settings.php:829
 msgid "Display Settings"
 msgstr "Visningsinnstillinger"
 
-#: ../../mod/settings.php:827
+#: ../../mod/settings.php:830
 msgid "Theme Settings"
 msgstr "Temainnstillinger"
 
-#: ../../mod/settings.php:828
+#: ../../mod/settings.php:831
 msgid "Custom Theme Settings"
 msgstr "Tilpassede temainnstillinger"
 
-#: ../../mod/settings.php:829
+#: ../../mod/settings.php:832
 msgid "Content Settings"
 msgstr "Innholdsinnstillinger"
 
-#: ../../mod/settings.php:835
+#: ../../mod/settings.php:838
 msgid "Display Theme:"
 msgstr "Visningstema:"
 
-#: ../../mod/settings.php:836
+#: ../../mod/settings.php:839
 msgid "Mobile Theme:"
 msgstr "Mobiltema:"
 
-#: ../../mod/settings.php:837
+#: ../../mod/settings.php:840
 msgid "Enable user zoom on mobile devices"
 msgstr "Skru på brukerstyrt zoom på mobile enheter"
 
-#: ../../mod/settings.php:838
+#: ../../mod/settings.php:841
 msgid "Update browser every xx seconds"
 msgstr "Oppdater nettleser hvert xx sekunder"
 
-#: ../../mod/settings.php:838
+#: ../../mod/settings.php:841
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum 10 sekunder, ikke noe maksimum"
 
-#: ../../mod/settings.php:839
+#: ../../mod/settings.php:842
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Maksimalt antall samtaler å laste samtidig:"
 
-#: ../../mod/settings.php:839
+#: ../../mod/settings.php:842
 msgid "Maximum of 100 items"
 msgstr "Maksimum 100 elementer"
 
-#: ../../mod/settings.php:840
+#: ../../mod/settings.php:843
 msgid "Show emoticons (smilies) as images"
 msgstr "Vis emoticons (smilefjes) som bilder"
 
-#: ../../mod/settings.php:841
+#: ../../mod/settings.php:844
 msgid "Link post titles to source"
 msgstr "Lenk innleggets tittel til kilden"
 
-#: ../../mod/settings.php:842
+#: ../../mod/settings.php:845
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Systemsidens layoutbehandler - (avansert)"
 
-#: ../../mod/settings.php:845
+#: ../../mod/settings.php:848
 msgid "Use blog/list mode on channel page"
 msgstr "Bruk blogg-/listemodus på kanalsiden"
 
-#: ../../mod/settings.php:845 ../../mod/settings.php:846
+#: ../../mod/settings.php:848 ../../mod/settings.php:849
 msgid "(comments displayed separately)"
 msgstr "(kommentarer vist separat)"
 
-#: ../../mod/settings.php:846
+#: ../../mod/settings.php:849
 msgid "Use blog/list mode on matrix page"
 msgstr "Bruk blogg-/listemodus på matrix-siden"
 
-#: ../../mod/settings.php:847
+#: ../../mod/settings.php:850
 msgid "Channel page max height of content (in pixels)"
 msgstr "Kanalsidens makshøyde for innhold (i pixler)"
 
-#: ../../mod/settings.php:847 ../../mod/settings.php:848
+#: ../../mod/settings.php:850 ../../mod/settings.php:851
 msgid "click to expand content exceeding this height"
 msgstr "klikk for å utvide innhold som overstiger denne høyden"
 
-#: ../../mod/settings.php:848
+#: ../../mod/settings.php:851
 msgid "Matrix page max height of content (in pixels)"
 msgstr "Matrix-sidens makshøyde for innholde (i pixler)"
 
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:885
 msgid "Nobody except yourself"
 msgstr "Ingen unntatt deg selv"
 
-#: ../../mod/settings.php:883
+#: ../../mod/settings.php:886
 msgid "Only those you specifically allow"
 msgstr "Bare de du spesifikt tillater"
 
-#: ../../mod/settings.php:884
+#: ../../mod/settings.php:887
 msgid "Approved connections"
 msgstr "Godkjente forbindelser"
 
-#: ../../mod/settings.php:885
+#: ../../mod/settings.php:888
 msgid "Any connections"
 msgstr "Enhver forbindelse"
 
-#: ../../mod/settings.php:886
+#: ../../mod/settings.php:889
 msgid "Anybody on this website"
 msgstr "Enhver ved dette nettstedet"
 
-#: ../../mod/settings.php:887
+#: ../../mod/settings.php:890
 msgid "Anybody in this network"
 msgstr "Enhver i dette nettverket"
 
-#: ../../mod/settings.php:888
+#: ../../mod/settings.php:891
 msgid "Anybody authenticated"
 msgstr "Enhver som er autentisert"
 
-#: ../../mod/settings.php:889
+#: ../../mod/settings.php:892
 msgid "Anybody on the internet"
 msgstr "Enhver på Internett"
 
-#: ../../mod/settings.php:963
+#: ../../mod/settings.php:966
 msgid "Publish your default profile in the network directory"
 msgstr "Publiser din standardprofil i nettverkskatalogen"
 
-#: ../../mod/settings.php:968
+#: ../../mod/settings.php:971
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Tillat oss å foreslå deg som en mulig venn til nye medlemmer?"
 
-#: ../../mod/settings.php:977
+#: ../../mod/settings.php:980
 msgid "Your channel address is"
 msgstr "Din kanaladresse er"
 
-#: ../../mod/settings.php:1018
+#: ../../mod/settings.php:1021
 msgid "Channel Settings"
 msgstr "Kanalinnstillinger"
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1028
 msgid "Basic Settings"
 msgstr "Grunninnstillinger"
 
-#: ../../mod/settings.php:1028
+#: ../../mod/settings.php:1031
 msgid "Your Timezone:"
 msgstr "Din tidssone:"
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1032
 msgid "Default Post Location:"
 msgstr "Standard plassering ved innlegg:"
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1032
 msgid "Geographical location to display on your posts"
 msgstr "Geografisk plassering som vises på dine innlegg"
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1033
 msgid "Use Browser Location:"
 msgstr "Bruk nettleseren sin plassering:"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1035
 msgid "Adult Content"
 msgstr "Voksent innhold"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1035
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Denne kanalen vil ofte eller jevnlig publisere voksent innhold. (Vennligst merk alt voksent materiale og/eller nakenhet med #NSFW)"
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1037
 msgid "Security and Privacy Settings"
 msgstr "Sikkerhets- og personverninnstillinger"
 
-#: ../../mod/settings.php:1036
+#: ../../mod/settings.php:1039
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Dine tillatelser er allerede satt. Klikk for å se/justere."
 
-#: ../../mod/settings.php:1038
+#: ../../mod/settings.php:1041
 msgid "Hide my online presence"
 msgstr "Skjul min tilstedeværelse online"
 
-#: ../../mod/settings.php:1038
+#: ../../mod/settings.php:1041
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Forhindrer visning på din profil av at du er online "
 
-#: ../../mod/settings.php:1040
+#: ../../mod/settings.php:1043
 msgid "Simple Privacy Settings:"
 msgstr "Enkle personverninnstillinger:"
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1044
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Svært offentlig - <em>ekstremt åpent (bør brukes med varsomhet)</em>"
 
-#: ../../mod/settings.php:1042
+#: ../../mod/settings.php:1045
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Typisk - <em>standard er offentlig, personvern når ønsket (likner på tillatelser i sosiale nettverk, men med forbedret personvern)</em>"
 
-#: ../../mod/settings.php:1043
+#: ../../mod/settings.php:1046
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privat - <em>standard er privat, aldri åpen eller offentlig</em>"
 
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1047
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Blokkert - <em>standard blokkert til/fra alle</em>"
 
-#: ../../mod/settings.php:1046
+#: ../../mod/settings.php:1049
 msgid "Allow others to tag your posts"
 msgstr "Tillat andre å merke dine innlegg"
 
-#: ../../mod/settings.php:1046
+#: ../../mod/settings.php:1049
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Ofte brukt av fellesskapet for å merke upassende innhold i etterkant"
 
-#: ../../mod/settings.php:1048
+#: ../../mod/settings.php:1051
 msgid "Advanced Privacy Settings"
 msgstr "Avanserte personverninnstillinger"
 
-#: ../../mod/settings.php:1050
+#: ../../mod/settings.php:1053
 msgid "Expire other channel content after this many days"
 msgstr "Annet kanal innhold utløper etter så mange dager"
 
-#: ../../mod/settings.php:1050
+#: ../../mod/settings.php:1053
 msgid "0 or blank prevents expiration"
 msgstr "0 eller blankt forhindrer utløp"
 
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1054
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maksimalt antall venneforespørsler per dag:"
 
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1054
 msgid "May reduce spam activity"
 msgstr "Kan redusere søppelpostaktivitet"
 
-#: ../../mod/settings.php:1052
+#: ../../mod/settings.php:1055
 msgid "Default Post Permissions"
 msgstr "Standard innleggstillatelser"
 
-#: ../../mod/settings.php:1057
+#: ../../mod/settings.php:1056 ../../mod/mitem.php:150 ../../mod/mitem.php:223
+msgid "(click to open/close)"
+msgstr "(klikk for å åpne/lukke)"
+
+#: ../../mod/settings.php:1060
 msgid "Channel permissions category:"
 msgstr "Kategori med kanaltillatelser:"
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1066
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maksimalt antall private meldinger per dag fra ukjente personer:"
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1066
 msgid "Useful to reduce spamming"
 msgstr "Nyttig for å redusere søppelpost"
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1069
 msgid "Notification Settings"
 msgstr "Varslingsinnstillinger"
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1070
 msgid "By default post a status message when:"
 msgstr "Legg inn en statusmelding når du:"
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1071
 msgid "accepting a friend request"
 msgstr "aksepterer en venneforespørsel"
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1072
 msgid "joining a forum/community"
 msgstr "blir med i et forum/miljø"
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1073
 msgid "making an <em>interesting</em> profile change"
 msgstr "gjør en <em>interessant</em> profilendring"
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1074
 msgid "Send a notification email when:"
 msgstr "Send en varsel-e-post når:"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1075
 msgid "You receive a connection request"
 msgstr "Du har mottatt en forespørsel om forbindelse"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1076
 msgid "Your connections are confirmed"
 msgstr "Dine forbindelser er bekreftet"
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1077
 msgid "Someone writes on your profile wall"
 msgstr "Noen skriver på din profilvegg"
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1078
 msgid "Someone writes a followup comment"
 msgstr "Noen skriver en oppfølgende kommentar"
 
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1079
 msgid "You receive a private message"
 msgstr "Du mottar en privat melding"
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1080
 msgid "You receive a friend suggestion"
 msgstr "Du mottok et venneforslag"
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1081
 msgid "You are tagged in a post"
 msgstr "Du merkes i et innlegg"
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1082
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Du ble prikket/oppildnet/og så vider i et innlegg"
 
-#: ../../mod/settings.php:1082
+#: ../../mod/settings.php:1085
 msgid "Show visual notifications including:"
 msgstr "Vis visuelle varslinger om:"
 
-#: ../../mod/settings.php:1084
+#: ../../mod/settings.php:1087
 msgid "Unseen matrix activity"
 msgstr "Usett matrixaktivitet"
 
-#: ../../mod/settings.php:1085
+#: ../../mod/settings.php:1088
 msgid "Unseen channel activity"
 msgstr "Usett kanalaktivitet"
 
-#: ../../mod/settings.php:1086
+#: ../../mod/settings.php:1089
 msgid "Unseen private messages"
 msgstr "Usette private meldinger"
 
-#: ../../mod/settings.php:1086 ../../mod/settings.php:1091
-#: ../../mod/settings.php:1092 ../../mod/settings.php:1093
+#: ../../mod/settings.php:1089 ../../mod/settings.php:1094
+#: ../../mod/settings.php:1095 ../../mod/settings.php:1096
 msgid "Recommended"
 msgstr "Anbefalt"
 
-#: ../../mod/settings.php:1087
+#: ../../mod/settings.php:1090
 msgid "Upcoming events"
 msgstr "Kommende hendelser"
 
-#: ../../mod/settings.php:1088
+#: ../../mod/settings.php:1091
 msgid "Events today"
 msgstr "Hendelser idag"
 
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1092
 msgid "Upcoming birthdays"
 msgstr "Kommende fødselsdager"
 
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1092
 msgid "Not available in all themes"
 msgstr "Ikke tilgjengelig i alle temaer"
 
-#: ../../mod/settings.php:1090
+#: ../../mod/settings.php:1093
 msgid "System (personal) notifications"
 msgstr "System (personlige) varslinger"
 
-#: ../../mod/settings.php:1091
+#: ../../mod/settings.php:1094
 msgid "System info messages"
 msgstr "System infomeldinger"
 
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1095
 msgid "System critical alerts"
 msgstr "System kritiske varsel"
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1096
 msgid "New connections"
 msgstr "Nye forbindelser"
 
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1097
 msgid "System Registrations"
 msgstr "Systemregistreringer"
 
-#: ../../mod/settings.php:1095
+#: ../../mod/settings.php:1098
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Vis også nye vegginnlegg, private meldinger og forbindelser under Varsler"
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1100
 msgid "Notify me of events this many days in advance"
 msgstr "Varsle meg om hendelser dette antall dager på forhånd"
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1100
 msgid "Must be greater than 0"
 msgstr "Må være større enn 0"
 
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1102
 msgid "Advanced Account/Page Type Settings"
 msgstr "Avanserte innstillinger for konto/sidetype"
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1103
 msgid "Change the behaviour of this account for special situations"
 msgstr "Endre oppførselen til denne kontoen i spesielle situasjoner"
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1106
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr "Vennligst skru på ekspertmodus (under <a href=\"settings/features\">Innstillinger > Ekstra funksjoner</a>) for å justere!"
 
-#: ../../mod/settings.php:1104
+#: ../../mod/settings.php:1107
 msgid "Miscellaneous Settings"
 msgstr "Diverse innstillinger"
 
-#: ../../mod/settings.php:1105
+#: ../../mod/settings.php:1108
 msgid "Default photo upload folder"
 msgstr "Standard mappe for opplasting av bilder"
 
-#: ../../mod/settings.php:1106
+#: ../../mod/settings.php:1108 ../../mod/settings.php:1109
+msgid "%Y - current year, %m -  current month"
+msgstr "%Y - nåværende år, %m - nåværende måned"
+
+#: ../../mod/settings.php:1109
 msgid "Default file upload folder"
 msgstr "Standard mappe for opplasting av filer"
 
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1111
 msgid "Personal menu to display in your channel pages"
 msgstr "Personlig meny som kan vises på dine kanalsider"
 
-#: ../../mod/settings.php:1110
+#: ../../mod/settings.php:1113
 msgid "Remove this channel."
 msgstr "Fjern denne kanalen."
 
+#: ../../mod/settings.php:1114
+msgid "Firefox Share $Projectname provider"
+msgstr "$Projectname Firefox Share tilbyder"
+
+#: ../../mod/settings.php:1115
+msgid "Start calendar week on monday"
+msgstr "Start uken med mandag i kalenderen"
+
+#: ../../mod/webpages.php:191
+msgid "Page Title"
+msgstr "Sidetittel"
+
+#: ../../mod/appman.php:28 ../../mod/appman.php:44
+msgid "App installed."
+msgstr "App installert."
+
+#: ../../mod/appman.php:37
+msgid "Malformed app."
+msgstr "Feil oppsett for app-en."
+
+#: ../../mod/appman.php:80
+msgid "Embed code"
+msgstr "Innbyggingskode"
+
+#: ../../mod/appman.php:86
+msgid "Edit App"
+msgstr "Endre app"
+
+#: ../../mod/appman.php:86
+msgid "Create App"
+msgstr "Lag app"
+
+#: ../../mod/appman.php:91
+msgid "Name of app"
+msgstr "Navn på app"
+
+#: ../../mod/appman.php:92
+msgid "Location (URL) of app"
+msgstr "Plassering (URL) til app"
+
+#: ../../mod/appman.php:94
+msgid "Photo icon URL"
+msgstr "Bildeikon URL"
+
+#: ../../mod/appman.php:94
+msgid "80 x 80 pixels - optional"
+msgstr "80 x80 pixler - valgfritt"
+
+#: ../../mod/appman.php:95
+msgid "Version ID"
+msgstr "Versjons-ID"
+
+#: ../../mod/appman.php:96
+msgid "Price of app"
+msgstr "Pris på app"
+
+#: ../../mod/appman.php:97
+msgid "Location (URL) to purchase app"
+msgstr "Plassering (URL) for å kjøpe app"
+
+#: ../../mod/filer.php:48
+msgid "- select -"
+msgstr "- velg -"
+
+#: ../../mod/layouts.php:176
+msgid "Comanche page description language help"
+msgstr "Hjelp med Comanche sidebeskrivelsesspråk"
+
+#: ../../mod/layouts.php:180
+msgid "Layout Description"
+msgstr "Layout-beskrivelse"
+
+#: ../../mod/layouts.php:185
+msgid "Download PDL file"
+msgstr "Last ned PDL-fil"
+
+#: ../../mod/locs.php:21 ../../mod/locs.php:50
+msgid "Location not found."
+msgstr "Plassering er ikke funnet."
+
+#: ../../mod/locs.php:58
+msgid "Location lookup failed."
+msgstr "Oppslag på plassering mislyktes."
+
+#: ../../mod/locs.php:62
+msgid ""
+"Please select another location to become primary before removing the primary"
+" location."
+msgstr "Vennligst velg en annen plassering som primær før du sletter gjeldende primære plassering."
+
+#: ../../mod/locs.php:91
+msgid "Syncing locations"
+msgstr "Synkroniserer plasseringer"
+
+#: ../../mod/locs.php:101
+msgid "No locations found."
+msgstr "Ingen plasseringer ble funnet."
+
+#: ../../mod/locs.php:112
+msgid "Manage Channel Locations"
+msgstr "HÃ¥ndter kanalplasseringer"
+
+#: ../../mod/locs.php:113
+msgid "Location (address)"
+msgstr "Plassering (adresse)"
+
+#: ../../mod/locs.php:114
+msgid "Primary Location"
+msgstr "Hovedplassering"
+
+#: ../../mod/locs.php:115
+msgid "Drop location"
+msgstr "Slett plassering"
+
+#: ../../mod/locs.php:117
+msgid "Sync now"
+msgstr "Synkroniser nå"
+
+#: ../../mod/locs.php:118
+msgid "Please wait several minutes between consecutive operations."
+msgstr "Vennligst vent flere minutter mellom hver etterfølgende operasjon."
+
+#: ../../mod/locs.php:119
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing"
+" your channel."
+msgstr "Når mulig, fjern en plassering ved å logge inn på det nettstedet eller den hub-en og fjern din kanal."
+
+#: ../../mod/locs.php:120
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr "Bruk dette skjemaet for å fjerne plasseringen hvis huben ikke er i drift lenger."
+
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:61
+msgid "$Projectname"
+msgstr "$Projectname"
+
+#: ../../mod/home.php:75
+#, php-format
+msgid "Welcome to %s"
+msgstr "Velkommen til %s"
+
+#: ../../mod/regmod.php:11
+msgid "Please login."
+msgstr "Vennligst logg inn."
+
 #: ../../mod/xchan.php:6
 msgid "Xchan Lookup"
 msgstr "Xchan oppslag"
@@ -7975,62 +8208,348 @@ msgstr "Xchan oppslag"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Slå opp xchan som begynner med (eller webbie):"
 
-#: ../../mod/manage.php:130
+#: ../../mod/xchan.php:37 ../../mod/menu.php:162 ../../mod/mitem.php:116
+msgid "Not found."
+msgstr "Ikke funnet."
+
+#: ../../mod/channel.php:25 ../../mod/chat.php:19
+msgid "You must be logged in to see this page."
+msgstr "Du må være innloegget for å se denne siden."
+
+#: ../../mod/channel.php:97
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Utilstrekkelig tillatelse. Forespørsel omdirigert til profilsiden."
+
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr "Elementet er ikke tilgjengelig."
+
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr "Informasjon om sideeier kunne ikke hentes."
+
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr "Albumet ble ikke funnet."
+
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr "Slett album"
+
+#: ../../mod/photos.php:171 ../../mod/photos.php:1006
+msgid "Delete Photo"
+msgstr "Slett bilde"
+
+#: ../../mod/photos.php:501
+msgid "No photos selected"
+msgstr "Ingen bilder valgt"
+
+#: ../../mod/photos.php:550
+msgid "Access to this item is restricted."
+msgstr "Tilgang til dette elementet er begrenset."
+
+#: ../../mod/photos.php:589
 #, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr "Du har laget %1$.0f av %2$.0f tillatte kanaler."
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt."
 
-#: ../../mod/manage.php:138
-msgid "Create a new channel"
-msgstr "Lag en ny kanal"
+#: ../../mod/photos.php:592
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB lagringsplass til bilder er brukt."
 
-#: ../../mod/manage.php:161
-msgid "Current Channel"
-msgstr "Gjeldende kanal"
+#: ../../mod/photos.php:620
+msgid "Upload Photos"
+msgstr "Last opp bilder"
 
-#: ../../mod/manage.php:163
-msgid "Switch to one of your channels by selecting it."
-msgstr "Bytt til en av dine kanaler ved å velge den."
+#: ../../mod/photos.php:624
+msgid "Enter an album name"
+msgstr "Skriv et albumnavn"
 
-#: ../../mod/manage.php:164
-msgid "Default Channel"
-msgstr "Standardkanal"
+#: ../../mod/photos.php:625
+msgid "or select an existing album (doubleclick)"
+msgstr "eller velg et eksisterende album (dobbeltklikk)"
 
-#: ../../mod/manage.php:165
-msgid "Make Default"
-msgstr "Gjør til standard"
+#: ../../mod/photos.php:626
+msgid "Create a status post for this upload"
+msgstr "Lag et statusinnlegg for denne opplastingen"
 
-#: ../../mod/manage.php:168
+#: ../../mod/photos.php:627
+msgid "Caption (optional):"
+msgstr "Bildetekst (valgfritt):"
+
+#: ../../mod/photos.php:628
+msgid "Description (optional):"
+msgstr "Beskrivelse (valgfritt):"
+
+#: ../../mod/photos.php:655
+msgid "Album name could not be decoded"
+msgstr "Albumnavnet kunne ikke dekodes"
+
+#: ../../mod/photos.php:699 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1250
+msgid "Contact Photos"
+msgstr "Kontaktbilder"
+
+#: ../../mod/photos.php:722
+msgid "Show Newest First"
+msgstr "Vis nyeste først"
+
+#: ../../mod/photos.php:724
+msgid "Show Oldest First"
+msgstr "Vis eldste først"
+
+#: ../../mod/photos.php:824
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Tillatelse avvist. Tilgang til dette elementet kan være begrenset."
+
+#: ../../mod/photos.php:826
+msgid "Photo not available"
+msgstr "Bilde er utilgjengelig"
+
+#: ../../mod/photos.php:884
+msgid "Use as profile photo"
+msgstr "Bruk som profilbilde"
+
+#: ../../mod/photos.php:891
+msgid "Private Photo"
+msgstr "Privat bilde"
+
+#: ../../mod/photos.php:902 ../../mod/events.php:652 ../../mod/events.php:659
+msgid "Previous"
+msgstr "Forrige"
+
+#: ../../mod/photos.php:906
+msgid "View Full Size"
+msgstr "Vis i full størrelse"
+
+#: ../../mod/photos.php:985
+msgid "Edit photo"
+msgstr "Endre bilde"
+
+#: ../../mod/photos.php:987
+msgid "Rotate CW (right)"
+msgstr "Roter med klokka (mot høyre)"
+
+#: ../../mod/photos.php:988
+msgid "Rotate CCW (left)"
+msgstr "Roter mot klokka (venstre)"
+
+#: ../../mod/photos.php:991
+msgid "Enter a new album name"
+msgstr "Skriv et nytt albumnavn"
+
+#: ../../mod/photos.php:992
+msgid "or select an existing one (doubleclick)"
+msgstr "eller velg et eksisterende album (dobbeltklikk)"
+
+#: ../../mod/photos.php:995
+msgid "Caption"
+msgstr "Overskrift"
+
+#: ../../mod/photos.php:997
+msgid "Add a Tag"
+msgstr "Legg til merkelapp"
+
+#: ../../mod/photos.php:1001
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Eksempel: @bob, @Barbara_Jensen, @jim@example.com"
+
+#: ../../mod/photos.php:1004
+msgid "Flag as adult in album view"
+msgstr "Flag som voksent i albumvisning"
+
+#: ../../mod/photos.php:1196
+msgid "In This Photo:"
+msgstr "I dette bildet:"
+
+#: ../../mod/photos.php:1201
+msgid "Map"
+msgstr "Kart"
+
+#: ../../mod/photos.php:1289
+msgid "View Album"
+msgstr "Vis album"
+
+#: ../../mod/photos.php:1300 ../../mod/photos.php:1313
+#: ../../mod/photos.php:1314
+msgid "Recent Photos"
+msgstr "Nye bilder"
+
+#: ../../mod/lockview.php:37
+msgid "Remote privacy information not available."
+msgstr "Ekstern personverninformasjon er ikke tilgjengelig."
+
+#: ../../mod/lockview.php:58
+msgid "Visible to:"
+msgstr "Synlig for:"
+
+#: ../../mod/uexport.php:51 ../../mod/uexport.php:52
+msgid "Export Channel"
+msgstr "Eksporter kanal"
+
+#: ../../mod/uexport.php:53
+msgid ""
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Eksporter grunnleggende informasjon om kanalen din til en fil. Denne er en sikkerhetskopi av dine forbindelser, tillatelser, profil og grunnleggende data, som kan brukes til å importere dine data til en ny hub, men den tar ikke med innholdet."
+
+#: ../../mod/uexport.php:54
+msgid "Export Content"
+msgstr "Eksporter innhold"
+
+#: ../../mod/uexport.php:55
+msgid ""
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Eksporter din kanalinformasjon og det nyeste innholdet til en JSON-sikkerhetskopi, som kan gjenopprettes eller importeres til en annen hub. Denne lager en sikkerhetskopi av alle dine forbindelser, tillatelser, profildata og flere måneder av innholdet ditt. Denne filen kan være SVÆRT stor. Vennligst vær tålmodig - det kan ta flere minutter før denne nedlastningen begynner."
+
+#: ../../mod/uexport.php:56
+msgid "Export your posts from a given year."
+msgstr "Eksporter dine innlegg fra et bestemt år"
+
+#: ../../mod/uexport.php:58
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "Du kan også eksportere dine innlegg og samtaler for et bestemt år eller måned. Juster datoen i din nettlesers adresselinje for å velge andre datoer. Hvis eksporten feiler (muligens på grunn av utilstrekkelig minne på din hub), vennligst prøv igjen med et mer begrenset datoområde."
+
+#: ../../mod/uexport.php:59
 #, php-format
-msgid "%d new messages"
-msgstr "%d nye meldinger"
+msgid ""
+"To select all posts for a given year, such as this year, visit <a "
+"href=\"%1$s\">%2$s</a>"
+msgstr "For å velge alle innlegg for et gitt år, slik som iår, besøk <a href=\"%1$s\">%2$s</a>"
 
-#: ../../mod/manage.php:169
+#: ../../mod/uexport.php:60
 #, php-format
-msgid "%d new introductions"
-msgstr "%d nye introduksjoner"
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr "For å velge alle innlegg fra en gitt måned, slik som januar i år, besøk <a href=\"%1$s\">%2$s</a>"
 
-#: ../../mod/manage.php:171
-msgid "Delegated Channels"
-msgstr "Delegerte kanaler"
+#: ../../mod/uexport.php:61
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a "
+"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
+" please import or restore these in date order (oldest first)."
+msgstr "Disse innholdsfilene kan importeres eller gjenopprettes ved å besøke <a href=\"%1$s\">%2$s</a> på ethvert nettsted som inneholder din kanal. For best resultat, vennligst importer eller gjenopprett disse etter dato (eldste først)."
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
-msgstr "Tillat programforbindelse"
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "Elementet kan ikke endres"
 
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr "GÃ¥ tilbake til din app og legg inn denne sikkerhetskoden:"
+#: ../../mod/editpost.php:57
+msgid "Delete item?"
+msgstr "Slett element?"
 
-#: ../../mod/api.php:89
-msgid "Please login to continue."
-msgstr "Vennligst logg inn for å fortsette."
+#: ../../mod/editpost.php:164 ../../mod/rpost.php:128
+msgid "Edit post"
+msgstr "Endre innlegg"
 
-#: ../../mod/api.php:104
+#: ../../mod/follow.php:25
+msgid "Channel added."
+msgstr "Kanal lagt til."
+
+#: ../../mod/rmagic.php:40
 msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "Vil du tillate dette programmet å få tilgang til dine innlegg og kontakter, og/eller lage nye innlegg for deg?"
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Vi støtte på et problem under innloggingen med din OpenID. Vennligst sjekk at ID-en er stavet riktig."
+
+#: ../../mod/rmagic.php:40
+msgid "The error message was:"
+msgstr "Feilmeldingen var:"
+
+#: ../../mod/rmagic.php:44
+msgid "Authentication failed."
+msgstr "Autentisering mislyktes."
+
+#: ../../mod/rmagic.php:84
+msgid "Remote Authentication"
+msgstr "Fjernautentisering"
+
+#: ../../mod/rmagic.php:85
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Skriv din kanaladresse (for eksempel channel@exampel.com)"
+
+#: ../../mod/rmagic.php:86
+msgid "Authenticate"
+msgstr "Autentiser"
+
+#: ../../mod/chat.php:174
+msgid "Room not found"
+msgstr "Rommet ble ikke funnet"
+
+#: ../../mod/chat.php:185
+msgid "Leave Room"
+msgstr "Forlat rom"
+
+#: ../../mod/chat.php:186
+msgid "Delete This Room"
+msgstr "Slett dette rommet"
+
+#: ../../mod/chat.php:187
+msgid "I am away right now"
+msgstr "Jeg er borte akkurat nå"
+
+#: ../../mod/chat.php:188
+msgid "I am online"
+msgstr "Jeg er online"
+
+#: ../../mod/chat.php:190
+msgid "Bookmark this room"
+msgstr "Bokmerk dette rommet"
+
+#: ../../mod/chat.php:208 ../../mod/chat.php:231
+msgid "New Chatroom"
+msgstr "Nytt chatrom"
+
+#: ../../mod/chat.php:209
+msgid "Chatroom Name"
+msgstr "Navn på chatrom"
+
+#: ../../mod/chat.php:210
+msgid "Expiration of chats (minutes)"
+msgstr "Chat utgår (antall minutter)"
+
+#: ../../mod/chat.php:227
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "%1$s sine chatrom"
+
+#: ../../mod/search.php:212
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Elementer merket med: %s"
+
+#: ../../mod/search.php:214
+#, php-format
+msgid "Search results for: %s"
+msgstr "Søkeresultater for: %s"
+
+#: ../../mod/viewsrc.php:40
+msgid "Source of Item"
+msgstr "Kilde til element"
+
+#: ../../mod/ffsapi.php:8
+msgid "Share content from Firefox to $Projectname"
+msgstr "Del innhold fra Firefox til $Projectname"
+
+#: ../../mod/ffsapi.php:11
+msgid "Activate the Firefox $Projectname provider"
+msgstr "Skru på Firefox $Projectname tilbyderen"
+
+#: ../../mod/magic.php:69
+msgid "Hub not found."
+msgstr "Hubben ble ikke funnet."
 
 #: ../../mod/connections.php:52 ../../mod/connections.php:150
 msgid "Blocked"
@@ -8109,589 +8628,298 @@ msgstr "Søk blant dine forbindelser"
 msgid "Finding: "
 msgstr "Fant:"
 
-#: ../../mod/editlayout.php:112
-msgid "Delete layout?"
-msgstr "Slett layout?"
-
-#: ../../mod/editlayout.php:178
-msgid "Edit Layout"
-msgstr "Endre layout"
-
-#: ../../mod/editwebpage.php:153
-msgid "Delete webpage?"
-msgstr "Slett webside?"
-
-#: ../../mod/editwebpage.php:172
-msgid "Page link title"
-msgstr "Sidens lenketittel"
-
-#: ../../mod/editwebpage.php:222
-msgid "Edit Webpage"
-msgstr "Endre webside"
-
-#: ../../mod/group.php:20
-msgid "Collection created."
-msgstr "Samling opprettet."
-
-#: ../../mod/group.php:26
-msgid "Could not create collection."
-msgstr "Kunne ikke lage samling."
-
-#: ../../mod/group.php:54
-msgid "Collection updated."
-msgstr "Samlingen er oppdatert."
-
-#: ../../mod/group.php:86
-msgid "Create a collection of channels."
-msgstr "Lag en samling med kanaler."
-
-#: ../../mod/group.php:87 ../../mod/group.php:180
-msgid "Collection Name: "
-msgstr "Navn på samling:"
-
-#: ../../mod/group.php:89 ../../mod/group.php:183
-msgid "Members are visible to other channels"
-msgstr "Medlemmer er synlig for andre kanaler"
-
-#: ../../mod/group.php:107
-msgid "Collection removed."
-msgstr "Samling fjernet."
-
-#: ../../mod/group.php:109
-msgid "Unable to remove collection."
-msgstr "Ikke i stand til å fjerne samlingen."
-
-#: ../../mod/group.php:179
-msgid "Collection Editor"
-msgstr "Samlingsbehandler"
-
-#: ../../mod/group.php:193
-msgid "Members"
-msgstr "Medlemmer"
-
-#: ../../mod/group.php:195
-msgid "All Connected Channels"
-msgstr "Alle tilkoblede kanaler"
-
-#: ../../mod/group.php:227
-msgid "Click on a channel to add or remove."
-msgstr "Klikk på en kanal for å legge til eller fjerne."
-
-#: ../../mod/connect.php:56 ../../mod/connect.php:104
-msgid "Continue"
-msgstr "Fortsett"
-
-#: ../../mod/connect.php:85
-msgid "Premium Channel Setup"
-msgstr "Premiumkanal-oppsett"
-
-#: ../../mod/connect.php:87
-msgid "Enable premium channel connection restrictions"
-msgstr "Slå på restriksjoner for forbindelse med premiumkanal"
-
-#: ../../mod/connect.php:88
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Vennligst skriv dine restriksjoner og betingelser, slik som PayPal-kvittering, retningslinjer for bruk, og så videre."
+#: ../../mod/manage.php:130
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr "Du har laget %1$.0f av %2$.0f tillatte kanaler."
 
-#: ../../mod/connect.php:90 ../../mod/connect.php:110
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Denne kanalen kan kreve ytterligere steg og bekreftelse av følgende betingelser før tilkobling:"
+#: ../../mod/manage.php:138
+msgid "Create a new channel"
+msgstr "Lag en ny kanal"
 
-#: ../../mod/connect.php:91
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Potensielle forbindelser vil da se følgende tekst før de går videre:"
+#: ../../mod/manage.php:161
+msgid "Current Channel"
+msgstr "Gjeldende kanal"
 
-#: ../../mod/connect.php:92 ../../mod/connect.php:113
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "Ved å fortsette bekrefter jeg at jeg har oppfylt alle instruksjoner gitt på denne siden."
+#: ../../mod/manage.php:163
+msgid "Switch to one of your channels by selecting it."
+msgstr "Bytt til en av dine kanaler ved å velge den."
 
-#: ../../mod/connect.php:101
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Ingen spesifikke instruksjoner er gitt av kanaleieren.)"
+#: ../../mod/manage.php:164
+msgid "Default Channel"
+msgstr "Standardkanal"
 
-#: ../../mod/connect.php:109
-msgid "Restricted or Premium Channel"
-msgstr "Begrenset kanal eller premiumkanal"
+#: ../../mod/manage.php:165
+msgid "Make Default"
+msgstr "Gjør til standard"
 
-#: ../../mod/viewconnections.php:59
-msgid "No connections."
-msgstr "Ingen forbindelser."
+#: ../../mod/manage.php:168
+#, php-format
+msgid "%d new messages"
+msgstr "%d nye meldinger"
 
-#: ../../mod/viewconnections.php:72
+#: ../../mod/manage.php:169
 #, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "Besøk %s sin profil [%s]"
+msgid "%d new introductions"
+msgstr "%d nye introduksjoner"
 
-#: ../../mod/locs.php:21 ../../mod/locs.php:49
-msgid "Location not found."
-msgstr "Plassering er ikke funnet."
+#: ../../mod/manage.php:171
+msgid "Delegated Channels"
+msgstr "Delegerte kanaler"
 
-#: ../../mod/locs.php:57
-msgid "Location lookup failed."
-msgstr "Oppslag på plassering mislyktes."
+#: ../../mod/menu.php:45
+msgid "Unable to update menu."
+msgstr "Ikke i stand til å oppdatere meny."
 
-#: ../../mod/locs.php:61
-msgid ""
-"Please select another location to become primary before removing the primary"
-" location."
-msgstr "Vennligst velg en annen plassering som primær før du sletter gjeldende primære plassering."
+#: ../../mod/menu.php:56
+msgid "Unable to create menu."
+msgstr "Ikke i stand til å lage meny."
 
-#: ../../mod/locs.php:93
-msgid "No locations found."
-msgstr "Ingen plasseringer ble funnet."
+#: ../../mod/menu.php:94 ../../mod/menu.php:106
+msgid "Menu Name"
+msgstr "Menynavn"
 
-#: ../../mod/locs.php:104
-msgid "Manage Channel Locations"
-msgstr "HÃ¥ndter kanalplasseringer"
+#: ../../mod/menu.php:94
+msgid "Unique name (not visible on webpage) - required"
+msgstr "Unikt navn (ikke synlig på websiden) - påkrevet"
 
-#: ../../mod/locs.php:105
-msgid "Location (address)"
-msgstr "Plassering (adresse)"
+#: ../../mod/menu.php:95 ../../mod/menu.php:107
+msgid "Menu Title"
+msgstr "Menytittel"
 
-#: ../../mod/locs.php:106
-msgid "Primary Location"
-msgstr "Hovedplassering"
+#: ../../mod/menu.php:95
+msgid "Visible on webpage - leave empty for no title"
+msgstr "Synlig på websiden - la stå tomt for ingen tittel"
 
-#: ../../mod/locs.php:107
-msgid "Drop location"
-msgstr "Slett plassering"
+#: ../../mod/menu.php:96
+msgid "Allow Bookmarks"
+msgstr "Tillat bokmerker"
 
-#: ../../mod/post.php:234
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "Fjernautentisering blokkert. Du er logget inn på dette nettstedet lokalt. Vennligst logg ut og prøv på nytt."
+#: ../../mod/menu.php:96 ../../mod/menu.php:153
+msgid "Menu may be used to store saved bookmarks"
+msgstr "Menyen kan brukes til å lagre lagrede bokmerker"
 
-#: ../../mod/setup.php:191
-msgid "$Projectname Server - Setup"
-msgstr "$Projectname-tjener - oppsett"
+#: ../../mod/menu.php:97 ../../mod/menu.php:155
+msgid "Submit and proceed"
+msgstr "Send inn og fortsett"
 
-#: ../../mod/setup.php:195
-msgid "Could not connect to database."
-msgstr "Fikk ikke kontakt med databasen."
+#: ../../mod/menu.php:109
+msgid "Drop"
+msgstr "Slett"
 
-#: ../../mod/setup.php:199
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr "Fikk ikke kontakt med det angitte nettstedets URL. Problemet kan muligens skyldes SSL-sertifikatet eller DNS."
+#: ../../mod/menu.php:113
+msgid "Bookmarks allowed"
+msgstr "Bokmerker tillatt"
 
-#: ../../mod/setup.php:206
-msgid "Could not create table."
-msgstr "Kunne ikke lage tabellen."
+#: ../../mod/menu.php:115
+msgid "Delete this menu"
+msgstr "Slett denne menyen"
 
-#: ../../mod/setup.php:211
-msgid "Your site database has been installed."
-msgstr "Databasen til ditt nettsted har blitt installert."
+#: ../../mod/menu.php:116 ../../mod/menu.php:150
+msgid "Edit menu contents"
+msgstr "Endre menyinnholdet"
 
-#: ../../mod/setup.php:215
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr "Du må kanskje importere filen \"install/schmea_xxx.sql\" manuelt ved å bruke en databaseklient."
+#: ../../mod/menu.php:117
+msgid "Edit this menu"
+msgstr "Endre denne menyen"
 
-#: ../../mod/setup.php:216 ../../mod/setup.php:284 ../../mod/setup.php:734
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Vennligst les filen \"install/INSTALL.txt\"."
+#: ../../mod/menu.php:132
+msgid "Menu could not be deleted."
+msgstr "Menyen kunne ikke bli slettet."
 
-#: ../../mod/setup.php:281
-msgid "System check"
-msgstr "Systemsjekk"
+#: ../../mod/menu.php:140 ../../mod/mitem.php:24
+msgid "Menu not found."
+msgstr "Menyen ble ikke funnet."
 
-#: ../../mod/setup.php:286
-msgid "Check again"
-msgstr "Sjekk igjen"
+#: ../../mod/menu.php:145
+msgid "Edit Menu"
+msgstr "Endre meny"
 
-#: ../../mod/setup.php:308
-msgid "Database connection"
-msgstr "Databaseforbindelse"
+#: ../../mod/menu.php:149
+msgid "Add or remove entries to this menu"
+msgstr "Legg til eller fjern punkter i denne menyen"
 
-#: ../../mod/setup.php:309
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
-msgstr "For å installere $Projectname må du oppgi hvordan din database kan kontaktes."
+#: ../../mod/menu.php:151
+msgid "Menu name"
+msgstr "Menynavn"
 
-#: ../../mod/setup.php:310
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Vennligst kontakt din nettstedstilbyder eller nettstedsadministrator hvis du har spørsmål om disse innstillingene."
+#: ../../mod/menu.php:151
+msgid "Must be unique, only seen by you"
+msgstr "Må være unik, ses bare av deg"
 
-#: ../../mod/setup.php:311
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "Databasen du oppgir nedenfor må finnes på forhånd. Hvis den ikke finnes, vennligst lag den før du fortsetter."
+#: ../../mod/menu.php:152
+msgid "Menu title"
+msgstr "Menytittel"
 
-#: ../../mod/setup.php:315
-msgid "Database Server Name"
-msgstr "Navn på databasetjener"
+#: ../../mod/menu.php:152
+msgid "Menu title as seen by others"
+msgstr "Menytittelen andre ser"
 
-#: ../../mod/setup.php:315
-msgid "Default is localhost"
-msgstr "Standard er localhost"
+#: ../../mod/menu.php:153
+msgid "Allow bookmarks"
+msgstr "Tillat bokmerker"
 
-#: ../../mod/setup.php:316
-msgid "Database Port"
-msgstr "Databaseport"
+#: ../../mod/mail.php:34
+msgid "Unable to lookup recipient."
+msgstr "Ikke i stand til å slå opp mottaker."
 
-#: ../../mod/setup.php:316
-msgid "Communication port number - use 0 for default"
-msgstr "Kommunikasjonsportnummer - bruk 0 for standard"
+#: ../../mod/mail.php:42
+msgid "Unable to communicate with requested channel."
+msgstr "Ikke i stand til å kommunisere med forespurt kanal."
 
-#: ../../mod/setup.php:317
-msgid "Database Login Name"
-msgstr "Database innloggingsnavn"
+#: ../../mod/mail.php:49
+msgid "Cannot verify requested channel."
+msgstr "Kan ikke bekrefte forespurt kanal."
 
-#: ../../mod/setup.php:318
-msgid "Database Login Password"
-msgstr "Database innloggingspassord"
+#: ../../mod/mail.php:75
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "Valgt kanal har restriksjoner for private meldinger. Sending feilet."
 
-#: ../../mod/setup.php:319
-msgid "Database Name"
-msgstr "Databasenavn"
+#: ../../mod/mail.php:140
+msgid "Messages"
+msgstr "Meldinger"
 
-#: ../../mod/setup.php:320
-msgid "Database Type"
-msgstr "Databasetype"
+#: ../../mod/mail.php:175
+msgid "Message recalled."
+msgstr "Innlegg tilbakekalt."
 
-#: ../../mod/setup.php:322 ../../mod/setup.php:363
-msgid "Site administrator email address"
-msgstr "E-postadressen til administrator ved nettstedet"
+#: ../../mod/mail.php:188
+msgid "Conversation removed."
+msgstr "Samtale fjernet."
 
-#: ../../mod/setup.php:322 ../../mod/setup.php:363
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "Din konto sin e-postadresse må være lik denne for å kunne bruke web-administrasjonspanelet."
+#: ../../mod/mail.php:231
+msgid "Requested channel is not in this network"
+msgstr "Forespurt kanal er ikke tilgjengelig i dette nettverket."
 
-#: ../../mod/setup.php:323 ../../mod/setup.php:365
-msgid "Website URL"
-msgstr "Nettstedets URL"
+#: ../../mod/mail.php:239
+msgid "Send Private Message"
+msgstr "Send privat melding"
 
-#: ../../mod/setup.php:323 ../../mod/setup.php:365
-msgid "Please use SSL (https) URL if available."
-msgstr "Vennligst bruk SSL (https) URL hvis tilgjengelig."
+#: ../../mod/mail.php:240 ../../mod/mail.php:370
+msgid "To:"
+msgstr "Til:"
 
-#: ../../mod/setup.php:325 ../../mod/setup.php:367
-msgid "Please select a default timezone for your website"
-msgstr "Vennligst velg en standard tidssone for ditt nettsted"
+#: ../../mod/mail.php:243 ../../mod/mail.php:372
+msgid "Subject:"
+msgstr "Emne:"
 
-#: ../../mod/setup.php:352
-msgid "Site settings"
-msgstr "Nettstedets innstillinger"
+#: ../../mod/mail.php:250
+msgid "Send"
+msgstr "Send"
 
-#: ../../mod/setup.php:417
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Fant ikke en kommandolinjeversjon av PHP i webtjenerens sti (PATH)."
+#: ../../mod/mail.php:342
+msgid "Delete message"
+msgstr "Slett melding"
 
-#: ../../mod/setup.php:418
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr "Hvis du ikke har en kommandolinjeversjon av PHP installert på tjeneren, så vil du ikke kunne kjøre bakgrunnshenting via cron."
+#: ../../mod/mail.php:343
+msgid "Delivery report"
+msgstr "Leveringsrapport"
 
-#: ../../mod/setup.php:422
-msgid "PHP executable path"
-msgstr "PHP-kjørefilens sti"
+#: ../../mod/mail.php:344
+msgid "Recall message"
+msgstr "Tilbakekall innlegg"
 
-#: ../../mod/setup.php:422
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Skriv full sti til kjørefilen for PHP. Du kan la denne stå blank for å fortsette installasjonen."
+#: ../../mod/mail.php:346
+msgid "Message has been recalled."
+msgstr "Innlegget har blitt tilbakekalt."
 
-#: ../../mod/setup.php:427
-msgid "Command line PHP"
-msgstr "Kommandolinje PHP"
+#: ../../mod/mail.php:363
+msgid "Delete Conversation"
+msgstr "Slett samtale"
 
-#: ../../mod/setup.php:436
+#: ../../mod/mail.php:365
 msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "Kommandolinjeversjonen av PHP på ditt system har ikke \"register_argc_argv\" påskrudd."
-
-#: ../../mod/setup.php:437
-msgid "This is required for message delivery to work."
-msgstr "Dette er påkrevd for at meldingslevering skal virke."
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Ingen sikret kommunikasjon tilgjengelig. Du kan <strong>muligens</strong> greie å svare via senderens profilside."
 
-#: ../../mod/setup.php:440
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
+#: ../../mod/mail.php:369
+msgid "Send Reply"
+msgstr "Send svar"
 
-#: ../../mod/setup.php:458
+#: ../../mod/mail.php:374
 #, php-format
-msgid ""
-"Your max allowed total upload size is set to %s. Maximum size of one file to"
-" upload is set to %s. You are allowed to upload up to %d files at once."
-msgstr "Den største totale opplastingsstørrelsen du er tillatt er satt til %s. Filstørrelsen på en enkelt fil er satt til å maksimalt være %s. Du har lov til å laste opp inntil %d filer samtidig."
-
-#: ../../mod/setup.php:463
-msgid "You can adjust these settings in the servers php.ini."
-msgstr "Du kan justere disse innstillingene i tjenerens php.ini."
-
-#: ../../mod/setup.php:465
-msgid "PHP upload limits"
-msgstr "PHP opplastingsgrenser"
-
-#: ../../mod/setup.php:488
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Feil: \"openssl_pkey_new\"-funksjonen på dette systemet er ikke i stand til å lage krypteringsnøkler"
-
-#: ../../mod/setup.php:489
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Ved kjøring på Windows, vennligst se \"http://www.php.net/manual/en/openssl.installation.php\"."
-
-#: ../../mod/setup.php:492
-msgid "Generate encryption keys"
-msgstr "Lag krypteringsnøkler"
-
-#: ../../mod/setup.php:504
-msgid "libCurl PHP module"
-msgstr "libCurl PHP-modul"
-
-#: ../../mod/setup.php:505
-msgid "GD graphics PHP module"
-msgstr "GD graphics PHP-modul"
-
-#: ../../mod/setup.php:506
-msgid "OpenSSL PHP module"
-msgstr "OpenSSL PHP-modul"
-
-#: ../../mod/setup.php:507
-msgid "mysqli or postgres PHP module"
-msgstr "MySQLi eller Postgres PHP modul"
-
-#: ../../mod/setup.php:508
-msgid "mb_string PHP module"
-msgstr "mb_string PHP-modul"
-
-#: ../../mod/setup.php:509
-msgid "mcrypt PHP module"
-msgstr "mcrypt PHP-modul"
-
-#: ../../mod/setup.php:510
-msgid "xml PHP module"
-msgstr "XML PHP modul"
-
-#: ../../mod/setup.php:514 ../../mod/setup.php:516
-msgid "Apache mod_rewrite module"
-msgstr "Apache mod_rewrite-modul"
-
-#: ../../mod/setup.php:514
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Feil: Apache web-tjenerens mod-rewrite-modul er påkrevd, men ikke installert."
-
-#: ../../mod/setup.php:520 ../../mod/setup.php:523
-msgid "proc_open"
-msgstr "proc_open"
-
-#: ../../mod/setup.php:520
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr "Feil: proc_open er påkrevd, men er enten ikke installert eller har blitt avskrudd i php.ini"
-
-#: ../../mod/setup.php:528
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Feil: libCURL PHP-modul er påkrevd, men er ikke installert."
-
-#: ../../mod/setup.php:532
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Feil: GD graphics PHP-modul med JPEG-støtte er påkrevd, men er ikke installert."
-
-#: ../../mod/setup.php:536
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Feil: openssl PHP-modul er påkrevd, men er ikke installert."
-
-#: ../../mod/setup.php:540
-msgid ""
-"Error: mysqli or postgres PHP module required but neither are installed."
-msgstr "Feil: mysqli eller postgres PHP modul er påkrevd, men ingen av dem er installert."
-
-#: ../../mod/setup.php:544
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Feil: mb_string PHP-modul er påkrevd, men  er ikke installert."
-
-#: ../../mod/setup.php:548
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Feil: mcrypt PHP-modul er påkrevd, men er ikke installert."
-
-#: ../../mod/setup.php:552
-msgid "Error: xml PHP module required for DAV but not installed."
-msgstr "Feil: XML PHP modul er påkrevet for DAV, men den er ikke installert."
-
-#: ../../mod/setup.php:570
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr "Web-installasjonen må kunne lage en fil kalt \".htconfig.php\" i toppkatalogen til web-tjeneren din, men dette får den ikke til."
-
-#: ../../mod/setup.php:571
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr "Dette er oftest tillatelsesinnstilling, ettersom webtjeneren kanskje kan skrive til filer i din mappe - selv om du kan."
-
-#: ../../mod/setup.php:572
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr "På slutten av denne prosedyren vil vi gi deg en tekst til å lagre i en fil kalt .htconfig.php i toppkatalogen til din Red."
-
-#: ../../mod/setup.php:573
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Alternativt, så kan du hoppe over denne prosedyren og gjennomføre en manuell installasjon. Vennligst se filen \"install/INSTALL.txt\" for instruksjoner."
+msgid "Your message for %s (%s):"
+msgstr "Din melding til %s (%s):"
 
-#: ../../mod/setup.php:576
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php kan skrives til"
+#: ../../mod/help.php:148
+msgid "Documentation Search"
+msgstr "Søk i dokumentasjon"
 
-#: ../../mod/setup.php:590
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Red bruker malmotoren Smarty3 for å gjengi sine webvisninger. Smarty3 kompilerer malene om til PHP for å framskynde gjengivelsen."
+#: ../../mod/help.php:186 ../../mod/help.php:192 ../../mod/help.php:198
+msgid "Help:"
+msgstr "Hjelp:"
 
-#: ../../mod/setup.php:591
-#, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the Red top level folder."
-msgstr "For å kunne lagre disse kompilerte malene, så må webtjeneren ha skrivetilgang til katalogen %s under Red sin hovedmappe."
+#: ../../mod/help.php:213 ../../index.php:238
+msgid "Not Found"
+msgstr "Ikke funnet"
 
-#: ../../mod/setup.php:592 ../../mod/setup.php:613
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Vennligst sikre at brukeren som din web-tjeneste kjører som (for eksempel www-data) har skrivetilgang til denne katalogen."
+#: ../../mod/help.php:237
+msgid "$Projectname Documentation"
+msgstr "$Projectname dokumentasjon"
 
-#: ../../mod/setup.php:593
-#, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
-msgstr "Merknad: som et sikkerhetstiltak bør du bare gi webtjerenn skrivetilgang til %s - ikke til malfilene (.tpl) som den inneholder."
+#: ../../mod/service_limits.php:19
+msgid "No service class restrictions found."
+msgstr "Ingen restriksjoner er funnet i tjenesteklasse."
 
-#: ../../mod/setup.php:596
+#: ../../mod/siteinfo.php:15
 #, php-format
-msgid "%s is writable"
-msgstr "%s kan skrives til"
-
-#: ../../mod/setup.php:612
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to"
-" have write access to the store directory under the Red top level folder"
-msgstr "Red bruker lagringsmappen for å lagre opplastede filer. Webtjeneren trenger å ha skrivetilgang til lagringsmappen under Red sin toppnivåmappe."
-
-#: ../../mod/setup.php:616
-msgid "store is writable"
-msgstr "lageret kan skrives til"
-
-#: ../../mod/setup.php:649
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "SSL-sertifikatet kan ikke kontrolleres. Fiks sertifikatet eller skru av https tilgang til dette nettstedet."
-
-#: ../../mod/setup.php:650
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
-msgstr "Hvis du har HTTPS-tilgang til ditt nettsted eller tillater forbindelser til TCP port 443 (HTTPS-porten), så MÅ du bruke nettlesergodkjent sertifkater. Du MÅ IKKE bruke egensignert sertifikater!"
+msgid "Version %s"
+msgstr "Versjon %s"
 
-#: ../../mod/setup.php:651
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr "Denne begrensningen er tatt inn fordi offentlige innlegg fra deg kan for eksempel inneholde referanser til bilder på din egen hub."
+#: ../../mod/siteinfo.php:36
+msgid "Installed plugins/addons/apps:"
+msgstr "Installerte tilleggsfunksjoner/tillegg/apper:"
 
-#: ../../mod/setup.php:652
-msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
-msgstr "Hvis sertifikatet ditt ikke gjenkjennes, så vil medlemmer på andre nettsteder (som selv kan ha godkjente sertifikater) få en beskjed med en advarsel på deres eget nettsted som klager over sikkerhetsproblemer."
+#: ../../mod/siteinfo.php:49
+msgid "No installed plugins/addons/apps"
+msgstr "Ingen installerte tilleggsfunksjoner/tillegg/apper"
 
-#: ../../mod/setup.php:653
+#: ../../mod/siteinfo.php:62
 msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr "Dette kan gi problemer med brukervennlighet (ikke bare på ditt eget nettsted), så vi må insistere på dette kravet."
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Dette er en $Projectname-hub - et globalt samhandlende nettverk av desentraliserte nettsteder med innbygget personvern."
 
-#: ../../mod/setup.php:654
-msgid ""
-"Providers are available that issue free certificates which are browser-"
-"valid."
-msgstr "Det finnes tilbydere som utsteder gratis sertifikater som er gyldige i nettlesere."
+#: ../../mod/siteinfo.php:64
+msgid "Tag: "
+msgstr "Merkelapp:"
 
-#: ../../mod/setup.php:656
-msgid "SSL certificate validation"
-msgstr "SSL sertifikat-kontroll"
+#: ../../mod/siteinfo.php:66
+msgid "Last background fetch: "
+msgstr "Siste innhenting i bakgrunnen:"
 
-#: ../../mod/setup.php:662
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server "
-"configuration.Test: "
-msgstr "URL omskriving (rewrite) i .htaccess virker ikke. Sjekk konfigurasjonen til tjeneren din. Test:"
+#: ../../mod/siteinfo.php:68
+msgid "Current load average: "
+msgstr "Gjeldende belastningsgjennomsnitt:"
 
-#: ../../mod/setup.php:665
-msgid "Url rewrite is working"
-msgstr "URL rewrite virker"
+#: ../../mod/siteinfo.php:71
+msgid "Running at web location"
+msgstr "Kjører på webplasseringen"
 
-#: ../../mod/setup.php:674
+#: ../../mod/siteinfo.php:72
 msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "Databasekonfigurasjonsfilen \".htconfig.php\" kunne ikke skrives. Vennligst bruk den medfølgende teksten for å lage en konfigurasjonsfil i toppkatalogen av din web-tjener."
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr "Vennligst besøk <a href=\"http://hubzilla.org\">hubzilla.org</a> for å lære mer om $Projectname."
 
-#: ../../mod/setup.php:698
-msgid "Errors encountered creating database tables."
-msgstr "Feil oppstod under opprettelsen av databasetabeller."
+#: ../../mod/siteinfo.php:73
+msgid "Bug reports and issues: please visit"
+msgstr "Feilmeldinger og feilretting: vennligst besøk"
 
-#: ../../mod/setup.php:732
-msgid "<h1>What next</h1>"
-msgstr "<h1>Hva gjenstår</h1>"
+#: ../../mod/siteinfo.php:75
+msgid "$projectname issues"
+msgstr "$projectname problemer"
 
-#: ../../mod/setup.php:733
+#: ../../mod/siteinfo.php:76
 msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "VIKTIG: Du må [manuelt] sette opp en automatisert tidfestet oppgave til bakgrunnshenteren."
-
-#: ../../mod/sharedwithme.php:94
-msgid "Files: shared with me"
-msgstr "Filer: delt med meg"
-
-#: ../../mod/sharedwithme.php:96
-msgid "NEW"
-msgstr "NY"
-
-#: ../../mod/sharedwithme.php:99
-msgid "Remove all files"
-msgstr "Fjern alle filer"
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Forslag, ros og så videre - vennligst e-post \"redmatrix\" hos librelist - punktum com"
 
-#: ../../mod/sharedwithme.php:100
-msgid "Remove this file"
-msgstr "Fjern denne filen"
+#: ../../mod/siteinfo.php:78
+msgid "Site Administrators"
+msgstr "Nettstedsadministratorer"
 
 #: ../../mod/suggest.php:35
 msgid ""
@@ -8699,299 +8927,288 @@ msgid ""
 "hours."
 msgstr "Ingen forslag tilgjengelige. Hvis dette er et nytt nettsted, vennligst prøv igjen om 24 timer."
 
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:174
-#: ../../mod/profiles.php:231 ../../mod/profiles.php:600
-msgid "Profile not found."
-msgstr "Profilen ble ikke funnet."
-
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
-msgstr "Profilen er slettet."
-
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
-msgstr "Profil-"
-
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
-msgstr "Ny profil opprettet."
+#: ../../mod/events.php:21
+msgid "Calendar entries imported."
+msgstr "Kalenderhendelsene er importert."
 
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
-msgstr "Profilen er utilgjengelig for klonen."
+#: ../../mod/events.php:23
+msgid "No calendar entries found."
+msgstr "Ingen kalenderhendelser funnet."
 
-#: ../../mod/profiles.php:136
-msgid "Profile unavailable to export."
-msgstr "Profilen er utilgjengelig for eksport."
+#: ../../mod/events.php:100
+msgid "Event can not end before it has started."
+msgstr "Hendelsen kan ikke slutte før den starter."
 
-#: ../../mod/profiles.php:241
-msgid "Profile Name is required."
-msgstr "Profilnavn er påkrevd."
+#: ../../mod/events.php:102 ../../mod/events.php:111 ../../mod/events.php:131
+msgid "Unable to generate preview."
+msgstr "Klarer ikke å lage forhåndsvisning."
 
-#: ../../mod/profiles.php:404
-msgid "Marital Status"
-msgstr "Sivilstand"
+#: ../../mod/events.php:109
+msgid "Event title and start time are required."
+msgstr "Hendelsestittel og starttidspunkt er påkrevd."
 
-#: ../../mod/profiles.php:408
-msgid "Romantic Partner"
-msgstr "Romantisk partner"
+#: ../../mod/events.php:129 ../../mod/events.php:254
+msgid "Event not found."
+msgstr "Hendelsen ble ikke funnet."
 
-#: ../../mod/profiles.php:412
-msgid "Likes"
-msgstr "Liker"
+#: ../../mod/events.php:437
+msgid "Edit event titel"
+msgstr "Rediger hendelsens tittel"
 
-#: ../../mod/profiles.php:416
-msgid "Dislikes"
-msgstr "Liker ikke"
+#: ../../mod/events.php:437
+msgid "Event titel"
+msgstr "Hendelsens tittel"
 
-#: ../../mod/profiles.php:420
-msgid "Work/Employment"
-msgstr "Arbeid/sysselsetting"
+#: ../../mod/events.php:439
+msgid "Categories (comma-separated list)"
+msgstr "Kategorier (kommaseparert liste)"
 
-#: ../../mod/profiles.php:423
-msgid "Religion"
-msgstr "Religion"
+#: ../../mod/events.php:440
+msgid "Edit Category"
+msgstr "Endre kategori"
 
-#: ../../mod/profiles.php:427
-msgid "Political Views"
-msgstr "Politiske synspunkter"
+#: ../../mod/events.php:440
+msgid "Category"
+msgstr "Kategori"
 
-#: ../../mod/profiles.php:435
-msgid "Sexual Preference"
-msgstr "Seksuelle preferanser"
+#: ../../mod/events.php:443
+msgid "Edit start date and time"
+msgstr "Endre startdato og tidspunkt"
 
-#: ../../mod/profiles.php:439
-msgid "Homepage"
-msgstr "Hjemmeside"
+#: ../../mod/events.php:443
+msgid "Start date and time"
+msgstr "Startdato og tidspunkt"
 
-#: ../../mod/profiles.php:443
-msgid "Interests"
-msgstr "Interesser"
+#: ../../mod/events.php:444 ../../mod/events.php:447
+msgid "Finish date and time are not known or not relevant"
+msgstr "Sluttdato og tidspunkt er ikke kjent eller ikke relevant"
 
-#: ../../mod/profiles.php:537
-msgid "Profile updated."
-msgstr "Profilen er oppdatert."
+#: ../../mod/events.php:446
+msgid "Edit finish date and time"
+msgstr "Endre sluttdato og tidspunkt"
 
-#: ../../mod/profiles.php:626
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Skjul kontakt-/vennelisten din fra de som ser på denne profilen?"
+#: ../../mod/events.php:446
+msgid "Finish date and time"
+msgstr "Sluttdato og tidspunkt"
 
-#: ../../mod/profiles.php:666
-msgid "Edit Profile Details"
-msgstr "Endre profildetaljer"
+#: ../../mod/events.php:448 ../../mod/events.php:449
+msgid "Adjust for viewer timezone"
+msgstr "Juster i forhold til tilskuerens tidssone"
 
-#: ../../mod/profiles.php:668
-msgid "View this profile"
-msgstr "Vis denne profilen"
+#: ../../mod/events.php:448
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
+msgstr "Viktig for hendelser som skjer på et bestemt sted. Ikke praktisk for globale ferier eller fridager."
 
-#: ../../mod/profiles.php:670
-msgid "Change Profile Photo"
-msgstr "Endre profilbilde"
+#: ../../mod/events.php:450
+msgid "Edit Description"
+msgstr "Endre beskrivelse"
 
-#: ../../mod/profiles.php:671
-msgid "Create a new profile using these settings"
-msgstr "Lag en ny profil ved å bruke disse innstillingene"
+#: ../../mod/events.php:452
+msgid "Edit Location"
+msgstr "Endre plassering"
 
-#: ../../mod/profiles.php:672
-msgid "Clone this profile"
-msgstr "Klon denne profilen"
+#: ../../mod/events.php:455 ../../mod/events.php:457
+msgid "Share this event"
+msgstr "Del denne hendelsen"
 
-#: ../../mod/profiles.php:673
-msgid "Delete this profile"
-msgstr "Slett denne profilen"
+#: ../../mod/events.php:462
+msgid "Advanced Options"
+msgstr "Avanserte alternativer"
 
-#: ../../mod/profiles.php:675
-msgid "Import profile from file"
-msgstr "Importer profil fra fil"
+#: ../../mod/events.php:574
+msgid "l, F j"
+msgstr "l, F j"
 
-#: ../../mod/profiles.php:676
-msgid "Export profile to file"
-msgstr "Eksporter profil til fil"
+#: ../../mod/events.php:596
+msgid "Edit event"
+msgstr "Endre hendelse"
 
-#: ../../mod/profiles.php:677
-msgid "Profile Name:"
-msgstr "Profilnavn:"
+#: ../../mod/events.php:598
+msgid "Delete event"
+msgstr "Slett hendelse"
 
-#: ../../mod/profiles.php:678
-msgid "Your Full Name:"
-msgstr "Ditt fulle navn:"
+#: ../../mod/events.php:632
+msgid "calendar"
+msgstr "kalender"
 
-#: ../../mod/profiles.php:679
-msgid "Title/Description:"
-msgstr "Tittel/Beskrivelse:"
+#: ../../mod/events.php:651
+msgid "Edit Event"
+msgstr "Endre hendelse"
 
-#: ../../mod/profiles.php:680
-msgid "Your Gender:"
-msgstr "Ditt kjønn:"
+#: ../../mod/events.php:651
+msgid "Create Event"
+msgstr "Lag hendelse"
 
-#: ../../mod/profiles.php:681
-msgid "Birthday :"
-msgstr "Fødselsdag:"
+#: ../../mod/events.php:661
+msgid "Today"
+msgstr "Idag"
 
-#: ../../mod/profiles.php:682
-msgid "Street Address:"
-msgstr "Gateadresse:"
+#: ../../mod/events.php:692
+msgid "Event removed"
+msgstr "Hendelse slettet"
 
-#: ../../mod/profiles.php:683
-msgid "Locality/City:"
-msgstr "Sted/By:"
+#: ../../mod/events.php:695
+msgid "Failed to remove event"
+msgstr "Mislyktes med å slette hendelse"
 
-#: ../../mod/profiles.php:684
-msgid "Postal/Zip Code:"
-msgstr "Postnummer/ZIP-kode:"
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
+msgstr "Ugyldig profil-identifikator."
 
-#: ../../mod/profiles.php:685
-msgid "Country:"
-msgstr "Land:"
+#: ../../mod/profperm.php:110
+msgid "Profile Visibility Editor"
+msgstr "Endre profilsynlighet"
 
-#: ../../mod/profiles.php:686
-msgid "Region/State:"
-msgstr "Region/fylke:"
+#: ../../mod/profperm.php:114
+msgid "Click on a contact to add or remove."
+msgstr "Klikk på en kontakt for å legge til eller fjerne."
 
-#: ../../mod/profiles.php:687
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr "<span class=\"heart\">&hearts;</span> Sivilstand:"
+#: ../../mod/profperm.php:123
+msgid "Visible To"
+msgstr "Synlig for"
 
-#: ../../mod/profiles.php:688
-msgid "Who: (if applicable)"
-msgstr "Hvem: (hvis det er aktuelt) "
+#: ../../mod/mitem.php:48
+msgid "Unable to create element."
+msgstr "Klarer ikke å lage element."
 
-#: ../../mod/profiles.php:689
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Eksempler: kari123, Kari Villiamsen, kari@example.com"
+#: ../../mod/mitem.php:72
+msgid "Unable to update menu element."
+msgstr "Ikke i stand til å oppdatere menyelement."
 
-#: ../../mod/profiles.php:690
-msgid "Since [date]:"
-msgstr "Siden [dato]:"
+#: ../../mod/mitem.php:88
+msgid "Unable to add menu element."
+msgstr "Ikke i stand til å legge til menyelement."
 
-#: ../../mod/profiles.php:692
-msgid "Homepage URL:"
-msgstr "Hjemmeside URL:"
+#: ../../mod/mitem.php:149 ../../mod/mitem.php:222
+msgid "Menu Item Permissions"
+msgstr "Menyelement Tillatelser"
 
-#: ../../mod/profiles.php:695
-msgid "Religious Views:"
-msgstr "Religiøse synspunkter:"
+#: ../../mod/mitem.php:152 ../../mod/mitem.php:168
+msgid "Link Name"
+msgstr "Lenkenavn"
 
-#: ../../mod/profiles.php:696
-msgid "Keywords:"
-msgstr "Nøkkelord:"
+#: ../../mod/mitem.php:153 ../../mod/mitem.php:227
+msgid "Link or Submenu Target"
+msgstr "Lenke- eller undermeny-mål"
 
-#: ../../mod/profiles.php:699
-msgid "Example: fishing photography software"
-msgstr "Eksempel: fisking fotografering programvare"
+#: ../../mod/mitem.php:153
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr "Skriv URL-en til lenken eller velg et menynavn for å lage en undermeny"
 
-#: ../../mod/profiles.php:700
-msgid "Used in directory listings"
-msgstr "Brukt i katalogoppføringer"
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:228
+msgid "Use magic-auth if available"
+msgstr "Bruk magic-autent hvis mulig"
 
-#: ../../mod/profiles.php:701
-msgid "Tell us about yourself..."
-msgstr "Fortell oss om deg selv..."
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:229
+msgid "Open link in new window"
+msgstr "Ã…pne lenke i nytt vindu"
 
-#: ../../mod/profiles.php:702
-msgid "Hobbies/Interests"
-msgstr "Hobbier/Interesser"
+#: ../../mod/mitem.php:156 ../../mod/mitem.php:230
+msgid "Order in list"
+msgstr "Ordne i liste"
 
-#: ../../mod/profiles.php:703
-msgid "Contact information and Social Networks"
-msgstr "Kontaktinformasjon og sosiale nettverk"
+#: ../../mod/mitem.php:156 ../../mod/mitem.php:230
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Høyere tall vil synke mot bunnen av listen"
 
-#: ../../mod/profiles.php:704
-msgid "My other channels"
-msgstr "Mine andre kanaler"
+#: ../../mod/mitem.php:157
+msgid "Submit and finish"
+msgstr "Send inn og avslutt"
 
-#: ../../mod/profiles.php:705
-msgid "Musical interests"
-msgstr "Musikkinteresser"
+#: ../../mod/mitem.php:158
+msgid "Submit and continue"
+msgstr "Send inn og fortsett"
 
-#: ../../mod/profiles.php:706
-msgid "Books, literature"
-msgstr "Bøker, litteratur"
+#: ../../mod/mitem.php:166
+msgid "Menu:"
+msgstr "Meny:"
 
-#: ../../mod/profiles.php:707
-msgid "Television"
-msgstr "TV/fjernsyn"
+#: ../../mod/mitem.php:169
+msgid "Link Target"
+msgstr "Lenkemål"
 
-#: ../../mod/profiles.php:708
-msgid "Film/dance/culture/entertainment"
-msgstr "Film/dans/kultur/underholdning"
+#: ../../mod/mitem.php:172
+msgid "Edit menu"
+msgstr "Endre meny"
 
-#: ../../mod/profiles.php:709
-msgid "Love/romance"
-msgstr "Kjærlighet/romantikk"
+#: ../../mod/mitem.php:175
+msgid "Edit element"
+msgstr "Endre element"
 
-#: ../../mod/profiles.php:710
-msgid "Work/employment"
-msgstr "Arbeid/sysselsetting"
+#: ../../mod/mitem.php:176
+msgid "Drop element"
+msgstr "Slett element"
 
-#: ../../mod/profiles.php:711
-msgid "School/education"
-msgstr "Skole/utdanning"
+#: ../../mod/mitem.php:177
+msgid "New element"
+msgstr "Nytt element"
 
-#: ../../mod/profiles.php:717
-msgid "This is your default profile."
-msgstr "Dette er din standardprofil."
+#: ../../mod/mitem.php:178
+msgid "Edit this menu container"
+msgstr "Endre denne menybeholderen"
 
-#: ../../mod/profiles.php:728
-msgid "Age: "
-msgstr "Alder:"
+#: ../../mod/mitem.php:179
+msgid "Add menu element"
+msgstr "Legg til menyelement"
 
-#: ../../mod/profiles.php:771
-msgid "Edit/Manage Profiles"
-msgstr "Endre/håndter profiler"
+#: ../../mod/mitem.php:180
+msgid "Delete this menu item"
+msgstr "Slett dette menyelementet"
 
-#: ../../mod/profiles.php:772
-msgid "Add profile things"
-msgstr "Legg til profilting"
+#: ../../mod/mitem.php:181
+msgid "Edit this menu item"
+msgstr "Endre dette menyelementet"
 
-#: ../../mod/profiles.php:773
-msgid "Include desirable objects in your profile"
-msgstr "Inkluder ønskverdige objekter i din profil"
+#: ../../mod/mitem.php:198
+msgid "Menu item not found."
+msgstr "Menyelement ble ikke funnet."
 
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
-msgstr "Ugyldig profil-identifikator."
+#: ../../mod/mitem.php:211
+msgid "Menu item deleted."
+msgstr "Menyelement slettet."
 
-#: ../../mod/profperm.php:110
-msgid "Profile Visibility Editor"
-msgstr "Endre profilsynlighet"
+#: ../../mod/mitem.php:213
+msgid "Menu item could not be deleted."
+msgstr "Menyelement kunne ikke bli slettet."
 
-#: ../../mod/profperm.php:114
-msgid "Click on a contact to add or remove."
-msgstr "Klikk på en kontakt for å legge til eller fjerne."
+#: ../../mod/mitem.php:220
+msgid "Edit Menu Element"
+msgstr "Endre menyelement"
 
-#: ../../mod/profperm.php:123
-msgid "Visible To"
-msgstr "Synlig for"
+#: ../../mod/mitem.php:226
+msgid "Link text"
+msgstr "Lenketekst"
 
-#: ../../mod/rbmark.php:88
-msgid "Select a bookmark folder"
-msgstr "Velg en bokmerkemappe"
+#: ../../mod/wholikesme.php:13
+msgid "Who likes me?"
+msgstr "Hvem liker meg?"
 
-#: ../../mod/rbmark.php:93
-msgid "Save Bookmark"
-msgstr "Lagre bokmerke"
+#: ../../mod/sharedwithme.php:94
+msgid "Files: shared with me"
+msgstr "Filer: delt med meg"
 
-#: ../../mod/rbmark.php:94
-msgid "URL of bookmark"
-msgstr "URL-en til bokmerket"
+#: ../../mod/sharedwithme.php:96
+msgid "NEW"
+msgstr "NY"
 
-#: ../../mod/rbmark.php:99
-msgid "Or enter new bookmark folder name"
-msgstr "Eller skriv nytt navn på bokmerkemappe"
+#: ../../mod/sharedwithme.php:99
+msgid "Remove all files"
+msgstr "Fjern alle filer"
 
-#: ../../mod/import_items.php:101
-msgid "Import completed"
-msgstr "Import ferdig"
+#: ../../mod/sharedwithme.php:100
+msgid "Remove this file"
+msgstr "Fjern denne filen"
 
-#: ../../mod/import_items.php:119
-msgid "Import Items"
-msgstr "Importer elementer"
+#: ../../mod/viewconnections.php:59
+msgid "No connections."
+msgstr "Ingen forbindelser."
 
-#: ../../mod/import_items.php:120
-msgid ""
-"Use this form to import existing posts and content from an export file."
-msgstr "Bruk dette skjemaet for å importere eksisterende innlegg og innhold fra en eksportfil."
+#: ../../mod/viewconnections.php:72
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Besøk %s sin profil [%s]"
 
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
@@ -9129,51 +9346,57 @@ msgstr "Angi størrelsen for samtalens forfatterbilde"
 msgid "Set size of followup author photos"
 msgstr "Angi størrelsen på forfatterbilder ved oppfølging"
 
-#: ../../boot.php:1302
+#: ../../Zotlabs/Zot/Auth.php:140
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "Fjernautentisering blokkert. Du er logget inn på dette nettstedet lokalt. Vennligst logg ut og prøv på nytt."
+
+#: ../../boot.php:1299
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Oppdatering %s mislyktes. Se feilloggen."
 
-#: ../../boot.php:1305
+#: ../../boot.php:1302
 #, php-format
 msgid "Update Error at %s"
 msgstr "Oppdateringsfeil ved %s"
 
-#: ../../boot.php:1472
+#: ../../boot.php:1469
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Lag en konto for å få tilgang til tjenester og programmer i Hubzilla"
 
-#: ../../boot.php:1500
+#: ../../boot.php:1491
 msgid "Password"
 msgstr "Passord"
 
-#: ../../boot.php:1501
+#: ../../boot.php:1492
 msgid "Remember me"
 msgstr "Husk meg"
 
-#: ../../boot.php:1504
+#: ../../boot.php:1495
 msgid "Forgot your password?"
 msgstr "Glemt passordet ditt?"
 
-#: ../../boot.php:2130
+#: ../../boot.php:2115
 msgid "toggle mobile"
 msgstr "Skru på mobil"
 
-#: ../../boot.php:2265
+#: ../../boot.php:2250
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Nettstedets SSL-sertifikat er ikke gyldig. Vennligst fiks dette."
 
-#: ../../boot.php:2268
+#: ../../boot.php:2253
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] SSL-feil ved nettsted hos %s"
 
-#: ../../boot.php:2305
+#: ../../boot.php:2290
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron/planlagte oppgaver kjører ikke."
 
-#: ../../boot.php:2309
+#: ../../boot.php:2294
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron-oppgaver kjører ikke på %s"
diff --git a/view/nb-no/hstrings.php b/view/nb-no/hstrings.php
index ab6767cb7..24dd51904 100644
--- a/view/nb-no/hstrings.php
+++ b/view/nb-no/hstrings.php
@@ -5,19 +5,120 @@ function string_plural_select_nb_no($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["No username found in import file."] = "Ingen brukernavn ble funnet i importfilen.";
+$a->strings["Connect"] = "Koble";
+$a->strings["New window"] = "Nytt vindu";
+$a->strings["Open the selected location in a different window or browser tab"] = "Ã…pne det valgte stedet i et annet vindu eller nettleser-fane";
+$a->strings["User '%s' deleted"] = "Brukeren '%s' er slettet";
+$a->strings["Missing room name"] = "Mangler romnavn";
+$a->strings["Duplicate room name"] = "Duplikat romnavn";
+$a->strings["Invalid room specifier."] = "Ugyldig rom-spesifisering";
+$a->strings["Room not found."] = "Rommet ble ikke funnet.";
+$a->strings["Permission denied."] = "Tillatelse avslått.";
+$a->strings["Room is full"] = "Rommet er fullt";
+$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan ikke lage en kopi av kanal-identifikatoren på dette systemet. Import mislyktes.";
 $a->strings["Unable to create a unique channel address. Import failed."] = "Klarte ikke å lage en unik kanaladresse. Import mislyktes.";
-$a->strings["Import completed."] = "Import ferdig.";
-$a->strings["parent"] = "opp et nivå";
+$a->strings["Channel clone failed. Import failed."] = "Kanalkloning mislyktes. Import mislyktes.";
+$a->strings["Cloned channel not found. Import failed."] = "Klonet kanal ble ikke funnet. Import mislyktes.";
+$a->strings["prev"] = "forrige";
+$a->strings["first"] = "første";
+$a->strings["last"] = "siste";
+$a->strings["next"] = "neste";
+$a->strings["older"] = "eldre";
+$a->strings["newer"] = "nyere";
+$a->strings["No connections"] = "Ingen forbindelser";
+$a->strings["%d Connection"] = array(
+	0 => "%d forbindelse",
+	1 => "%d forbindelser",
+);
+$a->strings["View Connections"] = "Vis forbindelser";
+$a->strings["Search"] = "Søk";
+$a->strings["Save"] = "Lagre";
+$a->strings["poke"] = "prikk";
+$a->strings["poked"] = "prikket";
+$a->strings["ping"] = "varsle";
+$a->strings["pinged"] = "varslet";
+$a->strings["prod"] = "oppildne";
+$a->strings["prodded"] = "oppildnet";
+$a->strings["slap"] = "daske";
+$a->strings["slapped"] = "dasket";
+$a->strings["finger"] = "fingre";
+$a->strings["fingered"] = "fingret";
+$a->strings["rebuff"] = "tilbakevise";
+$a->strings["rebuffed"] = "tilbakeviste";
+$a->strings["happy"] = "glad";
+$a->strings["sad"] = "trist";
+$a->strings["mellow"] = "dempet";
+$a->strings["tired"] = "trøtt";
+$a->strings["perky"] = "oppkvikket";
+$a->strings["angry"] = "sint";
+$a->strings["stupified"] = "sløvet";
+$a->strings["puzzled"] = "forundret";
+$a->strings["interested"] = "interessert";
+$a->strings["bitter"] = "bitter";
+$a->strings["cheerful"] = "munter";
+$a->strings["alive"] = "levende";
+$a->strings["annoyed"] = "irritert";
+$a->strings["anxious"] = "nervøs";
+$a->strings["cranky"] = "gretten";
+$a->strings["disturbed"] = "foruroliget";
+$a->strings["frustrated"] = "frustrert";
+$a->strings["depressed"] = "lei seg";
+$a->strings["motivated"] = "motivert";
+$a->strings["relaxed"] = "avslappet";
+$a->strings["surprised"] = "overrasket";
+$a->strings["Monday"] = "mandag";
+$a->strings["Tuesday"] = "tirsdag";
+$a->strings["Wednesday"] = "onsdag";
+$a->strings["Thursday"] = "torsdag";
+$a->strings["Friday"] = "fredag";
+$a->strings["Saturday"] = "lørdag";
+$a->strings["Sunday"] = "søndag";
+$a->strings["January"] = "januar";
+$a->strings["February"] = "februar";
+$a->strings["March"] = "mars";
+$a->strings["April"] = "april";
+$a->strings["May"] = "mai";
+$a->strings["June"] = "juni";
+$a->strings["July"] = "juli";
+$a->strings["August"] = "august";
+$a->strings["September"] = "september";
+$a->strings["October"] = "oktober";
+$a->strings["November"] = "november";
+$a->strings["December"] = "desember";
+$a->strings["Unknown Attachment"] = "Ukjent vedlegg";
+$a->strings["Size"] = "Størrelse";
+$a->strings["unknown"] = "ukjent";
+$a->strings["remove category"] = "fjern kategori";
+$a->strings["remove from file"] = "fjern fra fil";
+$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
+$a->strings["Starts:"] = "Starter:";
+$a->strings["Finishes:"] = "Slutter:";
+$a->strings["Location:"] = "Plassering:";
+$a->strings["Click to open/close"] = "Klikk for å åpne/lukke";
+$a->strings["Link to Source"] = "Lenke til kilde";
+$a->strings["default"] = "standard";
+$a->strings["Page layout"] = "Sidens layout";
+$a->strings["You can create your own with the layouts tool"] = "Du kan lage din egen med layout-verktøyet";
+$a->strings["Page content type"] = "Sidens innholdstype";
+$a->strings["Select an alternate language"] = "Velg et annet språk";
+$a->strings["photo"] = "foto";
+$a->strings["event"] = "hendelse";
+$a->strings["status"] = "status";
+$a->strings["comment"] = "kommentar";
+$a->strings["activity"] = "aktivitet";
+$a->strings["Design Tools"] = "Designverktøy";
+$a->strings["Blocks"] = "Byggeklosser";
+$a->strings["Menus"] = "Menyer";
+$a->strings["Layouts"] = "Layout";
+$a->strings["Pages"] = "Sider";
 $a->strings["Collection"] = "Samling";
+$a->strings["parent"] = "opp et nivå";
 $a->strings["Principal"] = "Viktigste";
 $a->strings["Addressbook"] = "Adressebok";
 $a->strings["Calendar"] = "Kalender";
 $a->strings["Schedule Inbox"] = "Tidsplan innboks";
 $a->strings["Schedule Outbox"] = "Tidsplan utboks";
 $a->strings["Unknown"] = "Ukjent";
-$a->strings["%1\$s used"] = "%1\$s brukt";
-$a->strings["%1\$s used of %2\$s (%3\$s&#37;)"] = "%1\$s brukt av %2\$s (%3\$s&#37;)";
 $a->strings["Files"] = "Filer";
 $a->strings["Total"] = "Totalt";
 $a->strings["Shared"] = "Delt";
@@ -25,134 +126,14 @@ $a->strings["Create"] = "Lag";
 $a->strings["Upload"] = "Last opp";
 $a->strings["Name"] = "Navn";
 $a->strings["Type"] = "Type";
-$a->strings["Size"] = "Størrelse";
 $a->strings["Last Modified"] = "Sist endret";
 $a->strings["Edit"] = "Endre";
 $a->strings["Delete"] = "Slett";
+$a->strings["You are using %1\$s of your available file storage."] = "Du bruker %1\$s av din tilgjengelige lagringsplass.";
+$a->strings["You are using %1\$s of %2\$s available file storage. (%3\$s&#37;)"] = "Du bruker %1\$s av %2\$s tilgjengelig lagringsplass (%3\$s&#37;)";
+$a->strings["WARNING:"] = "ADVARSEL:";
 $a->strings["Create new folder"] = "Lag ny mappe";
 $a->strings["Upload file"] = "Last opp fil";
-$a->strings["Can view my normal stream and posts"] = "Kan se min normale strøm og innlegg";
-$a->strings["Can view my default channel profile"] = "Kan se min standard kanalprofil";
-$a->strings["Can view my connections"] = "Kan se mine forbindelser";
-$a->strings["Can view my file storage and photos"] = "Kan se mine filer og bilder";
-$a->strings["Can view my webpages"] = "Kan se mine websider";
-$a->strings["Can send me their channel stream and posts"] = "Kan sende meg deres kanalstrøm og innlegg";
-$a->strings["Can post on my channel page (\"wall\")"] = "Kan lage innlegg på min kanalside (\"vegg\")";
-$a->strings["Can comment on or like my posts"] = "Kan kommentere på eller like mine innlegg";
-$a->strings["Can send me private mail messages"] = "Kan sende meg private meldinger";
-$a->strings["Can like/dislike stuff"] = "Kan like/ikke like forskjellige greier";
-$a->strings["Profiles and things other than posts/comments"] = "Profiler og andre ting enn innlegg/kommentarer";
-$a->strings["Can forward to all my channel contacts via post @mentions"] = "Kan videresende til alle mine kanalkontakter via @navn i innlegg";
-$a->strings["Advanced - useful for creating group forum channels"] = "Avansert - nyttig for å lage forumkanaler for grupper";
-$a->strings["Can chat with me (when available)"] = "Kan chatte/sende lynmeldinger til meg (når tilgjengelig)";
-$a->strings["Can write to my file storage and photos"] = "Kan skrive til mitt lager for filer og bilder";
-$a->strings["Can edit my webpages"] = "Kan endre mine websider";
-$a->strings["Can source my public posts in derived channels"] = "Kan bruke mine offentlige innlegg som kanalkilde i egne kanaler";
-$a->strings["Somewhat advanced - very useful in open communities"] = "Litt avansert - svært nyttig i åpne fellesskap";
-$a->strings["Can administer my channel resources"] = "Kan administrere mine kanalressurser";
-$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Ekstremt avansert. La dette være med mindre du vet hva du gjør";
-$a->strings["Social Networking"] = "Sosialt nettverk";
-$a->strings["Mostly Public"] = "Ganske offentlig";
-$a->strings["Restricted"] = "Begrenset";
-$a->strings["Private"] = "Privat";
-$a->strings["Community Forum"] = "Forum for fellesskap";
-$a->strings["Feed Republish"] = "Republisering av strømmet innhold";
-$a->strings["Special Purpose"] = "Spesiell bruk";
-$a->strings["Celebrity/Soapbox"] = "Kjendis/Talerstol";
-$a->strings["Group Repository"] = "Gruppelager";
-$a->strings["Other"] = "Annen";
-$a->strings["Custom/Expert Mode"] = "Tilpasset/Ekspertmodus";
-$a->strings["Missing room name"] = "Mangler romnavn";
-$a->strings["Duplicate room name"] = "Duplikat romnavn";
-$a->strings["Invalid room specifier."] = "Ugyldig rom-spesifisering";
-$a->strings["Room not found."] = "Rommet ble ikke funnet.";
-$a->strings["Permission denied."] = "Tillatelse avslått.";
-$a->strings["Room is full"] = "Rommet er fullt";
-$a->strings["Miscellaneous"] = "Forskjellig";
-$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD eller MM-DD";
-$a->strings["Required"] = "PÃ¥krevd";
-$a->strings["never"] = "aldri";
-$a->strings["less than a second ago"] = "for mindre enn ett sekund siden";
-$a->strings["year"] = "Ã¥r";
-$a->strings["years"] = "Ã¥r";
-$a->strings["month"] = "måned";
-$a->strings["months"] = "måneder";
-$a->strings["week"] = "uke";
-$a->strings["weeks"] = "uker";
-$a->strings["day"] = "dag";
-$a->strings["days"] = "dager";
-$a->strings["hour"] = "time";
-$a->strings["hours"] = "timer";
-$a->strings["minute"] = "minutt";
-$a->strings["minutes"] = "minutter";
-$a->strings["second"] = "sekund";
-$a->strings["seconds"] = "sekunder";
-$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s siden";
-$a->strings["%1\$s's birthday"] = "%1\$s sin fødselsdag";
-$a->strings["Happy Birthday %1\$s"] = "Gratulerer med dagen, %1\$s !";
-$a->strings["General Features"] = "Generelle funksjoner";
-$a->strings["Content Expiration"] = "Innholdet utløper";
-$a->strings["Remove posts/comments and/or private messages at a future time"] = "Fjern innlegg/kommentarer og/eller private meldinger på et angitt tidspunkt i fremtiden";
-$a->strings["Multiple Profiles"] = "Flere profiler";
-$a->strings["Ability to create multiple profiles"] = "Mulig å lage flere profiler";
-$a->strings["Advanced Profiles"] = "Avanserte profiler";
-$a->strings["Additional profile sections and selections"] = "Ytterlige seksjoner og utvalg til profilen";
-$a->strings["Profile Import/Export"] = "Profil-import/-eksport";
-$a->strings["Save and load profile details across sites/channels"] = "Lagre og åpne profildetaljer på tvers av nettsteder/kanaler";
-$a->strings["Web Pages"] = "Web-sider";
-$a->strings["Provide managed web pages on your channel"] = "Tilby kontrollerte web-sider på din kanal";
-$a->strings["Private Notes"] = "Private merknader";
-$a->strings["Enables a tool to store notes and reminders"] = "Skrur på et verktøy for lagre merknader og påminnelser";
-$a->strings["Navigation Channel Select"] = "Navigasjon kanalvalg";
-$a->strings["Change channels directly from within the navigation dropdown menu"] = "Endre kanaler direkte fra navigasjonsmenyen";
-$a->strings["Photo Location"] = "Bildeplassering";
-$a->strings["If location data is available on uploaded photos, link this to a map."] = "Hvis plasseringsdata er tilgjengelige i opplastede bilder, plasser dette på et kart.";
-$a->strings["Expert Mode"] = "Ekspertmodus";
-$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Skru på Ekspertmodus for å tilby avanserte konfigurasjonsvalg";
-$a->strings["Premium Channel"] = "Premiumkanal";
-$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Lar deg angi restriksjoner og betingelser for de som kobler seg til din kanal";
-$a->strings["Post Composition Features"] = "Funksjoner for å lage innlegg";
-$a->strings["Use Markdown"] = "Bruk Markdown";
-$a->strings["Allow use of \"Markdown\" to format posts"] = "Tillat bruk av \"Markdown\" til formatering av innlegg";
-$a->strings["Large Photos"] = "Store bilder";
-$a->strings["Include large (640px) photo thumbnails in posts. If not enabled, use small (320px) photo thumbnails"] = "Inkluder store (640px) miniatyrbilder i innlegg. Hvis denne ikke er skrudd på, bruk små (320px) miniatyrbilder.";
-$a->strings["Channel Sources"] = "Kanalkilder";
-$a->strings["Automatically import channel content from other channels or feeds"] = "Automatisk import av kanalinnhold fra andre kanaler eller strømmer";
-$a->strings["Even More Encryption"] = "Enda mer kryptering";
-$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Tillat valgfri kryptering av innhold ende-til-ende via en delt hemmelig nøkkel";
-$a->strings["Enable voting tools"] = "Skru på verktøy for å stemme";
-$a->strings["Provide a class of post which others can vote on"] = "Tilby en type innlegg som andre kan stemme på";
-$a->strings["Network and Stream Filtering"] = "Nettverk- og strømfiltrering";
-$a->strings["Search by Date"] = "Søk etter dato";
-$a->strings["Ability to select posts by date ranges"] = "Mulighet for å velge innlegg etter datoområde";
-$a->strings["Collections Filter"] = "Filter for samlinger";
-$a->strings["Enable widget to display Network posts only from selected collections"] = "Skru på miniprogram for å vise Nettverksinnlegg bare fra valgte samlinger";
-$a->strings["Saved Searches"] = "Lagrede søk";
-$a->strings["Save search terms for re-use"] = "Lagre søkeuttrykk for senere bruk";
-$a->strings["Network Personal Tab"] = "Nettverk personlig fane";
-$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Skru på fane for å bare vise Nettverksinnlegg som du har deltatt i";
-$a->strings["Network New Tab"] = "Nettverk Ny fane";
-$a->strings["Enable tab to display all new Network activity"] = "Skru på fane for å vise all ny nettverksaktivitet";
-$a->strings["Affinity Tool"] = "Nærhetsverktøy";
-$a->strings["Filter stream activity by depth of relationships"] = "Filtrer strømaktiviteten etter releasjonsdybde";
-$a->strings["Connection Filtering"] = "Filtrer forbindelser";
-$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtrer innkommende innlegg fra forbindelser basert på nøkkelord/innhold";
-$a->strings["Suggest Channels"] = "Foreslå kanaler";
-$a->strings["Show channel suggestions"] = "Vis kanalforslag";
-$a->strings["Post/Comment Tools"] = "Innlegg-/Kommentar-verktøy";
-$a->strings["Tagging"] = "Merking";
-$a->strings["Ability to tag existing posts"] = "Mulighet til å merke eksisterende meldinger";
-$a->strings["Post Categories"] = "Innleggskategorier";
-$a->strings["Add categories to your posts"] = "Legg kategorier til dine innlegg";
-$a->strings["Saved Folders"] = "Lagrede mapper";
-$a->strings["Ability to file posts under folders"] = "Mulighet til å sortere innlegg i mapper";
-$a->strings["Dislike Posts"] = "Mislik innlegg";
-$a->strings["Ability to dislike posts/comments"] = "Mulighet til å mislike innlegg/kommentarer";
-$a->strings["Star Posts"] = "Stjerneinnlegg";
-$a->strings["Ability to mark special posts with a star indicator"] = "Mulighet til å merke spesielle innlegg med en stjerne";
-$a->strings["Tag Cloud"] = "Merkelappsky";
-$a->strings["Provide a personal tag cloud on your channel page"] = "Tilby en personlig merkelappsky på din kanalside";
-$a->strings["Default"] = "Standard";
 $a->strings["Delete this item?"] = "Slett dette elementet?";
 $a->strings["Comment"] = "Kommentar";
 $a->strings["[+] show all"] = "[+] Vis alle";
@@ -173,6 +154,7 @@ $a->strings["Describe (optional)"] = "Beskriv (valgfritt)";
 $a->strings["Submit"] = "Send";
 $a->strings["Please enter a link URL"] = "Vennligst skriv inn en lenke URL:";
 $a->strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Endringene er ikke lagret. Er du sikker på at du ønsker å forlate denne siden?";
+$a->strings["Location"] = "Plassering";
 $a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
 $a->strings["timeago.prefixFromNow"] = "timeago.prefixFromNow";
 $a->strings["ago"] = "siden";
@@ -190,18 +172,7 @@ $a->strings["about a year"] = "omtrent et år";
 $a->strings["%d years"] = "%d år";
 $a->strings[" "] = " ";
 $a->strings["timeago.numbers"] = "timeago.numbers";
-$a->strings["January"] = "januar";
-$a->strings["February"] = "februar";
-$a->strings["March"] = "mars";
-$a->strings["April"] = "april";
 $a->strings["__ctx:long__ May"] = "mai";
-$a->strings["June"] = "juni";
-$a->strings["July"] = "juli";
-$a->strings["August"] = "august";
-$a->strings["September"] = "september";
-$a->strings["October"] = "oktober";
-$a->strings["November"] = "november";
-$a->strings["December"] = "desember";
 $a->strings["Jan"] = "Jan";
 $a->strings["Feb"] = "Feb";
 $a->strings["Mar"] = "Mar";
@@ -214,13 +185,6 @@ $a->strings["Sep"] = "Sep";
 $a->strings["Oct"] = "Okt";
 $a->strings["Nov"] = "Nov";
 $a->strings["Dec"] = "Des";
-$a->strings["Sunday"] = "søndag";
-$a->strings["Monday"] = "mandag";
-$a->strings["Tuesday"] = "tirsdag";
-$a->strings["Wednesday"] = "onsdag";
-$a->strings["Thursday"] = "torsdag";
-$a->strings["Friday"] = "fredag";
-$a->strings["Saturday"] = "lørdag";
 $a->strings["Sun"] = "Søn";
 $a->strings["Mon"] = "Man";
 $a->strings["Tue"] = "Tirs";
@@ -233,42 +197,374 @@ $a->strings["__ctx:calendar__ month"] = "måned";
 $a->strings["__ctx:calendar__ week"] = "uke";
 $a->strings["__ctx:calendar__ day"] = "dag";
 $a->strings["__ctx:calendar__ All day"] = "Hele dagen";
-$a->strings["Frequently"] = "Ofte";
-$a->strings["Hourly"] = "Hver time";
-$a->strings["Twice daily"] = "To ganger daglig";
-$a->strings["Daily"] = "Daglig";
-$a->strings["Weekly"] = "Ukentlig";
-$a->strings["Monthly"] = "MÃ¥nedlig";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["OStatus"] = "OStatus";
-$a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Email"] = "E-post";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Zot!"] = "Zot!";
-$a->strings["LinkedIn"] = "LinkedIn";
-$a->strings["XMPP/IM"] = "XMPP/IM";
-$a->strings["MySpace"] = "MySpace";
+$a->strings["No username found in import file."] = "Ingen brukernavn ble funnet i importfilen.";
+$a->strings["Import completed."] = "Import ferdig.";
+$a->strings["Default"] = "Standard";
+$a->strings["Permission denied"] = "Tillatelse avvist";
+$a->strings["(Unknown)"] = "(Ukjent)";
+$a->strings["Visible to anybody on the internet."] = "Synlig for enhver på Internett.";
+$a->strings["Visible to you only."] = "Synlig bare for deg.";
+$a->strings["Visible to anybody in this network."] = "Synlig for enhver i dette nettverket.";
+$a->strings["Visible to anybody authenticated."] = "Synlig for enhver som er autentisert.";
+$a->strings["Visible to anybody on %s."] = "Synlig for alle på %s.";
+$a->strings["Visible to all connections."] = "Synlig for alle forbindelser.";
+$a->strings["Visible to approved connections."] = "Synlig for godkjente forbindelser.";
+$a->strings["Visible to specific connections."] = "Synlig for spesifikke forbindelser.";
+$a->strings["Item not found."] = "Elementet ble ikke funnet.";
+$a->strings["Collection not found."] = "Samlingen ble ikke funnet.";
+$a->strings["Collection is empty."] = "Samlingen er tom.";
+$a->strings["Collection: %s"] = "Samling: %s";
+$a->strings["Connection: %s"] = "Forbindelse: %s";
+$a->strings["Connection not found."] = "Forbindelsen ble ikke funnet.";
+$a->strings["This event has been added to your calendar."] = "Denne hendelsen er lagt til i din kalender.";
+$a->strings["Not specified"] = "Ikke spesifisert";
+$a->strings["Needs Action"] = "Trenger handling";
+$a->strings["Completed"] = "Ferdig";
+$a->strings["In Process"] = "Igang";
+$a->strings["Cancelled"] = "Avbrutt";
+$a->strings["Unable to obtain identity information from database"] = "Klarer ikke å få tak i identitetsinformasjon fra databasen";
+$a->strings["Empty name"] = "Mangler navn";
+$a->strings["Name too long"] = "Navnet er for langt";
+$a->strings["No account identifier"] = "Ingen kontoidentifikator";
+$a->strings["Nickname is required."] = "Kallenavn er påkrevd.";
+$a->strings["Reserved nickname. Please choose another."] = "Reservert kallenavn. Vennligst velg et annet.";
+$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Kallenavnet inneholder tegn som ikke er støttet eller det er allerede i bruk på dette nettstedet.";
+$a->strings["Unable to retrieve created identity"] = "Klarer ikke å hente den lagede identiteten";
+$a->strings["Default Profile"] = "Standardprofil";
+$a->strings["Friends"] = "Venner";
+$a->strings["Requested channel is not available."] = "Forespurt kanal er ikke tilgjengelig.";
+$a->strings["Requested profile is not available."] = "Forespurt profil er ikke tilgjengelig.";
+$a->strings["Change profile photo"] = "Endre profilbilde";
+$a->strings["Profiles"] = "Profiler";
+$a->strings["Manage/edit profiles"] = "HÃ¥ndtere/endre profiler";
+$a->strings["Create New Profile"] = "Lag ny profil";
+$a->strings["Edit Profile"] = "Endre profil";
+$a->strings["Profile Image"] = "Profilbilde";
+$a->strings["visible to everybody"] = "synlig for alle";
+$a->strings["Edit visibility"] = "Endre synlighet";
+$a->strings["Gender:"] = "Kjønn:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Hjemmeside:";
+$a->strings["Online Now"] = "Online nå";
+$a->strings["g A l F d"] = "g A l F d";
+$a->strings["F d"] = "F d";
+$a->strings["[today]"] = "[idag]";
+$a->strings["Birthday Reminders"] = "Fødselsdagspåminnnelser";
+$a->strings["Birthdays this week:"] = "Fødselsdager denne uken:";
+$a->strings["[No description]"] = "[Ingen beskrivelse]";
+$a->strings["Event Reminders"] = "Hendelsespåminnelser";
+$a->strings["Events this week:"] = "Hendelser denne uken:";
+$a->strings["Profile"] = "Profil";
+$a->strings["Full Name:"] = "Fullt navn:";
+$a->strings["Like this channel"] = "Lik denne kanalen";
+$a->strings["__ctx:noun__ Like"] = array(
+	0 => "Liker",
+	1 => "Liker",
+);
+$a->strings["j F, Y"] = "j F, Y";
+$a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Fødselsdag:";
+$a->strings["Age:"] = "Alder:";
+$a->strings["for %1\$d %2\$s"] = "for %1\$d %2\$s";
+$a->strings["Sexual Preference:"] = "Seksuell preferanse:";
+$a->strings["Hometown:"] = "Hjemby:";
+$a->strings["Tags:"] = "Merkelapper:";
+$a->strings["Political Views:"] = "Politiske synspunkter:";
+$a->strings["Religion:"] = "Religion:";
+$a->strings["About:"] = "Om:";
+$a->strings["Hobbies/Interests:"] = "Hobbyer/interesser:";
+$a->strings["Likes:"] = "Liker:";
+$a->strings["Dislikes:"] = "Misliker:";
+$a->strings["Contact information and Social Networks:"] = "Kontaktinformasjon og sosiale nettverk:";
+$a->strings["My other channels:"] = "Mine andre kanaler:";
+$a->strings["Musical interests:"] = "Musikkinteresse:";
+$a->strings["Books, literature:"] = "Bøker, litteratur:";
+$a->strings["Television:"] = "TV:";
+$a->strings["Film/dance/culture/entertainment:"] = "Film/dans/kultur/underholdning:";
+$a->strings["Love/Romance:"] = "Kjærlighet/romantikk:";
+$a->strings["Work/employment:"] = "Arbeid/sysselsetting:";
+$a->strings["School/education:"] = "Skole/utdannelse:";
+$a->strings["Like this thing"] = "Lik denne tingen";
+$a->strings["Tags"] = "Merkelapper";
+$a->strings["Categories"] = "Kategorier";
+$a->strings["Keywords"] = "Nøkkelord";
+$a->strings["have"] = "har";
+$a->strings["has"] = "har";
+$a->strings["want"] = "ønsker";
+$a->strings["wants"] = "ønsker";
+$a->strings["like"] = "liker";
+$a->strings["likes"] = "liker";
+$a->strings["dislike"] = "misliker";
+$a->strings["dislikes"] = "misliker";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "Bilde overstiger nettstedets størrelsesbegrensning på %lu bytes";
+$a->strings["Image file is empty."] = "Bildefilen er tom.";
+$a->strings["Unable to process image"] = "Kan ikke behandle bildet";
+$a->strings["Photo storage failed."] = "Bildelagring mislyktes.";
+$a->strings["a new photo"] = "et nytt bilde";
+$a->strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s la inn %2\$s til %3\$s";
+$a->strings["Photo Albums"] = "Fotoalbum";
+$a->strings["Upload New Photos"] = "Last opp nye bilder";
+$a->strings["Visible to your default audience"] = "Synlig for ditt standard publikum";
+$a->strings["Show"] = "Vis";
+$a->strings["Don't show"] = "Ikke vis";
+$a->strings["Other networks and post services"] = "Andre nettverk og innleggstjenester";
+$a->strings["Permissions"] = "Tillatelser";
+$a->strings["Close"] = "Lukk";
 $a->strings[" and "] = "og";
 $a->strings["public profile"] = "offentlig profil";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s endret %2\$s til &ldquo;%3\$s&rdquo;";
 $a->strings["Visit %1\$s's %2\$s"] = "Besøk %1\$s sitt %2\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s har oppdatert %2\$s, endret %3\$s.";
-$a->strings["Connect"] = "Koble";
-$a->strings["New window"] = "Nytt vindu";
-$a->strings["Open the selected location in a different window or browser tab"] = "Ã…pne det valgte stedet i et annet vindu eller nettleser-fane";
-$a->strings["User '%s' deleted"] = "Brukeren '%s' er slettet";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "Kan ikke finne DNS-informasjon om databasetjener '%s'";
-$a->strings["photo"] = "foto";
-$a->strings["event"] = "hendelse";
+$a->strings["Item was not found."] = "Elementet ble ikke funnet.";
+$a->strings["No source file."] = "Ingen kildefil.";
+$a->strings["Cannot locate file to replace"] = "Kan ikke finne filen som skal byttes ut";
+$a->strings["Cannot locate file to revise/update"] = "Finner ikke filen som skal revideres/oppdateres";
+$a->strings["File exceeds size limit of %d"] = "Filens størrelse overgår grensen på %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Du har nådd din lagringsgrense for vedlegg på %1$.0f Mbytes.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Mislyktes med å laste opp filen. Mulig systemgrense eller handling avbrutt.";
+$a->strings["Stored file could not be verified. Upload failed."] = "Lagret fil kunne ikke bekreftes. Opplasting mislyktes.";
+$a->strings["Path not available."] = "Stien er ikke tilgjengelig.";
+$a->strings["Empty pathname"] = "Tomt sti-navn";
+$a->strings["duplicate filename or path"] = "duplikat av filnavn eller sti";
+$a->strings["Path not found."] = "Stien ble ikke funnet.";
+$a->strings["mkdir failed."] = "mkdir mislyktes.";
+$a->strings["database storage failed."] = "databaselagring mislyktes.";
+$a->strings["Empty path"] = "Tom sti";
+$a->strings["created a new post"] = "laget et nytt innlegg";
+$a->strings["commented on %s's post"] = "kommenterte på %s sitt innlegg";
+$a->strings["Apps"] = "Apper";
+$a->strings["System"] = "System";
+$a->strings["Personal"] = "Personlig";
+$a->strings["Create Personal App"] = "Lag personlig app";
+$a->strings["Edit Personal App"] = "Endre personlig app";
+$a->strings["Ignore/Hide"] = "Ignorer/Skjul";
+$a->strings["Suggestions"] = "Forslag";
+$a->strings["See more..."] = "Se mer...";
+$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du har %1$.0f av %2$.0f tillate forbindelser.";
+$a->strings["Add New Connection"] = "Legg til ny forbindelse";
+$a->strings["Enter the channel address"] = "Skriv kanal-adressen";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Eksempel: ola.nordmann@eksempel.no, http://eksempel.no/karinordmann";
+$a->strings["Notes"] = "Merknader";
+$a->strings["Remove term"] = "Fjern begrep";
+$a->strings["Saved Searches"] = "Lagrede søk";
+$a->strings["add"] = "legg til";
+$a->strings["Saved Folders"] = "Lagrede mapper";
+$a->strings["Everything"] = "Alt";
+$a->strings["Archives"] = "Arkiv";
+$a->strings["Me"] = "Meg";
+$a->strings["Family"] = "Familie";
+$a->strings["Acquaintances"] = "Bekjente";
+$a->strings["All"] = "Alle";
+$a->strings["Refresh"] = "Forny";
+$a->strings["Account settings"] = "Kontoinnstillinger";
+$a->strings["Channel settings"] = "Kanalinnstillinger";
+$a->strings["Additional features"] = "Tilleggsfunksjoner";
+$a->strings["Feature/Addon settings"] = "Funksjons-/Tilleggsinnstillinger";
+$a->strings["Display settings"] = "Visningsinnstillinger";
+$a->strings["Connected apps"] = "Tilkoblede app-er";
+$a->strings["Export channel"] = "Eksporter kanal";
+$a->strings["Connection Default Permissions"] = "Forbindelsens standard tillatelser";
+$a->strings["Premium Channel Settings"] = "Premiumkanal-innstillinger";
+$a->strings["Channel Sources"] = "Kanalkilder";
+$a->strings["Settings"] = "Innstillinger";
+$a->strings["Private Mail Menu"] = "Meny for privat post";
+$a->strings["Combined View"] = "Kombinert visning";
+$a->strings["Inbox"] = "Innboks";
+$a->strings["Outbox"] = "Utboks";
+$a->strings["New Message"] = "Ny melding";
+$a->strings["Conversations"] = "Samtaler";
+$a->strings["Received Messages"] = "Mottatte meldinger";
+$a->strings["Sent Messages"] = "Sendte meldinger";
+$a->strings["No messages."] = "Ingen meldinger.";
+$a->strings["Delete conversation"] = "Slett samtale";
+$a->strings["Events Menu"] = "Meny for hendelser";
+$a->strings["Day View"] = "Dag";
+$a->strings["Week View"] = "Uke";
+$a->strings["Month View"] = "MÃ¥ned";
+$a->strings["Export"] = "Eksport";
+$a->strings["Import"] = "Importer";
+$a->strings["Events Tools"] = "Kalenderverktøy";
+$a->strings["Export Calendar"] = "Eksporter kalender";
+$a->strings["Import Calendar"] = "Importer kalender";
+$a->strings["Chat Rooms"] = "Chatrom";
+$a->strings["Bookmarked Chatrooms"] = "Bokmerkede chatrom";
+$a->strings["Suggested Chatrooms"] = "Foreslåtte chatrom";
+$a->strings["photo/image"] = "foto/bilde";
+$a->strings["Rate Me"] = "Vurder meg";
+$a->strings["View Ratings"] = "Vis vurderinger";
+$a->strings["Public Hubs"] = "Offentlige huber";
+$a->strings["Forums"] = "Forum";
+$a->strings["Tasks"] = "Oppgaver";
+$a->strings["Documentation"] = "Dokumentasjon";
+$a->strings["Project/Site Information"] = "Prosjekt-/Nettstedsinformasjon";
+$a->strings["For Members"] = "For medlemmer";
+$a->strings["For Administrators"] = "For administratorer";
+$a->strings["For Developers"] = "For utviklere";
+$a->strings["Site"] = "Nettsted";
+$a->strings["Accounts"] = "Kontoer";
+$a->strings["Channels"] = "Kanaler";
+$a->strings["Plugins"] = "Tilleggsfunksjoner";
+$a->strings["Themes"] = "Temaer";
+$a->strings["Inspect queue"] = "Inspiser kø";
+$a->strings["Profile Config"] = "Profilinnstillinger";
+$a->strings["DB updates"] = "Databaseoppdateringer";
+$a->strings["Logs"] = "Logger";
+$a->strings["Admin"] = "Administrator";
+$a->strings["Plugin Features"] = "Tilleggsfunksjoner";
+$a->strings["User registrations waiting for confirmation"] = "Brukerregistreringer som venter på bekreftelse";
+$a->strings["View Photo"] = "Vis foto";
+$a->strings["Edit Album"] = "Endre album";
+$a->strings["Attachments:"] = "Vedlegg:";
+$a->strings["\$Projectname event notification:"] = "\$Projectname hendelsesvarsling:";
+$a->strings["%1\$s's bookmarks"] = "%1\$s sine bokmerker";
+$a->strings["General Features"] = "Generelle funksjoner";
+$a->strings["Content Expiration"] = "Innholdet utløper";
+$a->strings["Remove posts/comments and/or private messages at a future time"] = "Fjern innlegg/kommentarer og/eller private meldinger på et angitt tidspunkt i fremtiden";
+$a->strings["Multiple Profiles"] = "Flere profiler";
+$a->strings["Ability to create multiple profiles"] = "Mulig å lage flere profiler";
+$a->strings["Advanced Profiles"] = "Avanserte profiler";
+$a->strings["Additional profile sections and selections"] = "Ytterlige seksjoner og utvalg til profilen";
+$a->strings["Profile Import/Export"] = "Profil-import/-eksport";
+$a->strings["Save and load profile details across sites/channels"] = "Lagre og åpne profildetaljer på tvers av nettsteder/kanaler";
+$a->strings["Web Pages"] = "Web-sider";
+$a->strings["Provide managed web pages on your channel"] = "Tilby kontrollerte web-sider på din kanal";
+$a->strings["Private Notes"] = "Private merknader";
+$a->strings["Enables a tool to store notes and reminders"] = "Skrur på et verktøy for lagre merknader og påminnelser";
+$a->strings["Navigation Channel Select"] = "Navigasjon kanalvalg";
+$a->strings["Change channels directly from within the navigation dropdown menu"] = "Endre kanaler direkte fra navigasjonsmenyen";
+$a->strings["Photo Location"] = "Bildeplassering";
+$a->strings["If location data is available on uploaded photos, link this to a map."] = "Hvis plasseringsdata er tilgjengelige i opplastede bilder, plasser dette på et kart.";
+$a->strings["Expert Mode"] = "Ekspertmodus";
+$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Skru på Ekspertmodus for å tilby avanserte konfigurasjonsvalg";
+$a->strings["Premium Channel"] = "Premiumkanal";
+$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Lar deg angi restriksjoner og betingelser for de som kobler seg til din kanal";
+$a->strings["Post Composition Features"] = "Funksjoner for å lage innlegg";
+$a->strings["Use Markdown"] = "Bruk Markdown";
+$a->strings["Allow use of \"Markdown\" to format posts"] = "Tillat bruk av \"Markdown\" til formatering av innlegg";
+$a->strings["Large Photos"] = "Store bilder";
+$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Inkluder store (1024px) småbilder i innlegg. Hvis denne ikke er påskrudd, bruk små (640px) småbilder.";
+$a->strings["Automatically import channel content from other channels or feeds"] = "Automatisk import av kanalinnhold fra andre kanaler eller strømmer";
+$a->strings["Even More Encryption"] = "Enda mer kryptering";
+$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Tillat valgfri kryptering av innhold ende-til-ende via en delt hemmelig nøkkel";
+$a->strings["Enable Voting Tools"] = "Skru på verktøy for å stemme";
+$a->strings["Provide a class of post which others can vote on"] = "Tilby en type innlegg som andre kan stemme på";
+$a->strings["Delayed Posting"] = "Tidfest publisering";
+$a->strings["Allow posts to be published at a later date"] = "Tillat innlegg å bli publisert på et senere tidspunkt";
+$a->strings["Suppress Duplicate Posts/Comments"] = "Forhindre duplikat av innlegg/kommentarer";
+$a->strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Forhindre innlegg med identisk innhold fra å bli publisert hvis det er mindre enn to minutter mellom innsendingene.";
+$a->strings["Network and Stream Filtering"] = "Nettverk- og strømfiltrering";
+$a->strings["Search by Date"] = "Søk etter dato";
+$a->strings["Ability to select posts by date ranges"] = "Mulighet for å velge innlegg etter datoområde";
+$a->strings["Collections Filter"] = "Filter for samlinger";
+$a->strings["Enable widget to display Network posts only from selected collections"] = "Skru på miniprogram for å vise Nettverksinnlegg bare fra valgte samlinger";
+$a->strings["Save search terms for re-use"] = "Lagre søkeuttrykk for senere bruk";
+$a->strings["Network Personal Tab"] = "Nettverk personlig fane";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Skru på fane for å bare vise Nettverksinnlegg som du har deltatt i";
+$a->strings["Network New Tab"] = "Nettverk Ny fane";
+$a->strings["Enable tab to display all new Network activity"] = "Skru på fane for å vise all ny nettverksaktivitet";
+$a->strings["Affinity Tool"] = "Nærhetsverktøy";
+$a->strings["Filter stream activity by depth of relationships"] = "Filtrer strømaktiviteten etter releasjonsdybde";
+$a->strings["Connection Filtering"] = "Filtrer forbindelser";
+$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtrer innkommende innlegg fra forbindelser basert på nøkkelord/innhold";
+$a->strings["Suggest Channels"] = "Foreslå kanaler";
+$a->strings["Show channel suggestions"] = "Vis kanalforslag";
+$a->strings["Post/Comment Tools"] = "Innlegg-/Kommentar-verktøy";
+$a->strings["Tagging"] = "Merking";
+$a->strings["Ability to tag existing posts"] = "Mulighet til å merke eksisterende meldinger";
+$a->strings["Post Categories"] = "Innleggskategorier";
+$a->strings["Add categories to your posts"] = "Legg kategorier til dine innlegg";
+$a->strings["Ability to file posts under folders"] = "Mulighet til å sortere innlegg i mapper";
+$a->strings["Dislike Posts"] = "Mislik innlegg";
+$a->strings["Ability to dislike posts/comments"] = "Mulighet til å mislike innlegg/kommentarer";
+$a->strings["Star Posts"] = "Stjerneinnlegg";
+$a->strings["Ability to mark special posts with a star indicator"] = "Mulighet til å merke spesielle innlegg med en stjerne";
+$a->strings["Tag Cloud"] = "Merkelappsky";
+$a->strings["Provide a personal tag cloud on your channel page"] = "Tilby en personlig merkelappsky på din kanalside";
+$a->strings["Male"] = "Mannlig";
+$a->strings["Female"] = "Kvinnelig";
+$a->strings["Currently Male"] = "For tiden mann";
+$a->strings["Currently Female"] = "For tiden kvinne";
+$a->strings["Mostly Male"] = "For det meste mann";
+$a->strings["Mostly Female"] = "For det meste kvinne";
+$a->strings["Transgender"] = "Transkjønnet";
+$a->strings["Intersex"] = "interkjønnet";
+$a->strings["Transsexual"] = "Transseksuell";
+$a->strings["Hermaphrodite"] = "Hermafroditt";
+$a->strings["Neuter"] = "Intetkjønn";
+$a->strings["Non-specific"] = "Ubestemt";
+$a->strings["Other"] = "Annen";
+$a->strings["Undecided"] = "Ubestemt";
+$a->strings["Males"] = "Menn";
+$a->strings["Females"] = "Kvinner";
+$a->strings["Gay"] = "Homo";
+$a->strings["Lesbian"] = "Lesbisk";
+$a->strings["No Preference"] = "Ingen preferanse";
+$a->strings["Bisexual"] = "Biseksuell";
+$a->strings["Autosexual"] = "Autoseksuell";
+$a->strings["Abstinent"] = "Avholdende";
+$a->strings["Virgin"] = "Jomfru";
+$a->strings["Deviant"] = "Avviker";
+$a->strings["Fetish"] = "Fetisj";
+$a->strings["Oodles"] = "Masse";
+$a->strings["Nonsexual"] = "Ikke-seksuell";
+$a->strings["Single"] = "Enslig";
+$a->strings["Lonely"] = "Ensom";
+$a->strings["Available"] = "Tilgjengelig";
+$a->strings["Unavailable"] = "Ikke tilgjengelig";
+$a->strings["Has crush"] = "Er forelsket";
+$a->strings["Infatuated"] = "Betatt";
+$a->strings["Dating"] = "Sammen med";
+$a->strings["Unfaithful"] = "Utro";
+$a->strings["Sex Addict"] = "Sexavhengig";
+$a->strings["Friends/Benefits"] = "Venner med frynsegoder";
+$a->strings["Casual"] = "Tilfeldig";
+$a->strings["Engaged"] = "Forlovet";
+$a->strings["Married"] = "Gift";
+$a->strings["Imaginarily married"] = "Gift i fantasien";
+$a->strings["Partners"] = "Partnere";
+$a->strings["Cohabiting"] = "Samboer";
+$a->strings["Common law"] = "Samboer";
+$a->strings["Happy"] = "Lykkelig";
+$a->strings["Not looking"] = "Ikke på utkikk";
+$a->strings["Swinger"] = "Partnerbytte";
+$a->strings["Betrayed"] = "Bedratt";
+$a->strings["Separated"] = "Separert";
+$a->strings["Unstable"] = "Ustabilt";
+$a->strings["Divorced"] = "Skilt";
+$a->strings["Imaginarily divorced"] = "Skilt i fantasien";
+$a->strings["Widowed"] = "Enke";
+$a->strings["Uncertain"] = "Usikkert";
+$a->strings["It's complicated"] = "Det er komplisert";
+$a->strings["Don't care"] = "Bryr meg ikke";
+$a->strings["Ask me"] = "Spør meg";
+$a->strings["Miscellaneous"] = "Forskjellig";
+$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD eller MM-DD";
+$a->strings["Required"] = "PÃ¥krevd";
+$a->strings["never"] = "aldri";
+$a->strings["less than a second ago"] = "for mindre enn ett sekund siden";
+$a->strings["year"] = "Ã¥r";
+$a->strings["years"] = "Ã¥r";
+$a->strings["month"] = "måned";
+$a->strings["months"] = "måneder";
+$a->strings["week"] = "uke";
+$a->strings["weeks"] = "uker";
+$a->strings["day"] = "dag";
+$a->strings["days"] = "dager";
+$a->strings["hour"] = "time";
+$a->strings["hours"] = "timer";
+$a->strings["minute"] = "minutt";
+$a->strings["minutes"] = "minutter";
+$a->strings["second"] = "sekund";
+$a->strings["seconds"] = "sekunder";
+$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s siden";
+$a->strings["%1\$s's birthday"] = "%1\$s sin fødselsdag";
+$a->strings["Happy Birthday %1\$s"] = "Gratulerer med dagen, %1\$s !";
+$a->strings["Public Timeline"] = "Offentlig tidslinje";
 $a->strings["channel"] = "kanal";
-$a->strings["status"] = "status";
-$a->strings["comment"] = "kommentar";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s liker %2\$s sin %3\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s liker ikke %2\$s sin %3\$s";
 $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s er nå forbundet med %2\$s";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s prikket %2\$s";
-$a->strings["poked"] = "prikket";
 $a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s er %2\$s";
 $a->strings["__ctx:title__ Likes"] = "Liker";
 $a->strings["__ctx:title__ Dislikes"] = "Liker ikke";
@@ -295,6 +591,7 @@ $a->strings["Loading..."] = "Laster...";
 $a->strings["Delete Selected Items"] = "Slett valgte elementer";
 $a->strings["View Source"] = "Vis kilde";
 $a->strings["Follow Thread"] = "Følg tråd";
+$a->strings["Unfollow Thread"] = "Ikke følg tråd";
 $a->strings["View Status"] = "Vis status";
 $a->strings["View Profile"] = "Vis profil";
 $a->strings["View Photos"] = "Vis bilder";
@@ -358,6 +655,7 @@ $a->strings["permissions"] = "tillatelser";
 $a->strings["Public post"] = "Offentlig innlegg";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Eksempel: ola@eksempel.no, kari@eksempel.no";
 $a->strings["Set expiration date"] = "Angi utløpsdato";
+$a->strings["Set publish date"] = "Angi publiseringsdato";
 $a->strings["Encrypt text"] = "Krypter tekst";
 $a->strings["OK"] = "OK";
 $a->strings["Cancel"] = "Avbryt";
@@ -367,7 +665,6 @@ $a->strings["Commented Order"] = "Kommentert";
 $a->strings["Sort by Comment Date"] = "Sorter etter kommentert dato";
 $a->strings["Posted Order"] = "Lagt inn";
 $a->strings["Sort by Post Date"] = "Sorter etter innleggsdato";
-$a->strings["Personal"] = "Personlig";
 $a->strings["Posts that mention or involve you"] = "Innlegg som nevner eller involverer deg";
 $a->strings["New"] = "Nye";
 $a->strings["Activity Stream - by date"] = "Aktivitetsstrøm - etter dato";
@@ -380,7 +677,6 @@ $a->strings["Status Messages and Posts"] = "Statusmeldinger og -innlegg";
 $a->strings["About"] = "Om";
 $a->strings["Profile Details"] = "Profildetaljer";
 $a->strings["Photos"] = "Bilder";
-$a->strings["Photo Albums"] = "Fotoalbum";
 $a->strings["Files and Storage"] = "Filer og lagring";
 $a->strings["Chatrooms"] = "Chatrom";
 $a->strings["Bookmarks"] = "Bokmerker";
@@ -388,10 +684,6 @@ $a->strings["Saved Bookmarks"] = "Lagrede bokmerker";
 $a->strings["Webpages"] = "Websider";
 $a->strings["Manage Webpages"] = "HÃ¥ndtere websider";
 $a->strings["View all"] = "Vis alle";
-$a->strings["__ctx:noun__ Like"] = array(
-	0 => "Liker",
-	1 => "Liker",
-);
 $a->strings["__ctx:noun__ Dislike"] = array(
 	0 => "Liker ikke",
 	1 => "Liker ikke",
@@ -420,18 +712,63 @@ $a->strings["__ctx:noun__ Abstain"] = array(
 	0 => "Avstår",
 	1 => "Avstår",
 );
-$a->strings["Public Timeline"] = "Offentlig tidslinje";
-$a->strings["Image exceeds website size limit of %lu bytes"] = "Bilde overstiger nettstedets størrelsesbegrensning på %lu bytes";
-$a->strings["Image file is empty."] = "Bildefilen er tom.";
-$a->strings["Unable to process image"] = "Kan ikke behandle bildet";
-$a->strings["Photo storage failed."] = "Bildelagring mislyktes.";
-$a->strings["Upload New Photos"] = "Last opp nye bilder";
+$a->strings["Logged out."] = "Logget ut.";
+$a->strings["Failed authentication"] = "Mislykket autentisering";
+$a->strings["Login failed."] = "Innlogging mislyktes.";
+$a->strings["Frequently"] = "Ofte";
+$a->strings["Hourly"] = "Hver time";
+$a->strings["Twice daily"] = "To ganger daglig";
+$a->strings["Daily"] = "Daglig";
+$a->strings["Weekly"] = "Ukentlig";
+$a->strings["Monthly"] = "MÃ¥nedlig";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Email"] = "E-post";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
+$a->strings["Image/photo"] = "Bilde/fotografi";
+$a->strings["Encrypted content"] = "Kryptert innhold";
+$a->strings["Install %s element: "] = "Installer %s element:";
+$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dette innlegget inneholder det installerbare elementet %s, men du mangler tillatelse til å installere det på dette nettstedet.";
+$a->strings["webpage"] = "nettside";
+$a->strings["layout"] = "layout";
+$a->strings["block"] = "byggekloss";
+$a->strings["menu"] = "meny";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s skrev følgende %2\$s %3\$s";
+$a->strings["post"] = "innlegg";
+$a->strings["Different viewers will see this text differently"] = "Denne teksten vil se forskjellig ut for ulike besøkende";
+$a->strings["$1 spoiler"] = "$1 avsløring";
+$a->strings["$1 wrote:"] = "$1 skrev:";
+$a->strings["%d invitation available"] = array(
+	0 => "%d invitasjon tilgjengelig",
+	1 => "%d invitasjoner tilgjengelig",
+);
+$a->strings["Advanced"] = "Avansert";
+$a->strings["Find Channels"] = "Finn kanaler";
+$a->strings["Enter name or interest"] = "Skriv navn eller interesse";
+$a->strings["Connect/Follow"] = "Forbindelse/Følg";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Eksempler: Ola Nordmann, fisking";
+$a->strings["Find"] = "Finn";
+$a->strings["Channel Suggestions"] = "Kanalforslag";
+$a->strings["Random Profile"] = "Tilfeldig profil";
+$a->strings["Invite Friends"] = "Inviter venner";
+$a->strings["Advanced example: name=fred and country=iceland"] = "Avansert eksempel: navn=fred og land=island";
+$a->strings["%d connection in common"] = array(
+	0 => "%d forbindelse felles",
+	1 => "%d forbindelser felles",
+);
+$a->strings["show more"] = "vis mer";
 $a->strings["\$Projectname Notification"] = "\$Projectname varsling";
 $a->strings["\$projectname"] = "\$projectname";
 $a->strings["Thank You,"] = "Tusen takk,";
 $a->strings["%s Administrator"] = "%s administrator";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Red:Notify] New mail received at %s"] = "[Red:Notify] Ny melding mottatt hos %s";
+$a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Notify] Ny melding mottatt hos %s";
 $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s sendte deg en ny privat melding på %3\$s.";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s sendte deg %2\$s.";
 $a->strings["a private message"] = "en privat melding";
@@ -439,263 +776,33 @@ $a->strings["Please visit %s to view and/or reply to your private messages."] =
 $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s kommenterte på [zrl=%3\$s]a %4\$s[/zrl]";
 $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s kommenterte på [zrl=%3\$s]%4\$s's %5\$s[/zrl]";
 $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s kommenterte på [zrl=%3\$s]din %4\$s[/zrl]";
-$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Notify] Kommentar til samtale #%1\$d av %2\$s";
+$a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Notify] Kommentar til samtale #%1\$d av %2\$s";
 $a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s kommenterte på et element eller en samtale du følger";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Vennligst besøk %s for å se og/eller svare i samtalen";
-$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Notify] %s skrev et innlegg på din profilvegg";
+$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Notify] %s skrev et innlegg på din profilvegg";
 $a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s skrev et innlegg på din profilvegg på %3\$s";
 $a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s skrev et innlegg på [zrl=%3\$s]din vegg[/zrl]";
-$a->strings["[Red:Notify] %s tagged you"] = "[Red:Notify] %s merket deg";
+$a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Notify] %s merket deg";
 $a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s merket deg på %3\$s";
 $a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]merket deg[/zrl].";
-$a->strings["[Red:Notify] %1\$s poked you"] = "[Red:Notify] %1\$s prikket deg";
+$a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Notify] %1\$s prikket deg";
 $a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s dyttet deg på %3\$s";
 $a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]dyttet deg[/zrl].";
-$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Notify] %s merket ditt innlegg";
+$a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Notify] %s merket ditt innlegg";
 $a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s merket ditt innlegg på %3\$s";
 $a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s merket [zrl=%3\$s]ditt innlegg[/zrl]";
-$a->strings["[Red:Notify] Introduction received"] = "[Red:Notify] Introduksjon mottatt";
+$a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Notify] Introduksjon mottatt";
 $a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, du har mottatt en ny forespørsel om forbindelse fra '%2\$s' hos %3\$s";
 $a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, du mottok [zrl=%2\$s]en ny forespørsel om forbindelse[/zrl] fra %3\$s.";
 $a->strings["You may visit their profile at %s"] = "Du kan besøke profilen deres på %s";
 $a->strings["Please visit %s to approve or reject the connection request."] = "Vennligst besøk %s for å godkjenne eller avslå forespørselen om forbindelse.";
-$a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Notify] Venneforslag mottatt";
+$a->strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Notify] Venneforslag mottatt";
 $a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, du har mottatt en venneforespørsel fra '%2\$s' hos %3\$s";
 $a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, du har mottatt [zrl=%2\$s]et venneforslaget[/zrl] angående %3\$s fra %4\$s. ";
 $a->strings["Name:"] = "Navn:";
 $a->strings["Photo:"] = "Bilde:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Vennligst besøk %s for å godkjenne eller avslå dette forslaget.";
-$a->strings["[Red:Notify]"] = "[Red:Notify]";
-$a->strings["view full size"] = "vis full størrelse";
-$a->strings["Administrator"] = "Administrator";
-$a->strings["No Subject"] = "Uten emne";
-$a->strings["%1\$s's bookmarks"] = "%1\$s sine bokmerker";
-$a->strings["prev"] = "forrige";
-$a->strings["first"] = "første";
-$a->strings["last"] = "siste";
-$a->strings["next"] = "neste";
-$a->strings["older"] = "eldre";
-$a->strings["newer"] = "nyere";
-$a->strings["No connections"] = "Ingen forbindelser";
-$a->strings["%d Connection"] = array(
-	0 => "%d forbindelse",
-	1 => "%d forbindelser",
-);
-$a->strings["View Connections"] = "Vis forbindelser";
-$a->strings["Search"] = "Søk";
-$a->strings["Save"] = "Lagre";
-$a->strings["poke"] = "prikk";
-$a->strings["ping"] = "varsle";
-$a->strings["pinged"] = "varslet";
-$a->strings["prod"] = "oppildne";
-$a->strings["prodded"] = "oppildnet";
-$a->strings["slap"] = "daske";
-$a->strings["slapped"] = "dasket";
-$a->strings["finger"] = "fingre";
-$a->strings["fingered"] = "fingret";
-$a->strings["rebuff"] = "tilbakevise";
-$a->strings["rebuffed"] = "tilbakeviste";
-$a->strings["happy"] = "glad";
-$a->strings["sad"] = "trist";
-$a->strings["mellow"] = "dempet";
-$a->strings["tired"] = "trøtt";
-$a->strings["perky"] = "oppkvikket";
-$a->strings["angry"] = "sint";
-$a->strings["stupified"] = "sløvet";
-$a->strings["puzzled"] = "forundret";
-$a->strings["interested"] = "interessert";
-$a->strings["bitter"] = "bitter";
-$a->strings["cheerful"] = "munter";
-$a->strings["alive"] = "levende";
-$a->strings["annoyed"] = "irritert";
-$a->strings["anxious"] = "nervøs";
-$a->strings["cranky"] = "gretten";
-$a->strings["disturbed"] = "foruroliget";
-$a->strings["frustrated"] = "frustrert";
-$a->strings["depressed"] = "lei seg";
-$a->strings["motivated"] = "motivert";
-$a->strings["relaxed"] = "avslappet";
-$a->strings["surprised"] = "overrasket";
-$a->strings["May"] = "mai";
-$a->strings["unknown.???"] = "ukjent.???";
-$a->strings["bytes"] = "bytes";
-$a->strings["remove category"] = "fjern kategori";
-$a->strings["remove from file"] = "fjern fra fil";
-$a->strings["Click to open/close"] = "Klikk for å åpne/lukke";
-$a->strings["Link to Source"] = "Lenke til kilde";
-$a->strings["default"] = "standard";
-$a->strings["Page layout"] = "Sidens layout";
-$a->strings["You can create your own with the layouts tool"] = "Du kan lage din egen med layout-verktøyet";
-$a->strings["Page content type"] = "Sidens innholdstype";
-$a->strings["Select an alternate language"] = "Velg et annet språk";
-$a->strings["activity"] = "aktivitet";
-$a->strings["Design Tools"] = "Designverktøy";
-$a->strings["Blocks"] = "Byggeklosser";
-$a->strings["Menus"] = "Menyer";
-$a->strings["Layouts"] = "Layout";
-$a->strings["Pages"] = "Sider";
-$a->strings["Visible to your default audience"] = "Synlig for ditt standard publikum";
-$a->strings["Show"] = "Vis";
-$a->strings["Don't show"] = "Ikke vis";
-$a->strings["Permissions"] = "Tillatelser";
-$a->strings["Close"] = "Lukk";
-$a->strings["Item was not found."] = "Elementet ble ikke funnet.";
-$a->strings["No source file."] = "Ingen kildefil.";
-$a->strings["Cannot locate file to replace"] = "Kan ikke finne filen som skal byttes ut";
-$a->strings["Cannot locate file to revise/update"] = "Finner ikke filen som skal revideres/oppdateres";
-$a->strings["File exceeds size limit of %d"] = "Filens størrelse overgår grensen på %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Du har nådd din lagringsgrense for vedlegg på %1$.0f Mbytes.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Mislyktes med å laste opp filen. Mulig systemgrense eller handling avbrutt.";
-$a->strings["Stored file could not be verified. Upload failed."] = "Lagret fil kunne ikke bekreftes. Opplasting mislyktes.";
-$a->strings["Path not available."] = "Stien er ikke tilgjengelig.";
-$a->strings["Empty pathname"] = "Tomt sti-navn";
-$a->strings["duplicate filename or path"] = "duplikat av filnavn eller sti";
-$a->strings["Path not found."] = "Stien ble ikke funnet.";
-$a->strings["mkdir failed."] = "mkdir mislyktes.";
-$a->strings["database storage failed."] = "databaselagring mislyktes.";
-$a->strings["Empty path"] = "Tom sti";
-$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan ikke lage en kopi av kanal-identifikatoren på dette systemet. Import mislyktes.";
-$a->strings["Channel clone failed. Import failed."] = "Kanalkloning mislyktes. Import mislyktes.";
-$a->strings["Cloned channel not found. Import failed."] = "Klonet kanal ble ikke funnet. Import mislyktes.";
-$a->strings["created a new post"] = "laget et nytt innlegg";
-$a->strings["commented on %s's post"] = "kommenterte på %s sitt innlegg";
-$a->strings["New Page"] = "Ny side";
-$a->strings["View"] = "Vis";
-$a->strings["Actions"] = "Handlinger";
-$a->strings["Page Link"] = "Sidelenke";
-$a->strings["Title"] = "Tittel";
-$a->strings["Created"] = "Laget";
-$a->strings["Edited"] = "Endret";
-$a->strings["Profile Photos"] = "Profilbilder";
-$a->strings["Male"] = "Mannlig";
-$a->strings["Female"] = "Kvinnelig";
-$a->strings["Currently Male"] = "For tiden mann";
-$a->strings["Currently Female"] = "For tiden kvinne";
-$a->strings["Mostly Male"] = "For det meste mann";
-$a->strings["Mostly Female"] = "For det meste kvinne";
-$a->strings["Transgender"] = "Transkjønnet";
-$a->strings["Intersex"] = "interkjønnet";
-$a->strings["Transsexual"] = "Transseksuell";
-$a->strings["Hermaphrodite"] = "Hermafroditt";
-$a->strings["Neuter"] = "Intetkjønn";
-$a->strings["Non-specific"] = "Ubestemt";
-$a->strings["Undecided"] = "Ubestemt";
-$a->strings["Males"] = "Menn";
-$a->strings["Females"] = "Kvinner";
-$a->strings["Gay"] = "Homo";
-$a->strings["Lesbian"] = "Lesbisk";
-$a->strings["No Preference"] = "Ingen preferanse";
-$a->strings["Bisexual"] = "Biseksuell";
-$a->strings["Autosexual"] = "Autoseksuell";
-$a->strings["Abstinent"] = "Avholdende";
-$a->strings["Virgin"] = "Jomfru";
-$a->strings["Deviant"] = "Avviker";
-$a->strings["Fetish"] = "Fetisj";
-$a->strings["Oodles"] = "Masse";
-$a->strings["Nonsexual"] = "Ikke-seksuell";
-$a->strings["Single"] = "Enslig";
-$a->strings["Lonely"] = "Ensom";
-$a->strings["Available"] = "Tilgjengelig";
-$a->strings["Unavailable"] = "Ikke tilgjengelig";
-$a->strings["Has crush"] = "Er forelsket";
-$a->strings["Infatuated"] = "Betatt";
-$a->strings["Dating"] = "Sammen med";
-$a->strings["Unfaithful"] = "Utro";
-$a->strings["Sex Addict"] = "Sexavhengig";
-$a->strings["Friends"] = "Venner";
-$a->strings["Friends/Benefits"] = "Venner med frynsegoder";
-$a->strings["Casual"] = "Tilfeldig";
-$a->strings["Engaged"] = "Forlovet";
-$a->strings["Married"] = "Gift";
-$a->strings["Imaginarily married"] = "Gift i fantasien";
-$a->strings["Partners"] = "Partnere";
-$a->strings["Cohabiting"] = "Samboer";
-$a->strings["Common law"] = "Samboer";
-$a->strings["Happy"] = "Lykkelig";
-$a->strings["Not looking"] = "Ikke på utkikk";
-$a->strings["Swinger"] = "Partnerbytte";
-$a->strings["Betrayed"] = "Bedratt";
-$a->strings["Separated"] = "Separert";
-$a->strings["Unstable"] = "Ustabilt";
-$a->strings["Divorced"] = "Skilt";
-$a->strings["Imaginarily divorced"] = "Skilt i fantasien";
-$a->strings["Widowed"] = "Enke";
-$a->strings["Uncertain"] = "Usikkert";
-$a->strings["It's complicated"] = "Det er komplisert";
-$a->strings["Don't care"] = "Bryr meg ikke";
-$a->strings["Ask me"] = "Spør meg";
-$a->strings["Embedded content"] = "Innebygget innhold";
-$a->strings["Embedding disabled"] = "Innbygging avskrudd";
-$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
-$a->strings["Starts:"] = "Starter:";
-$a->strings["Finishes:"] = "Slutter:";
-$a->strings["Location:"] = "Plassering:";
-$a->strings["This event has been added to your calendar."] = "Denne hendelsen er lagt til i din kalender.";
-$a->strings["Not specified"] = "Ikke spesifisert";
-$a->strings["Needs Action"] = "Trenger handling";
-$a->strings["Completed"] = "Ferdig";
-$a->strings["In Process"] = "Igang";
-$a->strings["Cancelled"] = "Avbrutt";
-$a->strings["Site Admin"] = "Nettstedsadministrator";
-$a->strings["Address Book"] = "Adressebok";
-$a->strings["Login"] = "Logg inn";
-$a->strings["Channel Manager"] = "Kanalstyring";
-$a->strings["Matrix"] = "Matrix";
-$a->strings["Settings"] = "Innstillinger";
-$a->strings["Channel Home"] = "Kanalhjem";
-$a->strings["Profile"] = "Profil";
-$a->strings["Events"] = "Hendelser";
-$a->strings["Directory"] = "Katalog";
-$a->strings["Help"] = "Hjelp";
-$a->strings["Mail"] = "Melding";
-$a->strings["Mood"] = "Stemning";
-$a->strings["Chat"] = "Chat";
-$a->strings["Probe"] = "Undersøk";
-$a->strings["Suggest"] = "Forreslå";
-$a->strings["Random Channel"] = "Tilfeldig kanal";
-$a->strings["Invite"] = "Inviter";
-$a->strings["Features"] = "Funksjoner";
-$a->strings["Language"] = "Språk";
-$a->strings["Post"] = "Innlegg";
-$a->strings["Profile Photo"] = "Profilbilde";
-$a->strings["Update"] = "Oppdater";
-$a->strings["Install"] = "Installer";
-$a->strings["Purchase"] = "Kjøp";
-$a->strings["Logged out."] = "Logget ut.";
-$a->strings["Failed authentication"] = "Mislykket autentisering";
-$a->strings["Login failed."] = "Innlogging mislyktes.";
-$a->strings["Attachments:"] = "Vedlegg:";
-$a->strings["\$Projectname event notification:"] = "\$Projectname hendelsesvarsling:";
-$a->strings["Image/photo"] = "Bilde/fotografi";
-$a->strings["Encrypted content"] = "Kryptert innhold";
-$a->strings["Install %s element: "] = "Installer %s element:";
-$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dette innlegget inneholder det installerbare elementet %s, men du mangler tillatelse til å installere det på dette nettstedet.";
-$a->strings["webpage"] = "nettside";
-$a->strings["layout"] = "layout";
-$a->strings["block"] = "byggekloss";
-$a->strings["menu"] = "meny";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s skrev følgende %2\$s %3\$s";
-$a->strings["post"] = "innlegg";
-$a->strings["Different viewers will see this text differently"] = "Denne teksten vil se forskjellig ut for ulike besøkende";
-$a->strings["$1 spoiler"] = "$1 avsløring";
-$a->strings["$1 wrote:"] = "$1 skrev:";
-$a->strings["Not a valid email address"] = "Ikke en gyldig e-postadresse";
-$a->strings["Your email domain is not among those allowed on this site"] = "Ditt e-postdomene er ikke blant de som er tillatt på dette stedet";
-$a->strings["Your email address is already registered at this site."] = "Din e-postadresse er allerede registrert på dette nettstedet.";
-$a->strings["An invitation is required."] = "En invitasjon er påkrevd.";
-$a->strings["Invitation could not be verified."] = "Invitasjon kunne ikke bekreftes.";
-$a->strings["Please enter the required information."] = "Vennligst skriv inn nødvendig informasjon.";
-$a->strings["Failed to store account information."] = "Mislyktes med å lagre kontoinformasjon.";
-$a->strings["Registration confirmation for %s"] = "Registreringsbekreftelse for %s";
-$a->strings["Registration request at %s"] = "Registreringsforespørsel hos %s";
-$a->strings["your registration password"] = "ditt registreringspassord";
-$a->strings["Registration details for %s"] = "Registreringsdetaljer for %s";
-$a->strings["Account approved."] = "Konto godkjent.";
-$a->strings["Registration revoked for %s"] = "Registrering trukket tilbake for %s";
-$a->strings["Account verified. Please login."] = "Konto bekreftet. Vennligst logg inn.";
-$a->strings["Click here to upgrade."] = "Klikk her for å oppgradere.";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Denne handlingen går utenfor grensene satt i din abonnementsplan.";
-$a->strings["This action is not available under your subscription plan."] = "Denne handlingen er ikke tilgjengelig i din abonnementsplan.";
+$a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Notify]";
 $a->strings["Channel is blocked on this site."] = "Kanalen er blokkert på dette nettstedet.";
 $a->strings["Channel location missing."] = "Kanalplassering mangler.";
 $a->strings["Response from remote channel was incomplete."] = "Svaret fra den andre kanalen var ikke komplett.";
@@ -704,235 +811,12 @@ $a->strings["Protocol disabled."] = "Protokollen er avskrudd.";
 $a->strings["Channel discovery failed."] = "Kanaloppdagelse mislyktes.";
 $a->strings["local account not found."] = "lokal konto ble ikke funnet.";
 $a->strings["Cannot connect to yourself."] = "Kan ikke lage forbindelse med deg selv.";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Skjemaets sikkerhetspollett var ikke gyldig. Dette skjedde antakelig fordi skjemaet har vært åpnet for lenge (>3 timer) før det ble sendt inn.";
-$a->strings["%d invitation available"] = array(
-	0 => "%d invitasjon tilgjengelig",
-	1 => "%d invitasjoner tilgjengelig",
-);
-$a->strings["Advanced"] = "Avansert";
-$a->strings["Find Channels"] = "Finn kanaler";
-$a->strings["Enter name or interest"] = "Skriv navn eller interesse";
-$a->strings["Connect/Follow"] = "Forbindelse/Følg";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Eksempler: Ola Nordmann, fisking";
-$a->strings["Find"] = "Finn";
-$a->strings["Channel Suggestions"] = "Kanalforslag";
-$a->strings["Random Profile"] = "Tilfeldig profil";
-$a->strings["Invite Friends"] = "Inviter venner";
-$a->strings["Advanced example: name=fred and country=iceland"] = "Avansert eksempel: navn=fred og land=island";
-$a->strings["Everything"] = "Alt";
-$a->strings["Categories"] = "Kategorier";
-$a->strings["%d connection in common"] = array(
-	0 => "%d forbindelse felles",
-	1 => "%d forbindelser felles",
-);
-$a->strings["show more"] = "vis mer";
-$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "En slettet gruppe med dette navnet ble gjenopprettet. Eksisterende tillatelser for elementet <strong>kan</strong> gjelde for denne gruppen og fremtidige medlemmer. Hvis du ønsket noe annet, vennligst lag en ny gruppe med et annet navn.";
-$a->strings["Add new connections to this collection (privacy group)"] = "Legg nye forbindelser til denne samlingen (personverngruppe)";
-$a->strings["All Channels"] = "Alle kanaler";
-$a->strings["edit"] = "endre";
-$a->strings["Collections"] = "Samlinger";
-$a->strings["Edit collection"] = "Endre samling";
-$a->strings["Add new collection"] = "Legg til ny samling";
-$a->strings["Channels not in any collection"] = "Kanaler som ikke er i noen samling";
-$a->strings["add"] = "legg til";
-$a->strings["Tags"] = "Merkelapper";
-$a->strings["Keywords"] = "Nøkkelord";
-$a->strings["have"] = "har";
-$a->strings["has"] = "har";
-$a->strings["want"] = "ønsker";
-$a->strings["wants"] = "ønsker";
-$a->strings["like"] = "liker";
-$a->strings["likes"] = "liker";
-$a->strings["dislike"] = "misliker";
-$a->strings["dislikes"] = "misliker";
-$a->strings["Directory Options"] = "Kataloginnstillinger";
-$a->strings["Safe Mode"] = "Trygt modus";
-$a->strings["No"] = "Nei";
-$a->strings["Yes"] = "Ja";
-$a->strings["Public Forums Only"] = "Bare offentlige forum";
-$a->strings["This Website Only"] = "Kun dette nettstedet";
-$a->strings["Unable to obtain identity information from database"] = "Klarer ikke å få tak i identitetsinformasjon fra databasen";
-$a->strings["Empty name"] = "Mangler navn";
-$a->strings["Name too long"] = "Navnet er for langt";
-$a->strings["No account identifier"] = "Ingen kontoidentifikator";
-$a->strings["Nickname is required."] = "Kallenavn er påkrevd.";
-$a->strings["Reserved nickname. Please choose another."] = "Reservert kallenavn. Vennligst velg et annet.";
-$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Kallenavnet inneholder tegn som ikke er støttet eller det er allerede i bruk på dette nettstedet.";
-$a->strings["Unable to retrieve created identity"] = "Klarer ikke å hente den lagede identiteten";
-$a->strings["Default Profile"] = "Standardprofil";
-$a->strings["Requested channel is not available."] = "Forespurt kanal er ikke tilgjengelig.";
-$a->strings["Requested profile is not available."] = "Forespurt profil er ikke tilgjengelig.";
-$a->strings["Change profile photo"] = "Endre profilbilde";
-$a->strings["Profiles"] = "Profiler";
-$a->strings["Manage/edit profiles"] = "HÃ¥ndtere/endre profiler";
-$a->strings["Create New Profile"] = "Lag ny profil";
-$a->strings["Edit Profile"] = "Endre profil";
-$a->strings["Profile Image"] = "Profilbilde";
-$a->strings["visible to everybody"] = "synlig for alle";
-$a->strings["Edit visibility"] = "Endre synlighet";
-$a->strings["Gender:"] = "Kjønn:";
-$a->strings["Status:"] = "Status:";
-$a->strings["Homepage:"] = "Hjemmeside:";
-$a->strings["Online Now"] = "Online nå";
-$a->strings["g A l F d"] = "g A l F d";
-$a->strings["F d"] = "F d";
-$a->strings["[today]"] = "[idag]";
-$a->strings["Birthday Reminders"] = "Fødselsdagspåminnnelser";
-$a->strings["Birthdays this week:"] = "Fødselsdager denne uken:";
-$a->strings["[No description]"] = "[Ingen beskrivelse]";
-$a->strings["Event Reminders"] = "Hendelsespåminnelser";
-$a->strings["Events this week:"] = "Hendelser denne uken:";
-$a->strings["Full Name:"] = "Fullt navn:";
-$a->strings["Like this channel"] = "Lik denne kanalen";
-$a->strings["j F, Y"] = "j F, Y";
-$a->strings["j F"] = "j F";
-$a->strings["Birthday:"] = "Fødselsdag:";
-$a->strings["Age:"] = "Alder:";
-$a->strings["for %1\$d %2\$s"] = "for %1\$d %2\$s";
-$a->strings["Sexual Preference:"] = "Seksuell preferanse:";
-$a->strings["Hometown:"] = "Hjemby:";
-$a->strings["Tags:"] = "Merkelapper:";
-$a->strings["Political Views:"] = "Politiske synspunkter:";
-$a->strings["Religion:"] = "Religion:";
-$a->strings["About:"] = "Om:";
-$a->strings["Hobbies/Interests:"] = "Hobbyer/interesser:";
-$a->strings["Likes:"] = "Liker:";
-$a->strings["Dislikes:"] = "Misliker:";
-$a->strings["Contact information and Social Networks:"] = "Kontaktinformasjon og sosiale nettverk:";
-$a->strings["My other channels:"] = "Mine andre kanaler:";
-$a->strings["Musical interests:"] = "Musikkinteresse:";
-$a->strings["Books, literature:"] = "Bøker, litteratur:";
-$a->strings["Television:"] = "TV:";
-$a->strings["Film/dance/culture/entertainment:"] = "Film/dans/kultur/underholdning:";
-$a->strings["Love/Romance:"] = "Kjærlighet/romantikk:";
-$a->strings["Work/employment:"] = "Arbeid/sysselsetting:";
-$a->strings["School/education:"] = "Skole/utdannelse:";
-$a->strings["Like this thing"] = "Lik denne tingen";
+$a->strings["Embedded content"] = "Innebygget innhold";
+$a->strings["Embedding disabled"] = "Innbygging avskrudd";
 $a->strings["No recipient provided."] = "Ingen mottaker angitt.";
 $a->strings["[no subject]"] = "[ikke noe emne]";
 $a->strings["Unable to determine sender."] = "Kan ikke avgjøre avsender.";
 $a->strings["Stored post could not be verified."] = "Lagret innlegg kunne ikke bekreftes.";
-$a->strings["Save to Folder"] = "Lagre i mappe";
-$a->strings["I will attend"] = "Jeg vil delta";
-$a->strings["I will not attend"] = "Jeg deltar ikke";
-$a->strings["I might attend"] = "Jeg vil kanskje delta";
-$a->strings["I agree"] = "Jeg er enig";
-$a->strings["I disagree"] = "Jeg er uenig";
-$a->strings["I abstain"] = "Jeg avstår";
-$a->strings["Add Star"] = "Legg til stjerne";
-$a->strings["Remove Star"] = "Fjern stjerne";
-$a->strings["Toggle Star Status"] = "Skru av og på stjernestatus";
-$a->strings["starred"] = "stjernemerket";
-$a->strings["Add Tag"] = "Legg til merkelapp";
-$a->strings["I like this (toggle)"] = "Jeg liker dette (skru av og på)";
-$a->strings["I don't like this (toggle)"] = "Jeg liker ikke dette (skru av og på)";
-$a->strings["Share This"] = "Del dette";
-$a->strings["share"] = "del";
-$a->strings["%d comment"] = array(
-	0 => "%d kommentar",
-	1 => "%d kommentarer",
-);
-$a->strings["View %s's profile - %s"] = "Vis %s sin profil - %s";
-$a->strings["to"] = "til";
-$a->strings["via"] = "via";
-$a->strings["Wall-to-Wall"] = "vegg-til-vegg";
-$a->strings["via Wall-To-Wall:"] = "via vegg-til-vegg:";
-$a->strings["Delivery Report"] = "Leveringsrapport";
-$a->strings["Save Bookmarks"] = "Lagre bokmerker";
-$a->strings["Add to Calendar"] = "Legg til i kalender";
-$a->strings["Mark all seen"] = "Merk alle som sett";
-$a->strings["__ctx:noun__ Likes"] = "Liker";
-$a->strings["__ctx:noun__ Dislikes"] = "Liker ikke";
-$a->strings["This is you"] = "Dette er deg";
-$a->strings["Image"] = "Bilde";
-$a->strings["Insert Link"] = "Sett inn lenke";
-$a->strings["Video"] = "Video";
-$a->strings["Permission denied"] = "Tillatelse avvist";
-$a->strings["(Unknown)"] = "(Ukjent)";
-$a->strings["Visible to anybody on the internet."] = "Synlig for enhver på Internett.";
-$a->strings["Visible to you only."] = "Synlig bare for deg.";
-$a->strings["Visible to anybody in this network."] = "Synlig for enhver i dette nettverket.";
-$a->strings["Visible to anybody authenticated."] = "Synlig for enhver som er autentisert.";
-$a->strings["Visible to anybody on %s."] = "Synlig for alle på %s.";
-$a->strings["Visible to all connections."] = "Synlig for alle forbindelser.";
-$a->strings["Visible to approved connections."] = "Synlig for godkjente forbindelser.";
-$a->strings["Visible to specific connections."] = "Synlig for spesifikke forbindelser.";
-$a->strings["Item not found."] = "Elementet ble ikke funnet.";
-$a->strings["Collection not found."] = "Samlingen ble ikke funnet.";
-$a->strings["Collection is empty."] = "Samlingen er tom.";
-$a->strings["Collection: %s"] = "Samling: %s";
-$a->strings["Connection: %s"] = "Forbindelse: %s";
-$a->strings["Connection not found."] = "Forbindelsen ble ikke funnet.";
-$a->strings["Apps"] = "Apper";
-$a->strings["System"] = "System";
-$a->strings["Create Personal App"] = "Lag personlig app";
-$a->strings["Edit Personal App"] = "Endre personlig app";
-$a->strings["Ignore/Hide"] = "Ignorer/Skjul";
-$a->strings["Suggestions"] = "Forslag";
-$a->strings["See more..."] = "Se mer...";
-$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du har %1$.0f av %2$.0f tillate forbindelser.";
-$a->strings["Add New Connection"] = "Legg til ny forbindelse";
-$a->strings["Enter the channel address"] = "Skriv kanal-adressen";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Eksempel: ola.nordmann@eksempel.no, http://eksempel.no/karinordmann";
-$a->strings["Notes"] = "Merknader";
-$a->strings["Remove term"] = "Fjern begrep";
-$a->strings["Archives"] = "Arkiv";
-$a->strings["Me"] = "Meg";
-$a->strings["Family"] = "Familie";
-$a->strings["Acquaintances"] = "Bekjente";
-$a->strings["All"] = "Alle";
-$a->strings["Refresh"] = "Forny";
-$a->strings["Account settings"] = "Kontoinnstillinger";
-$a->strings["Channel settings"] = "Kanalinnstillinger";
-$a->strings["Additional features"] = "Tilleggsfunksjoner";
-$a->strings["Feature/Addon settings"] = "Funksjons-/Tilleggsinnstillinger";
-$a->strings["Display settings"] = "Visningsinnstillinger";
-$a->strings["Connected apps"] = "Tilkoblede app-er";
-$a->strings["Export channel"] = "Eksporter kanal";
-$a->strings["Connection Default Permissions"] = "Forbindelsens standard tillatelser";
-$a->strings["Premium Channel Settings"] = "Premiumkanal-innstillinger";
-$a->strings["Private Mail Menu"] = "Meny for privat post";
-$a->strings["Check Mail"] = "Sjekk meldinger";
-$a->strings["Combined View"] = "Kombinert visning";
-$a->strings["Inbox"] = "Innboks";
-$a->strings["Outbox"] = "Utboks";
-$a->strings["New Message"] = "Ny melding";
-$a->strings["Conversations"] = "Samtaler";
-$a->strings["Received Messages"] = "Mottatte meldinger";
-$a->strings["Sent Messages"] = "Sendte meldinger";
-$a->strings["No messages."] = "Ingen meldinger.";
-$a->strings["Delete conversation"] = "Slett samtale";
-$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
-$a->strings["Chat Rooms"] = "Chatrom";
-$a->strings["Bookmarked Chatrooms"] = "Bokmerkede chatrom";
-$a->strings["Suggested Chatrooms"] = "Foreslåtte chatrom";
-$a->strings["photo/image"] = "foto/bilde";
-$a->strings["Rate Me"] = "Vurder meg";
-$a->strings["View Ratings"] = "Vis vurderinger";
-$a->strings["Public Hubs"] = "Offentlige huber";
-$a->strings["Forums"] = "Forum";
-$a->strings["Tasks"] = "Oppgaver";
-$a->strings["Documentation"] = "Dokumentasjon";
-$a->strings["Project/Site Information"] = "Prosjekt-/Nettstedsinformasjon";
-$a->strings["For Members"] = "For medlemmer";
-$a->strings["For Administrators"] = "For administratorer";
-$a->strings["For Developers"] = "For utviklere";
-$a->strings["Site"] = "Nettsted";
-$a->strings["Accounts"] = "Kontoer";
-$a->strings["Channels"] = "Kanaler";
-$a->strings["Plugins"] = "Tilleggsfunksjoner";
-$a->strings["Themes"] = "Temaer";
-$a->strings["Inspect queue"] = "Inspiser kø";
-$a->strings["Profile Config"] = "Profilinnstillinger";
-$a->strings["DB updates"] = "Databaseoppdateringer";
-$a->strings["Logs"] = "Logger";
-$a->strings["Admin"] = "Administrator";
-$a->strings["Plugin Features"] = "Tilleggsfunksjoner";
-$a->strings["User registrations waiting for confirmation"] = "Brukerregistreringer som venter på bekreftelse";
-$a->strings["Invalid data packet"] = "Ugyldig datapakke";
-$a->strings["Unable to verify channel signature"] = "Ikke i stand til å sjekke kanalsignaturen";
-$a->strings["Unable to verify site signature for %s"] = "Ikke i stand til å bekrefte signaturen til %s";
-$a->strings["invalid target signature"] = "MÃ¥lets signatur er ugyldig";
 $a->strings["Logout"] = "Logg ut";
 $a->strings["End this session"] = "Avslutt denne økten";
 $a->strings["Home"] = "Hjem";
@@ -943,9 +827,11 @@ $a->strings["Manage/Edit profiles"] = "HÃ¥ndter/endre profiler";
 $a->strings["Edit your profile"] = "Endre din profil";
 $a->strings["Your photos"] = "Dine bilder";
 $a->strings["Your files"] = "Dine filer";
+$a->strings["Chat"] = "Chat";
 $a->strings["Your chatrooms"] = "Dine chatterom";
 $a->strings["Your bookmarks"] = "Dine bokmerker";
 $a->strings["Your webpages"] = "Dine websider";
+$a->strings["Login"] = "Logg inn";
 $a->strings["Sign in"] = "Logg på";
 $a->strings["%s - click to logout"] = "%s - klikk for å logge ut";
 $a->strings["Remote authentication"] = "Fjernautentisering";
@@ -953,13 +839,16 @@ $a->strings["Click to authenticate to your home hub"] = "Klikk for å godkjennes
 $a->strings["Home Page"] = "Hjemmeside";
 $a->strings["Register"] = "Registrer";
 $a->strings["Create an account"] = "Lag en konto";
+$a->strings["Help"] = "Hjelp";
 $a->strings["Help and documentation"] = "Hjelp og dokumentasjon";
 $a->strings["Applications, utilities, links, games"] = "Programmer, verktøy, lenker, spill";
 $a->strings["Search site @name, #tag, ?docs, content"] = "Søk nettstedet for @navn, #merkelapp, ?dokumentasjon, innhold";
+$a->strings["Directory"] = "Katalog";
 $a->strings["Channel Directory"] = "Kanalkatalog";
 $a->strings["Grid"] = "Nett";
 $a->strings["Your grid"] = "Ditt nett";
 $a->strings["Mark all grid notifications seen"] = "Marker alle nettvarsler som sett";
+$a->strings["Channel Home"] = "Kanalhjem";
 $a->strings["Channel home"] = "Kanalhjem";
 $a->strings["Mark all channel notifications seen"] = "Merk alle kanalvarsler som sett";
 $a->strings["Connections"] = "Forbindelser";
@@ -967,54 +856,216 @@ $a->strings["Notices"] = "Varsel";
 $a->strings["Notifications"] = "Varsler";
 $a->strings["See all notifications"] = "Se alle varsler";
 $a->strings["Mark all system notifications seen"] = "Merk alle systemvarsler som sett";
+$a->strings["Mail"] = "Melding";
 $a->strings["Private mail"] = "Privat post";
 $a->strings["See all private messages"] = "Se alle private meldinger";
 $a->strings["Mark all private messages seen"] = "Merk alle private meldinger som sett";
+$a->strings["Events"] = "Hendelser";
 $a->strings["Event Calendar"] = "Kalender";
 $a->strings["See all events"] = "Se alle hendelser";
 $a->strings["Mark all events seen"] = "Merk alle hendelser som sett";
+$a->strings["Channel Manager"] = "Kanalstyring";
 $a->strings["Manage Your Channels"] = "HÃ¥ndter dine kanaler";
 $a->strings["Account/Channel Settings"] = "Konto-/kanal-innstillinger";
 $a->strings["Site Setup and Configuration"] = "Nettstedsoppsett og -konfigurasjon";
 $a->strings["@name, #tag, ?doc, content"] = "@navn, #merkelapp, ?dokumentasjon, innhold";
 $a->strings["Please wait..."] = "Vennligst vent...";
-$a->strings["Some blurb about what to do when you're new here"] = "En standardtekst om hva du bør gjøre som ny her";
-$a->strings["Contact not found."] = "Kontakten ble ikke funnet.";
-$a->strings["Friend suggestion sent."] = "Venneforespørsel sendt.";
-$a->strings["Suggest Friends"] = "Foreslå venner";
-$a->strings["Suggest a friend for %s"] = "Foreslå en venn for %s";
-$a->strings["Public access denied."] = "Offentlig tilgang avvist.";
-$a->strings["%d rating"] = array(
-	0 => "%d vurdering",
-	1 => "%d vurderinger",
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Skjemaets sikkerhetspollett var ikke gyldig. Dette skjedde antakelig fordi skjemaet har vært åpnet for lenge (>3 timer) før det ble sendt inn.";
+$a->strings["Directory Options"] = "Kataloginnstillinger";
+$a->strings["Safe Mode"] = "Trygt modus";
+$a->strings["No"] = "Nei";
+$a->strings["Yes"] = "Ja";
+$a->strings["Public Forums Only"] = "Bare offentlige forum";
+$a->strings["This Website Only"] = "Kun dette nettstedet";
+$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "En slettet gruppe med dette navnet ble gjenopprettet. Eksisterende tillatelser for elementet <strong>kan</strong> gjelde for denne gruppen og fremtidige medlemmer. Hvis du ønsket noe annet, vennligst lag en ny gruppe med et annet navn.";
+$a->strings["Add new connections to this collection (privacy group)"] = "Legg nye forbindelser til denne samlingen (personverngruppe)";
+$a->strings["All Channels"] = "Alle kanaler";
+$a->strings["edit"] = "endre";
+$a->strings["Collections"] = "Samlinger";
+$a->strings["Edit collection"] = "Endre samling";
+$a->strings["Add new collection"] = "Legg til ny samling";
+$a->strings["Channels not in any collection"] = "Kanaler som ikke er i noen samling";
+$a->strings["Invalid data packet"] = "Ugyldig datapakke";
+$a->strings["Unable to verify channel signature"] = "Ikke i stand til å sjekke kanalsignaturen";
+$a->strings["Unable to verify site signature for %s"] = "Ikke i stand til å bekrefte signaturen til %s";
+$a->strings["invalid target signature"] = "MÃ¥lets signatur er ugyldig";
+$a->strings["New Page"] = "Ny side";
+$a->strings["View"] = "Vis";
+$a->strings["Actions"] = "Handlinger";
+$a->strings["Page Link"] = "Sidelenke";
+$a->strings["Title"] = "Tittel";
+$a->strings["Created"] = "Laget";
+$a->strings["Edited"] = "Endret";
+$a->strings["view full size"] = "vis full størrelse";
+$a->strings["Administrator"] = "Administrator";
+$a->strings["No Subject"] = "Uten emne";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "Kan ikke finne DNS-informasjon om databasetjener '%s'";
+$a->strings["Save to Folder"] = "Lagre i mappe";
+$a->strings["I will attend"] = "Jeg vil delta";
+$a->strings["I will not attend"] = "Jeg deltar ikke";
+$a->strings["I might attend"] = "Jeg vil kanskje delta";
+$a->strings["I agree"] = "Jeg er enig";
+$a->strings["I disagree"] = "Jeg er uenig";
+$a->strings["I abstain"] = "Jeg avstår";
+$a->strings["Add Star"] = "Legg til stjerne";
+$a->strings["Remove Star"] = "Fjern stjerne";
+$a->strings["Toggle Star Status"] = "Skru av og på stjernestatus";
+$a->strings["starred"] = "stjernemerket";
+$a->strings["Add Tag"] = "Legg til merkelapp";
+$a->strings["I like this (toggle)"] = "Jeg liker dette (skru av og på)";
+$a->strings["I don't like this (toggle)"] = "Jeg liker ikke dette (skru av og på)";
+$a->strings["Share This"] = "Del dette";
+$a->strings["share"] = "del";
+$a->strings["Delivery Report"] = "Leveringsrapport";
+$a->strings["%d comment"] = array(
+	0 => "%d kommentar",
+	1 => "%d kommentarer",
 );
-$a->strings["Gender: "] = "Kjønn:";
-$a->strings["Status: "] = "Status:";
-$a->strings["Homepage: "] = "Hjemmeside:";
-$a->strings["Description:"] = "Beskrivelse:";
-$a->strings["Public Forum:"] = "Offentlig forum:";
-$a->strings["Keywords: "] = "Nøkkelord:";
-$a->strings["Don't suggest"] = "Ikke foreslå";
-$a->strings["Common connections:"] = "Felles forbindelser:";
-$a->strings["Global Directory"] = "Global katalog";
-$a->strings["Local Directory"] = "Lokal katalog";
-$a->strings["Finding:"] = "Finner:";
-$a->strings["next page"] = "Neste side";
-$a->strings["previous page"] = "Forrige side";
-$a->strings["Sort options"] = "Sorteringsvalg";
-$a->strings["Alphabetic"] = "Alfabetisk";
-$a->strings["Reverse Alphabetic"] = "Omvendt alfabetisk";
-$a->strings["Newest to Oldest"] = "Nyest til eldst";
-$a->strings["Oldest to Newest"] = "Eldst til nyest";
-$a->strings["No entries (some entries may be hidden)."] = "Ingen oppføringer (noen oppføringer kan være skjult).";
-$a->strings["Bookmark added"] = "Bokmerke lagt til";
-$a->strings["My Bookmarks"] = "Mine bokmerker";
-$a->strings["My Connections Bookmarks"] = "Mine forbindelsers bokmerker";
+$a->strings["View %s's profile - %s"] = "Vis %s sin profil - %s";
+$a->strings["to"] = "til";
+$a->strings["via"] = "via";
+$a->strings["Wall-to-Wall"] = "vegg-til-vegg";
+$a->strings["via Wall-To-Wall:"] = "via vegg-til-vegg:";
+$a->strings["Save Bookmarks"] = "Lagre bokmerker";
+$a->strings["Add to Calendar"] = "Legg til i kalender";
+$a->strings["Mark all seen"] = "Merk alle som sett";
+$a->strings["__ctx:noun__ Likes"] = "Liker";
+$a->strings["__ctx:noun__ Dislikes"] = "Liker ikke";
+$a->strings["This is you"] = "Dette er deg";
+$a->strings["Image"] = "Bilde";
+$a->strings["Insert Link"] = "Sett inn lenke";
+$a->strings["Video"] = "Video";
+$a->strings["Site Admin"] = "Nettstedsadministrator";
+$a->strings["Address Book"] = "Adressebok";
+$a->strings["Mood"] = "Stemning";
+$a->strings["Probe"] = "Undersøk";
+$a->strings["Suggest"] = "Forreslå";
+$a->strings["Random Channel"] = "Tilfeldig kanal";
+$a->strings["Invite"] = "Inviter";
+$a->strings["Features"] = "Funksjoner";
+$a->strings["Language"] = "Språk";
+$a->strings["Post"] = "Innlegg";
+$a->strings["Profile Photo"] = "Profilbilde";
+$a->strings["Update"] = "Oppdater";
+$a->strings["Install"] = "Installer";
+$a->strings["Purchase"] = "Kjøp";
+$a->strings["Can view my normal stream and posts"] = "Kan se min normale strøm og innlegg";
+$a->strings["Can view my default channel profile"] = "Kan se min standard kanalprofil";
+$a->strings["Can view my connections"] = "Kan se mine forbindelser";
+$a->strings["Can view my file storage and photos"] = "Kan se mine filer og bilder";
+$a->strings["Can view my webpages"] = "Kan se mine websider";
+$a->strings["Can send me their channel stream and posts"] = "Kan sende meg deres kanalstrøm og innlegg";
+$a->strings["Can post on my channel page (\"wall\")"] = "Kan lage innlegg på min kanalside (\"vegg\")";
+$a->strings["Can comment on or like my posts"] = "Kan kommentere på eller like mine innlegg";
+$a->strings["Can send me private mail messages"] = "Kan sende meg private meldinger";
+$a->strings["Can like/dislike stuff"] = "Kan like/ikke like forskjellige greier";
+$a->strings["Profiles and things other than posts/comments"] = "Profiler og andre ting enn innlegg/kommentarer";
+$a->strings["Can forward to all my channel contacts via post @mentions"] = "Kan videresende til alle mine kanalkontakter via @navn i innlegg";
+$a->strings["Advanced - useful for creating group forum channels"] = "Avansert - nyttig for å lage forumkanaler for grupper";
+$a->strings["Can chat with me (when available)"] = "Kan chatte/sende lynmeldinger til meg (når tilgjengelig)";
+$a->strings["Can write to my file storage and photos"] = "Kan skrive til mitt lager for filer og bilder";
+$a->strings["Can edit my webpages"] = "Kan endre mine websider";
+$a->strings["Can source my public posts in derived channels"] = "Kan bruke mine offentlige innlegg som kanalkilde i egne kanaler";
+$a->strings["Somewhat advanced - very useful in open communities"] = "Litt avansert - svært nyttig i åpne fellesskap";
+$a->strings["Can administer my channel resources"] = "Kan administrere mine kanalressurser";
+$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Ekstremt avansert. La dette være med mindre du vet hva du gjør";
+$a->strings["Social Networking"] = "Sosialt nettverk";
+$a->strings["Mostly Public"] = "Ganske offentlig";
+$a->strings["Restricted"] = "Begrenset";
+$a->strings["Private"] = "Privat";
+$a->strings["Community Forum"] = "Forum for fellesskap";
+$a->strings["Feed Republish"] = "Republisering av strømmet innhold";
+$a->strings["Special Purpose"] = "Spesiell bruk";
+$a->strings["Celebrity/Soapbox"] = "Kjendis/Talerstol";
+$a->strings["Group Repository"] = "Gruppelager";
+$a->strings["Custom/Expert Mode"] = "Tilpasset/Ekspertmodus";
+$a->strings["Profile Photos"] = "Profilbilder";
+$a->strings["Not a valid email address"] = "Ikke en gyldig e-postadresse";
+$a->strings["Your email domain is not among those allowed on this site"] = "Ditt e-postdomene er ikke blant de som er tillatt på dette stedet";
+$a->strings["Your email address is already registered at this site."] = "Din e-postadresse er allerede registrert på dette nettstedet.";
+$a->strings["An invitation is required."] = "En invitasjon er påkrevd.";
+$a->strings["Invitation could not be verified."] = "Invitasjon kunne ikke bekreftes.";
+$a->strings["Please enter the required information."] = "Vennligst skriv inn nødvendig informasjon.";
+$a->strings["Failed to store account information."] = "Mislyktes med å lagre kontoinformasjon.";
+$a->strings["Registration confirmation for %s"] = "Registreringsbekreftelse for %s";
+$a->strings["Registration request at %s"] = "Registreringsforespørsel hos %s";
+$a->strings["your registration password"] = "ditt registreringspassord";
+$a->strings["Registration details for %s"] = "Registreringsdetaljer for %s";
+$a->strings["Account approved."] = "Konto godkjent.";
+$a->strings["Registration revoked for %s"] = "Registrering trukket tilbake for %s";
+$a->strings["Account verified. Please login."] = "Konto bekreftet. Vennligst logg inn.";
+$a->strings["Click here to upgrade."] = "Klikk her for å oppgradere.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Denne handlingen går utenfor grensene satt i din abonnementsplan.";
+$a->strings["This action is not available under your subscription plan."] = "Denne handlingen er ikke tilgjengelig i din abonnementsplan.";
+$a->strings["Permission Denied."] = "Tillatelse avvist.";
+$a->strings["File not found."] = "Filen ble ikke funnet.";
+$a->strings["Edit file permissions"] = "Endre filtillatelser";
+$a->strings["Set/edit permissions"] = "Angi/endre tillatelser";
+$a->strings["Include all files and sub folders"] = "Inkluder alle filer og undermapper";
+$a->strings["Return to file list"] = "GÃ¥ tilbake til filoversikten";
+$a->strings["Copy/paste this code to attach file to a post"] = "Kopier og lim inn denne koden for å legge til filen i et innlegg";
+$a->strings["Copy/paste this URL to link file from a web page"] = "Kopier og lim inn denne URL-en for å lenke til filen fra en webside";
+$a->strings["Share this file"] = "Del denne filen";
+$a->strings["Show URL to this file"] = "Vis URLen til denne filen";
+$a->strings["Notify your contacts about this file"] = "Varsle dine kontakter om denne filen";
+$a->strings["Collection created."] = "Samling opprettet.";
+$a->strings["Could not create collection."] = "Kunne ikke lage samling.";
+$a->strings["Collection updated."] = "Samlingen er oppdatert.";
+$a->strings["Create a collection of channels."] = "Lag en samling med kanaler.";
+$a->strings["Collection Name: "] = "Navn på samling:";
+$a->strings["Members are visible to other channels"] = "Medlemmer er synlig for andre kanaler";
+$a->strings["Collection removed."] = "Samling fjernet.";
+$a->strings["Unable to remove collection."] = "Ikke i stand til å fjerne samlingen.";
+$a->strings["Collection Editor"] = "Samlingsbehandler";
+$a->strings["Members"] = "Medlemmer";
+$a->strings["All Connected Channels"] = "Alle tilkoblede kanaler";
+$a->strings["Click on a channel to add or remove."] = "Klikk på en kanal for å legge til eller fjerne.";
+$a->strings["Unable to locate original post."] = "Ikke i stand til å finne opprinnelig innlegg.";
+$a->strings["Empty post discarded."] = "Tomt innlegg forkastet.";
+$a->strings["Executable content type not permitted to this channel."] = "Kjørbar innholdstype er ikke tillat for denne kanalen.";
+$a->strings["Duplicate post suppressed."] = "Duplikat av innlegg forhindret.";
+$a->strings["System error. Post not saved."] = "Systemfeil. Innlegg ble ikke lagret.";
+$a->strings["Unable to obtain post information from database."] = "Ikke i stand til å få tak i informasjon om innlegg fra databasen.";
+$a->strings["You have reached your limit of %1$.0f top level posts."] = "Du har nådd din grense på %1$.0f startinnlegg.";
+$a->strings["You have reached your limit of %1$.0f webpages."] = "Du har nådd din grense på %1$.0f websider.";
+$a->strings["No channel."] = "Ingen kanal.";
+$a->strings["Common connections"] = "Felles forbindelser";
+$a->strings["No connections in common."] = "Ingen forbindelser felles.";
+$a->strings["Continue"] = "Fortsett";
+$a->strings["Premium Channel Setup"] = "Premiumkanal-oppsett";
+$a->strings["Enable premium channel connection restrictions"] = "Slå på restriksjoner for forbindelse med premiumkanal";
+$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Vennligst skriv dine restriksjoner og betingelser, slik som PayPal-kvittering, retningslinjer for bruk, og så videre.";
+$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Denne kanalen kan kreve ytterligere steg og bekreftelse av følgende betingelser før tilkobling:";
+$a->strings["Potential connections will then see the following text before proceeding:"] = "Potensielle forbindelser vil da se følgende tekst før de går videre:";
+$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Ved å fortsette bekrefter jeg at jeg har oppfylt alle instruksjoner gitt på denne siden.";
+$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Ingen spesifikke instruksjoner er gitt av kanaleieren.)";
+$a->strings["Restricted or Premium Channel"] = "Begrenset kanal eller premiumkanal";
+$a->strings["Profile Match"] = "Profiltreff";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Ingen nøkkelord å sammenlikne. Vennligst legg til nøkkelord til din standardprofil.";
+$a->strings["is interested in:"] = "er interessert i:";
+$a->strings["No matches"] = "Ingen treff";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID protokollfeil. Ingen ID ble returnert.";
 $a->strings["Welcome %s. Remote authentication successful."] = "Velkommen %s. Ekstern autentisering er vellykket.";
-$a->strings["Invalid item."] = "Ugyldig element.";
-$a->strings["Channel not found."] = "Kanalen ble ikke funnet.";
-$a->strings["Page not found."] = "Siden ikke funnet.";
+$a->strings["Some blurb about what to do when you're new here"] = "En standardtekst om hva du bør gjøre som ny her";
+$a->strings["Away"] = "Borte";
+$a->strings["Online"] = "Online";
+$a->strings["Public Sites"] = "Offentlige nettsteder";
+$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Nettstedene på listen tillater offentlig registrering i \$Projectname-nettverket. Alle nettsteder i nettverket er forbundet så medlemskap på enhver av dem formidler medlemskap i hele matrix. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Tilbyderlenkene <strong>kan</strong> gi tilleggsopplysninger.";
+$a->strings["Rate this hub"] = "Vurder denne hubben";
+$a->strings["Site URL"] = "Nettstedets URL";
+$a->strings["Access Type"] = "Tilgangstype";
+$a->strings["Registration Policy"] = "Retningslinjer for registrering";
+$a->strings["Project"] = "Prosjekt";
+$a->strings["View hub ratings"] = "Vis vurderinger av hubben";
+$a->strings["Rate"] = "Vurder";
+$a->strings["View ratings"] = "Vis vurderinger";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s merket %3\$s til %2\$s med %4\$s";
+$a->strings["Website:"] = "Nettsted:";
+$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Fjerntliggende kanal [%s] (foreløpig ikke kjent på dette nettstedet)";
+$a->strings["Rating (this information is public)"] = "Vurdering (denne informasjonen er offentlig)";
+$a->strings["Optionally explain your rating (this information is public)"] = "Velg om du vil forklare din vurdering (denne informasjonen er offentlig)";
+$a->strings["Block Name"] = "Byggeklossens navn";
+$a->strings["Block Title"] = "Byggeklossens tittel";
 $a->strings["First Name"] = "Fornavn";
 $a->strings["Last Name"] = "Etternavn";
 $a->strings["Nickname"] = "Kallenavn";
@@ -1047,28 +1098,10 @@ $a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s deltar ikke på %2\
 $a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s deltar kanskje på %2\$ss %3\$s";
 $a->strings["Action completed."] = "Handling ferdig.";
 $a->strings["Thank you."] = "Tusen takk.";
-$a->strings["Export Channel"] = "Eksporter kanal";
-$a->strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Eksporter grunnleggende informasjon om kanalen din til en fil. Denne er en sikkerhetskopi av dine forbindelser, tillatelser, profil og grunnleggende data, som kan brukes til å importere dine data til en ny hub, men den tar ikke med innholdet.";
-$a->strings["Export Content"] = "Eksporter innhold";
-$a->strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Eksporter din kanalinformasjon og det nyeste innholdet til en JSON-sikkerhetskopi, som kan gjenopprettes eller importeres til en annen hub. Denne lager en sikkerhetskopi av alle dine forbindelser, tillatelser, profildata og flere måneder av innholdet ditt. Denne filen kan være SVÆRT stor. Vennligst vær tålmodig - det kan ta flere minutter før denne nedlastningen begynner.";
-$a->strings["Export your posts from a given year."] = "Eksporter dine innlegg fra et bestemt år";
-$a->strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Du kan også eksportere dine innlegg og samtaler for et bestemt år eller måned. Juster datoen i din nettlesers adresselinje for å velge andre datoer. Hvis eksporten feiler (muligens på grunn av utilstrekkelig minne på din hub), vennligst prøv igjen med et mer begrenset datoområde.";
-$a->strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "For å velge alle innlegg for et gitt år, slik som iår, besøk <a href=\"%1\$s\">%2\$s</a>";
-$a->strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "For å velge alle innlegg fra en gitt måned, slik som januar i år, besøk <a href=\"%1\$s\">%2\$s</a>";
-$a->strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Disse innholdsfilene kan importeres eller gjenopprettes ved å besøke <a href=\"%1\$s\">%2\$s</a> på ethvert nettsted som inneholder din kanal. For best resultat, vennligst importer eller gjenopprett disse etter dato (eldste først).";
-$a->strings["Away"] = "Borte";
-$a->strings["Online"] = "Online";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s merket %3\$s til %2\$s med %4\$s";
-$a->strings["No channel."] = "Ingen kanal.";
-$a->strings["Common connections"] = "Felles forbindelser";
-$a->strings["No connections in common."] = "Ingen forbindelser felles.";
-$a->strings["sent you a private message"] = "sendte deg en privat melding";
-$a->strings["added your channel"] = "la til din kanal";
-$a->strings["posted an event"] = "la ut en hendelse";
-$a->strings["Documentation Search"] = "Søk i dokumentasjon";
-$a->strings["Help:"] = "Hjelp:";
-$a->strings["Not Found"] = "Ikke funnet";
-$a->strings["\$Projectname Documentation"] = "\$Projectname dokumentasjon";
+$a->strings["Invalid item."] = "Ugyldig element.";
+$a->strings["Channel not found."] = "Kanalen ble ikke funnet.";
+$a->strings["Page not found."] = "Siden ikke funnet.";
+$a->strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
 $a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Fjerning av kanaler er ikke tillatt innen 48 timer etter endring av kontopassordet.";
 $a->strings["Remove This Channel"] = "Fjern denne kanalen";
 $a->strings["WARNING: "] = "ADVARSEL:";
@@ -1078,38 +1111,182 @@ $a->strings["Please enter your password for verification:"] = "Vennligst skriv d
 $a->strings["Remove this channel and all its clones from the network"] = "Fjern denne kanalen og alle dens kloner fra nettverket";
 $a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Som standard vil bare forekomsten av denne kanalen lokalisert på denne hubben bli fjernet fra nettverket";
 $a->strings["Remove Channel"] = "Fjern kanal";
-$a->strings["- select -"] = "- velg -";
-$a->strings["Menu not found."] = "Menyen ble ikke funnet.";
-$a->strings["Unable to create element."] = "Klarer ikke å lage element.";
-$a->strings["Unable to update menu element."] = "Ikke i stand til å oppdatere menyelement.";
-$a->strings["Unable to add menu element."] = "Ikke i stand til å legge til menyelement.";
-$a->strings["Not found."] = "Ikke funnet.";
-$a->strings["Menu Item Permissions"] = "Menyelement Tillatelser";
-$a->strings["(click to open/close)"] = "(klikk for å åpne/lukke)";
-$a->strings["Link Name"] = "Lenkenavn";
-$a->strings["Link or Submenu Target"] = "Lenke- eller undermeny-mål";
-$a->strings["Enter URL of the link or select a menu name to create a submenu"] = "Skriv URL-en til lenken eller velg et menynavn for å lage en undermeny";
-$a->strings["Use magic-auth if available"] = "Bruk magic-autent hvis mulig";
-$a->strings["Open link in new window"] = "Ã…pne lenke i nytt vindu";
-$a->strings["Order in list"] = "Ordne i liste";
-$a->strings["Higher numbers will sink to bottom of listing"] = "Høyere tall vil synke mot bunnen av listen";
-$a->strings["Submit and finish"] = "Send inn og avslutt";
-$a->strings["Submit and continue"] = "Send inn og fortsett";
-$a->strings["Menu:"] = "Meny:";
-$a->strings["Link Target"] = "Lenkemål";
-$a->strings["Edit menu"] = "Endre meny";
-$a->strings["Edit element"] = "Endre element";
-$a->strings["Drop element"] = "Slett element";
-$a->strings["New element"] = "Nytt element";
-$a->strings["Edit this menu container"] = "Endre denne menybeholderen";
-$a->strings["Add menu element"] = "Legg til menyelement";
-$a->strings["Delete this menu item"] = "Slett dette menyelementet";
-$a->strings["Edit this menu item"] = "Endre dette menyelementet";
-$a->strings["Menu item not found."] = "Menyelement ble ikke funnet.";
-$a->strings["Menu item deleted."] = "Menyelement slettet.";
-$a->strings["Menu item could not be deleted."] = "Menyelement kunne ikke bli slettet.";
-$a->strings["Edit Menu Element"] = "Endre menyelement";
-$a->strings["Link text"] = "Lenketekst";
+$a->strings["Set your current mood and tell your friends"] = "Angi ditt nåværende humør og fortell dine venner";
+$a->strings["Add a Channel"] = "Legg til en kanal";
+$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "En kanal er din egen samling av relaterte web-sider. En kanal kan brukes til å samle sosiale nettverksprofiler, blogger, samtalegrupper og forum, kjendissider og mye mer. Du kan lage så mange kanaler som din tjenestetilbyder tillater.";
+$a->strings["Channel Name"] = "Kanalnavn";
+$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Eksempel: \"Ola Nordmann\", \"Lisa og hestene hennes\", \"Fotball\", \"Sykkelgruppa\"";
+$a->strings["Choose a short nickname"] = "Velg et kort kallenavn";
+$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Ditt kallenavn brukes til å lage en kanaladresse som er enkel å huske (minner om en e-postadresse) og som du kan dele med andre.";
+$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "Eller <a href=\"import\">importerer en eksisterende kanal</a> fra et annet sted.";
+$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Vennligst velg en kanaltype (for eksempel sosialt nettverk eller forum for felleskap) og krav til personvern slik at vi kan velge de beste tillatelsene for deg.";
+$a->strings["Channel Type"] = "Kanaltype";
+$a->strings["Read more about roles"] = "Les mer om roller";
+$a->strings["No ratings"] = "Ingen vurderinger";
+$a->strings["Public access denied."] = "Offentlig tilgang avvist.";
+$a->strings["Ratings"] = "Vurderinger";
+$a->strings["Rating: "] = "Vurdering:";
+$a->strings["Website: "] = "Nettsted:";
+$a->strings["Description: "] = "Beskrivelse:";
+$a->strings["\$Projectname Server - Setup"] = "\$Projectname-tjener - oppsett";
+$a->strings["Could not connect to database."] = "Fikk ikke kontakt med databasen.";
+$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Fikk ikke kontakt med det angitte nettstedets URL. Problemet kan muligens skyldes SSL-sertifikatet eller DNS.";
+$a->strings["Could not create table."] = "Kunne ikke lage tabellen.";
+$a->strings["Your site database has been installed."] = "Databasen til ditt nettsted har blitt installert.";
+$a->strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Du må kanskje importere filen \"install/schmea_xxx.sql\" manuelt ved å bruke en databaseklient.";
+$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Vennligst les filen \"install/INSTALL.txt\".";
+$a->strings["System check"] = "Systemsjekk";
+$a->strings["Next"] = "Neste";
+$a->strings["Check again"] = "Sjekk igjen";
+$a->strings["Database connection"] = "Databaseforbindelse";
+$a->strings["In order to install \$Projectname we need to know how to connect to your database."] = "For å installere \$Projectname må du oppgi hvordan din database kan kontaktes.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Vennligst kontakt din nettstedstilbyder eller nettstedsadministrator hvis du har spørsmål om disse innstillingene.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Databasen du oppgir nedenfor må finnes på forhånd. Hvis den ikke finnes, vennligst lag den før du fortsetter.";
+$a->strings["Database Server Name"] = "Navn på databasetjener";
+$a->strings["Default is 127.0.0.1"] = "Standard er 127.0.0.1";
+$a->strings["Database Port"] = "Databaseport";
+$a->strings["Communication port number - use 0 for default"] = "Kommunikasjonsportnummer - bruk 0 for standard";
+$a->strings["Database Login Name"] = "Database innloggingsnavn";
+$a->strings["Database Login Password"] = "Database innloggingspassord";
+$a->strings["Database Name"] = "Databasenavn";
+$a->strings["Database Type"] = "Databasetype";
+$a->strings["Site administrator email address"] = "E-postadressen til administrator ved nettstedet";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Din konto sin e-postadresse må være lik denne for å kunne bruke web-administrasjonspanelet.";
+$a->strings["Website URL"] = "Nettstedets URL";
+$a->strings["Please use SSL (https) URL if available."] = "Vennligst bruk SSL (https) URL hvis tilgjengelig.";
+$a->strings["Please select a default timezone for your website"] = "Vennligst velg en standard tidssone for ditt nettsted";
+$a->strings["Site settings"] = "Nettstedets innstillinger";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Fant ikke en kommandolinjeversjon av PHP i webtjenerens sti (PATH).";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Hvis du ikke har en kommandolinjeversjon av PHP installert på tjeneren, så vil du ikke kunne kjøre bakgrunnshenting via cron.";
+$a->strings["PHP executable path"] = "PHP-kjørefilens sti";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Skriv full sti til kjørefilen for PHP. Du kan la denne stå blank for å fortsette installasjonen.";
+$a->strings["Command line PHP"] = "Kommandolinje PHP";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Kommandolinjeversjonen av PHP på ditt system har ikke \"register_argc_argv\" påskrudd.";
+$a->strings["This is required for message delivery to work."] = "Dette er påkrevd for at meldingslevering skal virke.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "Den største totale opplastingsstørrelsen du er tillatt er satt til %s. Filstørrelsen på en enkelt fil er satt til å maksimalt være %s. Du har lov til å laste opp inntil %d filer samtidig.";
+$a->strings["You can adjust these settings in the servers php.ini."] = "Du kan justere disse innstillingene i tjenerens php.ini.";
+$a->strings["PHP upload limits"] = "PHP opplastingsgrenser";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Feil: \"openssl_pkey_new\"-funksjonen på dette systemet er ikke i stand til å lage krypteringsnøkler";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Ved kjøring på Windows, vennligst se \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Lag krypteringsnøkler";
+$a->strings["libCurl PHP module"] = "libCurl PHP-modul";
+$a->strings["GD graphics PHP module"] = "GD graphics PHP-modul";
+$a->strings["OpenSSL PHP module"] = "OpenSSL PHP-modul";
+$a->strings["mysqli or postgres PHP module"] = "MySQLi eller Postgres PHP modul";
+$a->strings["mb_string PHP module"] = "mb_string PHP-modul";
+$a->strings["mcrypt PHP module"] = "mcrypt PHP-modul";
+$a->strings["xml PHP module"] = "XML PHP modul";
+$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite-modul";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Feil: Apache web-tjenerens mod-rewrite-modul er påkrevd, men ikke installert.";
+$a->strings["proc_open"] = "proc_open";
+$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Feil: proc_open er påkrevd, men er enten ikke installert eller har blitt avskrudd i php.ini";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Feil: libCURL PHP-modul er påkrevd, men er ikke installert.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Feil: GD graphics PHP-modul med JPEG-støtte er påkrevd, men er ikke installert.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Feil: openssl PHP-modul er påkrevd, men er ikke installert.";
+$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Feil: mysqli eller postgres PHP modul er påkrevd, men ingen av dem er installert.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Feil: mb_string PHP-modul er påkrevd, men  er ikke installert.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Feil: mcrypt PHP-modul er påkrevd, men er ikke installert.";
+$a->strings["Error: xml PHP module required for DAV but not installed."] = "Feil: XML PHP modul er påkrevet for DAV, men den er ikke installert.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Web-installasjonen må kunne lage en fil kalt \".htconfig.php\" i toppkatalogen til web-tjeneren din, men dette får den ikke til.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Dette er oftest tillatelsesinnstilling, ettersom webtjeneren kanskje kan skrive til filer i din mappe - selv om du kan.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "På slutten av denne prosedyren vil vi gi deg en tekst til å lagre i en fil kalt .htconfig.php i toppkatalogen til din Red.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativt, så kan du hoppe over denne prosedyren og gjennomføre en manuell installasjon. Vennligst se filen \"install/INSTALL.txt\" for instruksjoner.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php kan skrives til";
+$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red bruker malmotoren Smarty3 for å gjengi sine webvisninger. Smarty3 kompilerer malene om til PHP for å framskynde gjengivelsen.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."] = "For å kunne lagre disse kompilerte malene, så må webtjeneren ha skrivetilgang til katalogen %s under Red sin hovedmappe.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Vennligst sikre at brukeren som din web-tjeneste kjører som (for eksempel www-data) har skrivetilgang til denne katalogen.";
+$a->strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Merknad: som et sikkerhetstiltak bør du bare gi webtjerenn skrivetilgang til %s - ikke til malfilene (.tpl) som den inneholder.";
+$a->strings["%s is writable"] = "%s kan skrives til";
+$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red bruker lagringsmappen for å lagre opplastede filer. Webtjeneren trenger å ha skrivetilgang til lagringsmappen under Red sin toppnivåmappe.";
+$a->strings["store is writable"] = "lageret kan skrives til";
+$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "SSL-sertifikatet kan ikke kontrolleres. Fiks sertifikatet eller skru av https tilgang til dette nettstedet.";
+$a->strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "Hvis du har HTTPS-tilgang til ditt nettsted eller tillater forbindelser til TCP port 443 (HTTPS-porten), så MÅ du bruke nettlesergodkjent sertifkater. Du MÅ IKKE bruke egensignert sertifikater!";
+$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Denne begrensningen er tatt inn fordi offentlige innlegg fra deg kan for eksempel inneholde referanser til bilder på din egen hub.";
+$a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "Hvis sertifikatet ditt ikke gjenkjennes, så vil medlemmer på andre nettsteder (som selv kan ha godkjente sertifikater) få en beskjed med en advarsel på deres eget nettsted som klager over sikkerhetsproblemer.";
+$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Dette kan gi problemer med brukervennlighet (ikke bare på ditt eget nettsted), så vi må insistere på dette kravet.";
+$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Det finnes tilbydere som utsteder gratis sertifikater som er gyldige i nettlesere.";
+$a->strings["SSL certificate validation"] = "SSL sertifikat-kontroll";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "URL omskriving (rewrite) i .htaccess virker ikke. Sjekk konfigurasjonen til tjeneren din. Test:";
+$a->strings["Url rewrite is working"] = "URL rewrite virker";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Databasekonfigurasjonsfilen \".htconfig.php\" kunne ikke skrives. Vennligst bruk den medfølgende teksten for å lage en konfigurasjonsfil i toppkatalogen av din web-tjener.";
+$a->strings["Errors encountered creating database tables."] = "Feil oppstod under opprettelsen av databasetabeller.";
+$a->strings["<h1>What next</h1>"] = "<h1>Hva gjenstår</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "VIKTIG: Du må [manuelt] sette opp en automatisert tidfestet oppgave til bakgrunnshenteren.";
+$a->strings["Bookmark added"] = "Bokmerke lagt til";
+$a->strings["My Bookmarks"] = "Mine bokmerker";
+$a->strings["My Connections Bookmarks"] = "Mine forbindelsers bokmerker";
+$a->strings["This setting requires special processing and editing has been blocked."] = "Denne innstillingen krever spesiell behandling og redigering har blitt blokkert.";
+$a->strings["Configuration Editor"] = "Konfigurasjonsbehandler";
+$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Advarsel: kanalen din kan slutte å virke ved endring av enkelte innstillinger. Vennligst forlat denne siden med mindre du er komfortabel med dette og vet hvordan du bruker denne funksjonen riktig.";
+$a->strings["Poke/Prod"] = "Prikke/oppildne";
+$a->strings["poke, prod or do other things to somebody"] = "prikke, oppildne eller gjør andre ting med noen";
+$a->strings["Recipient"] = "Mottaker";
+$a->strings["Choose what you wish to do to recipient"] = "Velg hva du ønsker å gjøre med mottakeren";
+$a->strings["Make this post private"] = "Gjør dette innlegget privat";
+$a->strings["Profile not found."] = "Profilen ble ikke funnet.";
+$a->strings["Profile deleted."] = "Profilen er slettet.";
+$a->strings["Profile-"] = "Profil-";
+$a->strings["New profile created."] = "Ny profil opprettet.";
+$a->strings["Profile unavailable to clone."] = "Profilen er utilgjengelig for klonen.";
+$a->strings["Profile unavailable to export."] = "Profilen er utilgjengelig for eksport.";
+$a->strings["Profile Name is required."] = "Profilnavn er påkrevd.";
+$a->strings["Marital Status"] = "Sivilstand";
+$a->strings["Romantic Partner"] = "Romantisk partner";
+$a->strings["Likes"] = "Liker";
+$a->strings["Dislikes"] = "Liker ikke";
+$a->strings["Work/Employment"] = "Arbeid/sysselsetting";
+$a->strings["Religion"] = "Religion";
+$a->strings["Political Views"] = "Politiske synspunkter";
+$a->strings["Sexual Preference"] = "Seksuelle preferanser";
+$a->strings["Homepage"] = "Hjemmeside";
+$a->strings["Interests"] = "Interesser";
+$a->strings["Address"] = "Adresse";
+$a->strings["Profile updated."] = "Profilen er oppdatert.";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Skjul kontakt-/vennelisten din fra de som ser på denne profilen?";
+$a->strings["Edit Profile Details"] = "Endre profildetaljer";
+$a->strings["View this profile"] = "Vis denne profilen";
+$a->strings["Change Profile Photo"] = "Endre profilbilde";
+$a->strings["Create a new profile using these settings"] = "Lag en ny profil ved å bruke disse innstillingene";
+$a->strings["Clone this profile"] = "Klon denne profilen";
+$a->strings["Delete this profile"] = "Slett denne profilen";
+$a->strings["Import profile from file"] = "Importer profil fra fil";
+$a->strings["Export profile to file"] = "Eksporter profil til fil";
+$a->strings["Profile Name:"] = "Profilnavn:";
+$a->strings["Your Full Name:"] = "Ditt fulle navn:";
+$a->strings["Title/Description:"] = "Tittel/Beskrivelse:";
+$a->strings["Your Gender:"] = "Ditt kjønn:";
+$a->strings["Birthday :"] = "Fødselsdag:";
+$a->strings["Street Address:"] = "Gateadresse:";
+$a->strings["Locality/City:"] = "Sted/By:";
+$a->strings["Postal/Zip Code:"] = "Postnummer/ZIP-kode:";
+$a->strings["Country:"] = "Land:";
+$a->strings["Region/State:"] = "Region/fylke:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Sivilstand:";
+$a->strings["Who: (if applicable)"] = "Hvem: (hvis det er aktuelt) ";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Eksempler: kari123, Kari Villiamsen, kari@example.com";
+$a->strings["Since [date]:"] = "Siden [dato]:";
+$a->strings["Homepage URL:"] = "Hjemmeside URL:";
+$a->strings["Religious Views:"] = "Religiøse synspunkter:";
+$a->strings["Keywords:"] = "Nøkkelord:";
+$a->strings["Example: fishing photography software"] = "Eksempel: fisking fotografering programvare";
+$a->strings["Used in directory listings"] = "Brukt i katalogoppføringer";
+$a->strings["Tell us about yourself..."] = "Fortell oss om deg selv...";
+$a->strings["Hobbies/Interests"] = "Hobbier/Interesser";
+$a->strings["Contact information and Social Networks"] = "Kontaktinformasjon og sosiale nettverk";
+$a->strings["My other channels"] = "Mine andre kanaler";
+$a->strings["Musical interests"] = "Musikkinteresser";
+$a->strings["Books, literature"] = "Bøker, litteratur";
+$a->strings["Television"] = "TV/fjernsyn";
+$a->strings["Film/dance/culture/entertainment"] = "Film/dans/kultur/underholdning";
+$a->strings["Love/romance"] = "Kjærlighet/romantikk";
+$a->strings["Work/employment"] = "Arbeid/sysselsetting";
+$a->strings["School/education"] = "Skole/utdanning";
+$a->strings["This is your default profile."] = "Dette er din standardprofil.";
+$a->strings["Age: "] = "Alder:";
+$a->strings["Edit/Manage Profiles"] = "Endre/håndter profiler";
+$a->strings["Add profile things"] = "Legg til profilting";
+$a->strings["Include desirable objects in your profile"] = "Inkluder ønskverdige objekter i din profil";
 $a->strings["Could not access contact record."] = "Fikk ikke tilgang til kontaktinformasjonen.";
 $a->strings["Could not locate selected profile."] = "Fant ikke valgt profil.";
 $a->strings["Connection updated."] = "Forbindelsen er oppdatert.";
@@ -1146,15 +1323,17 @@ $a->strings["Accept connection to allow communication"] = "Godta denne forbindel
 $a->strings["Set Affinity"] = "Angi nærhet";
 $a->strings["Set Profile"] = "Angi profil";
 $a->strings["Set Affinity & Profile"] = "Angi nærhet og profil";
+$a->strings["none"] = "ingen";
 $a->strings["Apply these permissions automatically"] = "Bruk disse tillatelsene automatisk";
-$a->strings["This connection's address is"] = "Denne forbindelsens adresse er";
+$a->strings["This connection's primary address is"] = "Denne forbindelsens primære adresse er";
+$a->strings["Available locations:"] = "Tilgjengelige plasseringer:";
 $a->strings["The permissions indicated on this page will be applied to all new connections."] = "Tillatelsene angitt på denne siden gjøres gjeldende for alle nye forbindelser.";
 $a->strings["Slide to adjust your degree of friendship"] = "Flytt for å justere din grad av vennskap";
 $a->strings["Slide to adjust your rating"] = "Flytt for å justere din vurdering";
 $a->strings["Optionally explain your rating"] = "Velg om du vil forklare vurderingen";
 $a->strings["Custom Filter"] = "Tilpasset filter";
 $a->strings["Only import posts with this text"] = "Bare importer innlegg med disse ordene";
-$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "ett ord per linje eller #merkelapper eller /mønstre/, la feltet stå tomt for å importere alle innlegg";
+$a->strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "ord per linje eller #merkelapper eller /mønster/ eller språk lang=xx, la stå blankt for å importere alle innlegg";
 $a->strings["Do not import posts with this text"] = "Ikke importer innlegg med denne teksten";
 $a->strings["This information is public!"] = "Denne informasjonen er offentlig!";
 $a->strings["Connection Pending Approval"] = "Forbindelse venter på godkjenning";
@@ -1170,70 +1349,9 @@ $a->strings["Individual Permissions"] = "Individuelle tillatelser";
 $a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Noen tillatelser kan være arvet fra din kanals <a ref=\"settings\"><strong>personverninnstillinger</strong></a>, som har høyere prioritet enn individuelle innstillinger. Du kan <strong>ikke</strong> endre arvede innstillingene her.";
 $a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Noen tillatelser kan være arvet fra din kanals <a ref=\"settings\"><strong>personverninnstillinger</strong></a>, som har høyere prioritet enn individuelle innstillinger. Du kan endre disse innstillingene her, men de vil ikke få noen effekt før de arvede innstillingene endres.";
 $a->strings["Last update:"] = "Siste oppdatering:";
-$a->strings["Set your current mood and tell your friends"] = "Angi ditt nåværende humør og fortell dine venner";
-$a->strings["Hub not found."] = "Hubben ble ikke funnet.";
-$a->strings["This setting requires special processing and editing has been blocked."] = "Denne innstillingen krever spesiell behandling og redigering har blitt blokkert.";
-$a->strings["Configuration Editor"] = "Konfigurasjonsbehandler";
-$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Advarsel: kanalen din kan slutte å virke ved endring av enkelte innstillinger. Vennligst forlat denne siden med mindre du er komfortabel med dette og vet hvordan du bruker denne funksjonen riktig.";
-$a->strings["Public Sites"] = "Offentlige nettsteder";
-$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Nettstedene på listen tillater offentlig registrering i \$Projectname-nettverket. Alle nettsteder i nettverket er forbundet så medlemskap på enhver av dem formidler medlemskap i hele matrix. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Tilbyderlenkene <strong>kan</strong> gi tilleggsopplysninger.";
-$a->strings["Rate this hub"] = "Vurder denne hubben";
-$a->strings["Site URL"] = "Nettstedets URL";
-$a->strings["Access Type"] = "Tilgangstype";
-$a->strings["Registration Policy"] = "Retningslinjer for registrering";
-$a->strings["Location"] = "Plassering";
-$a->strings["View hub ratings"] = "Vis vurderinger av hubben";
-$a->strings["Rate"] = "Vurder";
-$a->strings["View ratings"] = "Vis vurderinger";
-$a->strings["Permission Denied."] = "Tillatelse avvist.";
-$a->strings["File not found."] = "Filen ble ikke funnet.";
-$a->strings["Edit file permissions"] = "Endre filtillatelser";
-$a->strings["Set/edit permissions"] = "Angi/endre tillatelser";
-$a->strings["Include all files and sub folders"] = "Inkluder alle filer og undermapper";
-$a->strings["Return to file list"] = "GÃ¥ tilbake til filoversikten";
-$a->strings["Copy/paste this code to attach file to a post"] = "Kopier og lim inn denne koden for å legge til filen i et innlegg";
-$a->strings["Copy/paste this URL to link file from a web page"] = "Kopier og lim inn denne URL-en for å lenke til filen fra en webside";
-$a->strings["Share this file"] = "Del denne filen";
-$a->strings["Show URL to this file"] = "Vis URLen til denne filen";
-$a->strings["Notify your contacts about this file"] = "Varsle dine kontakter om denne filen";
-$a->strings["Layout Name"] = "Layout-navn";
-$a->strings["Layout Description (Optional)"] = "Layoutens beskrivelse (valgfritt)";
-$a->strings["Comanche page description language help"] = "Hjelp med Comanche sidebeskrivelsesspråk";
-$a->strings["Layout Description"] = "Layout-beskrivelse";
-$a->strings["Download PDL file"] = "Last ned PDL-fil";
-$a->strings["Poke/Prod"] = "Prikke/oppildne";
-$a->strings["poke, prod or do other things to somebody"] = "prikke, oppildne eller gjør andre ting med noen";
-$a->strings["Recipient"] = "Mottaker";
-$a->strings["Choose what you wish to do to recipient"] = "Velg hva du ønsker å gjøre med mottakeren";
-$a->strings["Make this post private"] = "Gjør dette innlegget privat";
-$a->strings["No such group"] = "Gruppen finnes ikke";
-$a->strings["No such channel"] = "Ingen slik kanal";
-$a->strings["forum"] = "forum";
-$a->strings["Search Results For:"] = "Søkeresultat for:";
-$a->strings["Collection is empty"] = "Samlingen er tom";
-$a->strings["Collection: "] = "Samling:";
-$a->strings["Invalid connection."] = "Ugyldig forbindelse.";
-$a->strings["You must be logged in to see this page."] = "Du må være innloegget for å se denne siden.";
-$a->strings["Room not found"] = "Rommet ble ikke funnet";
-$a->strings["Leave Room"] = "Forlat rom";
-$a->strings["Delete This Room"] = "Slett dette rommet";
-$a->strings["I am away right now"] = "Jeg er borte akkurat nå";
-$a->strings["I am online"] = "Jeg er online";
-$a->strings["Bookmark this room"] = "Bokmerk dette rommet";
-$a->strings["New Chatroom"] = "Nytt chatrom";
-$a->strings["Chatroom Name"] = "Navn på chatrom";
-$a->strings["%1\$s's Chatrooms"] = "%1\$s sine chatrom";
-$a->strings["Items tagged with: %s"] = "Elementer merket med: %s";
-$a->strings["Search results for: %s"] = "Søkeresultater for: %s";
-$a->strings["Conversation removed."] = "Samtale fjernet.";
-$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Utilstrekkelig tillatelse. Forespørsel omdirigert til profilsiden.";
-$a->strings["Item not found"] = "Elementet ble ikke funnet.";
-$a->strings["Item is not editable"] = "Elementet kan ikke endres";
-$a->strings["Delete item?"] = "Slett element?";
-$a->strings["Insert YouTube video"] = "Sett inn YouTube-video";
-$a->strings["Insert Vorbis [.ogg] video"] = "Sett inn Vorbis [.ogg] video";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Legg i";
-$a->strings["Edit post"] = "Endre innlegg";
+$a->strings["network"] = "nettverk";
+$a->strings["RSS"] = "RSS";
+$a->strings["\$Projectname channel"] = "\$Projectname-kanal";
 $a->strings["Invalid message"] = "Ugyldig melding";
 $a->strings["no results"] = "ingen resultater";
 $a->strings["Delivery report for %1\$s"] = "Leveringsrapport for %1\$s";
@@ -1244,19 +1362,216 @@ $a->strings["accepted for delivery"] = "akseptert for levering";
 $a->strings["updated"] = "oppdatert";
 $a->strings["update ignored"] = "oppdatering ignorert";
 $a->strings["permission denied"] = "tillatelse avvist";
-$a->strings["Delete block?"] = "Slett byggeklossen?";
-$a->strings["Edit Block"] = "Endre byggekloss";
-$a->strings["\$Projectname"] = "\$Projectname";
-$a->strings["Welcome to %s"] = "Velkommen til %s";
-$a->strings["Unable to locate original post."] = "Ikke i stand til å finne opprinnelig innlegg.";
-$a->strings["Empty post discarded."] = "Tomt innlegg forkastet.";
-$a->strings["Executable content type not permitted to this channel."] = "Kjørbar innholdstype er ikke tillat for denne kanalen.";
-$a->strings["System error. Post not saved."] = "Systemfeil. Innlegg ble ikke lagret.";
-$a->strings["Unable to obtain post information from database."] = "Ikke i stand til å få tak i informasjon om innlegg fra databasen.";
-$a->strings["You have reached your limit of %1$.0f top level posts."] = "Du har nådd din grense på %1$.0f startinnlegg.";
-$a->strings["You have reached your limit of %1$.0f webpages."] = "Du har nådd din grense på %1$.0f websider.";
+$a->strings["recipient not found"] = "mottaker ble ikke funnet";
+$a->strings["mail recalled"] = "melding tilbakekalt";
+$a->strings["duplicate mail received"] = "duplikat av melding mottatt";
+$a->strings["mail delivered"] = "melding mottatt";
+$a->strings["Item not found"] = "Elementet ble ikke funnet.";
+$a->strings["Delete webpage?"] = "Slett webside?";
+$a->strings["Page link title"] = "Sidens lenketittel";
+$a->strings["Insert YouTube video"] = "Sett inn YouTube-video";
+$a->strings["Insert Vorbis [.ogg] video"] = "Sett inn Vorbis [.ogg] video";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Legg i";
+$a->strings["Edit Webpage"] = "Endre webside";
 $a->strings["Unable to find your hub."] = "Ikke i stand til å finne hubben din.";
 $a->strings["Post successful."] = "Innlegg vellykket.";
+$a->strings["sent you a private message"] = "sendte deg en privat melding";
+$a->strings["added your channel"] = "la til din kanal";
+$a->strings["posted an event"] = "la ut en hendelse";
+$a->strings["Authorize application connection"] = "Tillat programforbindelse";
+$a->strings["Return to your app and insert this Securty Code:"] = "GÃ¥ tilbake til din app og legg inn denne sikkerhetskoden:";
+$a->strings["Please login to continue."] = "Vennligst logg inn for å fortsette.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vil du tillate dette programmet å få tilgang til dine innlegg og kontakter, og/eller lage nye innlegg for deg?";
+$a->strings["No more system notifications."] = "Ingen flere systemvarsler.";
+$a->strings["System Notifications"] = "Systemvarsler";
+$a->strings["Select a bookmark folder"] = "Velg en bokmerkemappe";
+$a->strings["Save Bookmark"] = "Lagre bokmerke";
+$a->strings["URL of bookmark"] = "URL-en til bokmerket";
+$a->strings["Description"] = "Beskrivelse";
+$a->strings["Or enter new bookmark folder name"] = "Eller skriv nytt navn på bokmerkemappe";
+$a->strings["Contact not found."] = "Kontakten ble ikke funnet.";
+$a->strings["Friend suggestion sent."] = "Venneforespørsel sendt.";
+$a->strings["Suggest Friends"] = "Foreslå venner";
+$a->strings["Suggest a friend for %s"] = "Foreslå en venn for %s";
+$a->strings["Failed to create source. No channel selected."] = "Mislyktes med å lage kilde. Ingen kanal er valgt.";
+$a->strings["Source created."] = "Kilden er laget.";
+$a->strings["Source updated."] = "Kilden er oppdatert.";
+$a->strings["*"] = "*";
+$a->strings["Manage remote sources of content for your channel."] = "HÃ¥ndtere eksterne innholdskilder til din kanal.";
+$a->strings["New Source"] = "Ny kilde";
+$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importer alt eller et utvalgt av innhold fra følgende kanal inn i denne kanalen og distribuer det i henhold til dine egne kanalinnstillinger.";
+$a->strings["Only import content with these words (one per line)"] = "Bare importer innhold med disse ordene (ett ord per linje)";
+$a->strings["Leave blank to import all public content"] = "La stå tomt for å importere alt offentlig innhold";
+$a->strings["Source not found."] = "Kilden ble ikke funnet.";
+$a->strings["Edit Source"] = "Endre kilde";
+$a->strings["Delete Source"] = "Slett kilde";
+$a->strings["Source removed"] = "Kilden er fjernet";
+$a->strings["Unable to remove source."] = "Ikke i stand til å fjerne kilde.";
+$a->strings["Invalid request identifier."] = "Ugyldig forespørselsidentifikator.";
+$a->strings["Discard"] = "Forkast";
+$a->strings["Tag removed"] = "Merkelapp fjernet";
+$a->strings["Remove Item Tag"] = "Fjern merkelapp fra element";
+$a->strings["Select a tag to remove: "] = "Velg merkelapp å fjerne:";
+$a->strings["Remove"] = "Fjern";
+$a->strings["%d rating"] = array(
+	0 => "%d vurdering",
+	1 => "%d vurderinger",
+);
+$a->strings["Gender: "] = "Kjønn:";
+$a->strings["Status: "] = "Status:";
+$a->strings["Homepage: "] = "Hjemmeside:";
+$a->strings["Description:"] = "Beskrivelse:";
+$a->strings["Public Forum:"] = "Offentlig forum:";
+$a->strings["Keywords: "] = "Nøkkelord:";
+$a->strings["Don't suggest"] = "Ikke foreslå";
+$a->strings["Common connections:"] = "Felles forbindelser:";
+$a->strings["Global Directory"] = "Global katalog";
+$a->strings["Local Directory"] = "Lokal katalog";
+$a->strings["Finding:"] = "Finner:";
+$a->strings["next page"] = "Neste side";
+$a->strings["previous page"] = "Forrige side";
+$a->strings["Sort options"] = "Sorteringsvalg";
+$a->strings["Alphabetic"] = "Alfabetisk";
+$a->strings["Reverse Alphabetic"] = "Omvendt alfabetisk";
+$a->strings["Newest to Oldest"] = "Nyest til eldst";
+$a->strings["Oldest to Newest"] = "Eldst til nyest";
+$a->strings["No entries (some entries may be hidden)."] = "Ingen oppføringer (noen oppføringer kan være skjult).";
+$a->strings["No valid account found."] = "Ingen gyldig konto funnet.";
+$a->strings["Password reset request issued. Check your email."] = "Forespørsel om å tilbakestille passord er mottatt. Sjekk e-posten din.";
+$a->strings["Site Member (%s)"] = "Nettstedsmedlem (%s)";
+$a->strings["Password reset requested at %s"] = "Forespurt om å tilbakestille passord hos %s";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Forespørsel kunne ikke bekreftes. (Du kan ha sendt den inn tidligere.) Tilbakestilling av passord mislyktes.";
+$a->strings["Password Reset"] = "Tilbakestill passord";
+$a->strings["Your password has been reset as requested."] = "Ditt passord har blitt tilbakestilt som forespurt.";
+$a->strings["Your new password is"] = "Ditt nye passord er";
+$a->strings["Save or copy your new password - and then"] = "Lagre eller kopier ditt nye passord, og deretter kan du";
+$a->strings["click here to login"] = "klikke her for å logge inn";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Ditt passord kan endres på siden <em>Innstillinger</em> etter vellykket innlogging.";
+$a->strings["Your password has changed at %s"] = "Ditt passord er endret hos %s";
+$a->strings["Forgot your Password?"] = "Glemt passord ditt?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Skriv e-postadressen din og send inn for å tilbakestille passordet ditt. Sjekk deretter din e-post for videre instruksjoner.";
+$a->strings["Email Address"] = "E-postadresse";
+$a->strings["Reset"] = "Tilbakestill";
+$a->strings["This site is not a directory server"] = "Dette nettstedet er ikke en katalogtjener";
+$a->strings["%s element installed"] = "%s element installert";
+$a->strings["%s element installation failed"] = "Installasjon av %s-element mislyktes";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s følger %2\$s sin %3\$s";
+$a->strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s stopped å følge %2\$s sin %3\$s";
+$a->strings["Your service plan only allows %d channels."] = "Din tjenesteplan tillater bare %d kanaler.";
+$a->strings["Nothing to import."] = "Ingenting å importere.";
+$a->strings["Unable to download data from old server"] = "Ikke i stand til å laste ned data fra gammel tjener";
+$a->strings["Imported file is empty."] = "Importert fil er tom.";
+$a->strings["Warning: Database versions differ by %1\$d updates."] = "Advarsel: databaseversjoner avviker med %1\$d oppdateringer.";
+$a->strings["No channel. Import failed."] = "Ingen kanal. Import mislyktes.";
+$a->strings["You must be logged in to use this feature."] = "Du må være innlogget for å bruke denne funksjonen.";
+$a->strings["Import Channel"] = "Importer kanal";
+$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Bruk dette skjemaet for å importere en eksisterende kanal fra en annen tjener/hub. Du kan hente inn kanalidentiteten fra den gamle tjeneren/huben via nettverket eller ved å bruke en eksportfil.";
+$a->strings["File to Upload"] = "Fil som skal lastes opp";
+$a->strings["Or provide the old server/hub details"] = "Eller oppgi detaljene fra den gamle tjeneren/hub-en";
+$a->strings["Your old identity address (xyz@example.com)"] = "Din gamle identitetsadresse (xyz@example.com)";
+$a->strings["Your old login email address"] = "Din gamle innloggings e-postadresse";
+$a->strings["Your old login password"] = "Ditt gamle innloggingspassord";
+$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Enten du tar det ene eller det andre valget, vennligst angi om du vil at denne hubben skal være din nye primære adresse, eller om din gamle plassering skal fortsette å ha denne rollen. Du kan lage innlegg fra den ene eller den andre plasseringen, men bare en av dem kan markeres som den primære plasseringen for filer, bilder og media.";
+$a->strings["Make this hub my primary location"] = "Gjør dette nettstedet til min primære plassering";
+$a->strings["Import existing posts if possible (experimental - limited by available memory"] = "Importer eksisterende innlegg om mulig (eksperimentelt - begrenset av tilgjengelig minne)";
+$a->strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Denne prosessen kan ta flere minutter å fullføre. Vennligst send inn dette skjemaet bare en gang og la siden være åpen inntil den er ferdig.";
+$a->strings["Total invitation limit exceeded."] = "Grensen for totalt antall invitasjoner er overskredet.";
+$a->strings["%s : Not a valid email address."] = "%s : ikke en gyldig e-postadresse.";
+$a->strings["Please join us on \$Projectname"] = "Bli med oss på \$Projectname";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Invitasjonsgrensen er overskredet. Vennligst kontakt administratoren ved ditt nettsted.";
+$a->strings["%s : Message delivery failed."] = "%s : meldingslevering feilet.";
+$a->strings["%d message sent."] = array(
+	0 => "%d melding sendt.",
+	1 => "%d meldinger sendt.",
+);
+$a->strings["You have no more invitations available"] = "Du har ikke flere invitasjoner tilgjengelig";
+$a->strings["Send invitations"] = "Send invitasjoner";
+$a->strings["Enter email addresses, one per line:"] = "Skriv e-postadresser, en per linje:";
+$a->strings["Your message:"] = "Din melding:";
+$a->strings["Please join my community on \$Projectname."] = "Du er velkommen til å bli med i mitt fellesskap på \$Projectname.";
+$a->strings["You will need to supply this invitation code: "] = "Du må oppgi denne invitasjonskoden:";
+$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registrer ved enhver \$Projectname-lokasjon (de er alle forbundet med hverandre)";
+$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Skriv inn min \$Projectname-adresse i nettstedets søkefelt.";
+$a->strings["or visit "] = "eller besøk";
+$a->strings["3. Click [Connect]"] = "3. Klikk [Forbindelse]";
+$a->strings["Fetching URL returns error: %1\$s"] = "Henting av URL gir følgende feil: %1\$s";
+$a->strings["Image uploaded but image cropping failed."] = "Bildet ble lastet opp, men beskjæring av bildet mislyktes.";
+$a->strings["Image resize failed."] = "Endring av bildestørrelse mislyktes.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Hold nede Shift-knappen og last siden på nytt eller tøm nettleserens mellomlager hvis det nye bildet ikke vises umiddelbart.";
+$a->strings["Image upload failed."] = "Opplasting av bildet mislyktes.";
+$a->strings["Unable to process image."] = "Kan ikke behandle bildet.";
+$a->strings["female"] = "kvinne";
+$a->strings["%1\$s updated her %2\$s"] = "%1\$s oppdaterte %2\$s sitt";
+$a->strings["male"] = "mann";
+$a->strings["%1\$s updated his %2\$s"] = "%1\$s oppdaterte %2\$s sitt";
+$a->strings["%1\$s updated their %2\$s"] = "%1\$s oppdaterte %2\$s deres";
+$a->strings["profile photo"] = "profilbilde";
+$a->strings["Photo not available."] = "Bildet er ikke tilgjengelig.";
+$a->strings["Upload File:"] = "Last opp fil:";
+$a->strings["Select a profile:"] = "Velg en profil:";
+$a->strings["Upload Profile Photo"] = "Last opp profilbilde:";
+$a->strings["or"] = "eller";
+$a->strings["skip this step"] = "hopp over dette steget";
+$a->strings["select a photo from your photo albums"] = "velg et bilde fra dine fotoalbum";
+$a->strings["Crop Image"] = "Beskjær bildet";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Vennligst juster bildebeskjæringen for optimal visning.";
+$a->strings["Done Editing"] = "Avslutt redigering";
+$a->strings["Thing updated"] = "Tingen er oppdatert";
+$a->strings["Object store: failed"] = "Objektlagring: mislyktes";
+$a->strings["Thing added"] = "Ting lagt til";
+$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+$a->strings["Show Thing"] = "Vis ting";
+$a->strings["item not found."] = "element ble ikke funnet.";
+$a->strings["Edit Thing"] = "Endre ting";
+$a->strings["Select a profile"] = "Velg en profil";
+$a->strings["Post an activity"] = "Legg inn en aktivitet";
+$a->strings["Only sends to viewers of the applicable profile"] = "Sender bare til seere av den aktuelle profilen";
+$a->strings["Name of thing e.g. something"] = "Navn på ting for eksempel noe";
+$a->strings["URL of thing (optional)"] = "URL til ting (valgfritt)";
+$a->strings["URL for photo of thing (optional)"] = "URL til bilde av ting (valgfritt)";
+$a->strings["Add Thing to your Profile"] = "Legg til ting i din profil";
+$a->strings["This directory server requires an access token"] = "Denne katalogtjeneren krever en tilgangsnøkkel (access token)";
+$a->strings["Delete block?"] = "Slett byggeklossen?";
+$a->strings["Edit Block"] = "Endre byggekloss";
+$a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "Sletting av kontoer er ikke tillatt innen 48 timer etter endring av kontopassordet.";
+$a->strings["Remove This Account"] = "Slett denne kontoen";
+$a->strings["This account and all its channels will be completely removed from the network. "] = "Denne kontoen og alle dens kanaler vil bli fullstendig fjernet fra nettverket.";
+$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Slett denne kontoen, alle dens kanaler og alle dens kanalkloner fra dette nettverket";
+$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Som standard vil bare forekomster av kanalene lokalisert på denne hubben bli slettet fra nettverket";
+$a->strings["Remove Account"] = "Slett konto";
+$a->strings["Import completed"] = "Import ferdig";
+$a->strings["Import Items"] = "Importer elementer";
+$a->strings["Use this form to import existing posts and content from an export file."] = "Bruk dette skjemaet for å importere eksisterende innlegg og innhold fra en eksportfil.";
+$a->strings["No such group"] = "Gruppen finnes ikke";
+$a->strings["No such channel"] = "Ingen slik kanal";
+$a->strings["forum"] = "forum";
+$a->strings["Search Results For:"] = "Søkeresultat for:";
+$a->strings["Collection is empty"] = "Samlingen er tom";
+$a->strings["Collection: "] = "Samling:";
+$a->strings["Invalid connection."] = "Ugyldig forbindelse.";
+$a->strings["Layout updated."] = "Layout er oppdatert.";
+$a->strings["Edit System Page Description"] = "Endre beskrivelsen av systemsiden";
+$a->strings["Layout not found."] = "Layouten ble ikke funnet.";
+$a->strings["Module Name:"] = "Modulnavn:";
+$a->strings["Layout Help"] = "Layout-hjelp";
+$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Antallet daglige registreringer ved nettstedet er overskredet. Vær vennlig å prøve igjen imorgen.";
+$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Vennligst angi at tjenesteavtalen er akseptert. Registrering mislyktes.";
+$a->strings["Passwords do not match."] = "Passordene er ikke like.";
+$a->strings["Registration successful. Please check your email for validation instructions."] = "Registreringen er vellykket. Vennligst sjekk e-posten din for å bekrefte opprettelsen.";
+$a->strings["Your registration is pending approval by the site owner."] = "Din registrering venter på godkjenning av nettstedets eier.";
+$a->strings["Your registration can not be processed."] = "Din registrering kan ikke behandles.";
+$a->strings["Registration on this site/hub is by approval only."] = "Registrering på dette nettstedet/denne hubben skjer bare gjennom godkjenning.";
+$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registrer på et annet tilknyttet nettsted/hub</a>";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Dette nettstedet har overskredet antallet tillate kontoregistreringer per dag. Vennligst prøv igjen imorgen.";
+$a->strings["Terms of Service"] = "Tjenesteavtale";
+$a->strings["I accept the %s for this website"] = "Jeg godtar %s for dette nettstedet";
+$a->strings["I am over 13 years of age and accept the %s for this website"] = "Jeg er over 13 år gammel og aksepterer %s for dette nettstedet.";
+$a->strings["Registration"] = "Registrering";
+$a->strings["Membership on this site is by invitation only."] = "Medlemskap ved dette nettstedet skjer kun via invitasjon.";
+$a->strings["Please enter your invitation code"] = "Vennligst skriv din invitasjonskode";
+$a->strings["Your email address"] = "Din e-postadresse";
+$a->strings["Choose a password"] = "Velg et passord";
+$a->strings["Please re-enter your password"] = "Vennligst skriv ditt passord en gang til";
 $a->strings["Theme settings updated."] = "Temainnstillinger er oppdatert.";
 $a->strings["# Accounts"] = "# Kontoer";
 $a->strings["# blocked accounts"] = "# blokkerte kontoer";
@@ -1282,7 +1597,6 @@ $a->strings["My site is not a public server"] = "Mitt nettsted er ikke en offent
 $a->strings["My site has paid access only"] = "Mitt nettsted gir kun tilgang mot betaling";
 $a->strings["My site has free access only"] = "Mitt nettsted har kun gratis tilgang";
 $a->strings["My site offers free accounts with optional paid upgrades"] = "Mitt nettsted tilbyr gratis konto med valgfri oppgradering til betalt tjeneste";
-$a->strings["Registration"] = "Registrering";
 $a->strings["File upload"] = "Last opp fil";
 $a->strings["Policies"] = "Retningslinjer";
 $a->strings["Site name"] = "Nettstedets navn";
@@ -1299,6 +1613,8 @@ $a->strings["(Heavy system resource usage)"] = "(Tung bruk av systemressurser)";
 $a->strings["Maximum image size"] = "Største bildestørrelse";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Største størrelse i bytes for opplastede bilder. Standard er 0, som betyr ubegrenset.";
 $a->strings["Does this site allow new member registration?"] = "Tillater dette nettstedet registrering av nye medlemmer?";
+$a->strings["Invitation only"] = "Kun inviterte";
+$a->strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Tillat bare nye medlemsregistreringer med en invitasjonskode. Ovenstående retningslinjer for registrering må være satt til Ja.";
 $a->strings["Which best describes the types of account offered by this hub?"] = "Hvilket alternativ beskriver best hva slags kontotype som tilbys av dette nettstedet/denne hubben?";
 $a->strings["Register text"] = "Registreringstekst";
 $a->strings["Will be displayed prominently on the registration page."] = "Vil bli vist på en fremtredende måte på registreringssiden.";
@@ -1320,10 +1636,12 @@ $a->strings["Verify Email Addresses"] = "Bekreft e-postadresser";
 $a->strings["Check to verify email addresses used in account registration (recommended)."] = "Sett hake for å sjekke e-postadresser brukt ved kontoregistrering (anbefales).";
 $a->strings["Force publish"] = "Tving publisering";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Kryss av for å tvinge alle profiler på dette nettstedet til å bli oppført i nettstedet sin katalog.";
-$a->strings["Disable discovery tab"] = "Skru av oppdagelsesfanen";
-$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Fjern fanen fra nettverksvisningen med offentlig innhold trukket inn fra kilder valg for dette nettstedet.";
+$a->strings["Import Public Streams"] = "Importer offentlige innholdsstrømmer";
+$a->strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Importer og gi tilgang til offentlig innhold trukket inn fra andre nettsteder. Advarsel: dette innholdet er ikke moderert.";
 $a->strings["login on Homepage"] = "Logg inn på hjemmesiden";
 $a->strings["Present a login box to visitors on the home page if no other content has been configured."] = "Presenter en innloggingsboks til besøkende på hjemmesiden hvis ikke noe annet innhold har blitt konfigurert.";
+$a->strings["Directory Server URL"] = "Katalogtjener URL";
+$a->strings["Default directory server"] = "Standard katalogtjener";
 $a->strings["Proxy user"] = "Brukernavn mellomtjener";
 $a->strings["Proxy URL"] = "Mellomtjener URL";
 $a->strings["Network timeout"] = "Nettverk tidsavbrudd";
@@ -1407,7 +1725,6 @@ $a->strings["Uncensor"] = "Ikke sensurer lenger";
 $a->strings["Allow Code"] = "Tillat kode";
 $a->strings["Disallow Code"] = "Ikke tillat kode";
 $a->strings["UID"] = "UID";
-$a->strings["Address"] = "Adresse";
 $a->strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Valgte kanaler vil bli slettet!\\n\\nAlt innhold som er lagt inn i disse kanalene på dette nettstedet vil bli slettet for alltid!\\n\\nEr du sikker på at du vil slette disse kanalene med alt innhold?";
 $a->strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Kanalen {0} vil bli slettet!\\n\\nAlt innhold som er lagt inn i denne kanalen på dettet nettstedet vil bli slettet for alltid!\\n\\nEr du sikker på at du vil slette denne kanalen med alt innhold?";
 $a->strings["Plugin %s disabled."] = "Tilleggsfunksjonen %s er avskrudd.";
@@ -1437,322 +1754,10 @@ $a->strings["Help text"] = "Hjelpetekst";
 $a->strings["Additional info (optional)"] = "Tilleggsinformasjon (valgfritt)";
 $a->strings["Field definition not found"] = "Feltdefinisjonen ble ikke funnet";
 $a->strings["Edit Profile Field"] = "Endre profilfelt";
-$a->strings["App installed."] = "App installert.";
-$a->strings["Malformed app."] = "Feil oppsett for app-en.";
-$a->strings["Embed code"] = "Innbyggingskode";
-$a->strings["Edit App"] = "Endre app";
-$a->strings["Create App"] = "Lag app";
-$a->strings["Name of app"] = "Navn på app";
-$a->strings["Location (URL) of app"] = "Plassering (URL) til app";
-$a->strings["Description"] = "Beskrivelse";
-$a->strings["Photo icon URL"] = "Bildeikon URL";
-$a->strings["80 x 80 pixels - optional"] = "80 x80 pixler - valgfritt";
-$a->strings["Version ID"] = "Versjons-ID";
-$a->strings["Price of app"] = "Pris på app";
-$a->strings["Location (URL) to purchase app"] = "Plassering (URL) for å kjøpe app";
-$a->strings["Unable to update menu."] = "Ikke i stand til å oppdatere meny.";
-$a->strings["Unable to create menu."] = "Ikke i stand til å lage meny.";
-$a->strings["Menu Name"] = "Menynavn";
-$a->strings["Unique name (not visible on webpage) - required"] = "Unikt navn (ikke synlig på websiden) - påkrevet";
-$a->strings["Menu Title"] = "Menytittel";
-$a->strings["Visible on webpage - leave empty for no title"] = "Synlig på websiden - la stå tomt for ingen tittel";
-$a->strings["Allow Bookmarks"] = "Tillat bokmerker";
-$a->strings["Menu may be used to store saved bookmarks"] = "Menyen kan brukes til å lagre lagrede bokmerker";
-$a->strings["Submit and proceed"] = "Send inn og fortsett";
-$a->strings["Drop"] = "Slett";
-$a->strings["Bookmarks allowed"] = "Bokmerker tillatt";
-$a->strings["Delete this menu"] = "Slett denne menyen";
-$a->strings["Edit menu contents"] = "Endre menyinnholdet";
-$a->strings["Edit this menu"] = "Endre denne menyen";
-$a->strings["Menu could not be deleted."] = "Menyen kunne ikke bli slettet.";
-$a->strings["Edit Menu"] = "Endre meny";
-$a->strings["Add or remove entries to this menu"] = "Legg til eller fjern punkter i denne menyen";
-$a->strings["Menu name"] = "Menynavn";
-$a->strings["Must be unique, only seen by you"] = "Må være unik, ses bare av deg";
-$a->strings["Menu title"] = "Menytittel";
-$a->strings["Menu title as seen by others"] = "Menytittelen andre ser";
-$a->strings["Allow bookmarks"] = "Tillat bokmerker";
-$a->strings["No more system notifications."] = "Ingen flere systemvarsler.";
-$a->strings["System Notifications"] = "Systemvarsler";
-$a->strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-$a->strings["Add a Channel"] = "Legg til en kanal";
-$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "En kanal er din egen samling av relaterte web-sider. En kanal kan brukes til å samle sosiale nettverksprofiler, blogger, samtalegrupper og forum, kjendissider og mye mer. Du kan lage så mange kanaler som din tjenestetilbyder tillater.";
-$a->strings["Channel Name"] = "Kanalnavn";
-$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Eksempel: \"Ola Nordmann\", \"Lisa og hestene hennes\", \"Fotball\", \"Sykkelgruppa\"";
-$a->strings["Choose a short nickname"] = "Velg et kort kallenavn";
-$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Ditt kallenavn brukes til å lage en kanaladresse som er enkel å huske (minner om en e-postadresse) og som du kan dele med andre.";
-$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "Eller <a href=\"import\">importerer en eksisterende kanal</a> fra et annet sted.";
-$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Vennligst velg en kanaltype (for eksempel sosialt nettverk eller forum for felleskap) og krav til personvern slik at vi kan velge de beste tillatelsene for deg.";
-$a->strings["Channel Type"] = "Kanaltype";
-$a->strings["Read more about roles"] = "Les mer om roller";
-$a->strings["Invalid request identifier."] = "Ugyldig forespørselsidentifikator.";
-$a->strings["Discard"] = "Forkast";
-$a->strings["Layout updated."] = "Layout er oppdatert.";
-$a->strings["Edit System Page Description"] = "Endre beskrivelsen av systemsiden";
-$a->strings["Layout not found."] = "Layouten ble ikke funnet.";
-$a->strings["Module Name:"] = "Modulnavn:";
-$a->strings["Layout Help"] = "Layout-hjelp";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s følger %2\$s sin %3\$s";
-$a->strings["No valid account found."] = "Ingen gyldig konto funnet.";
-$a->strings["Password reset request issued. Check your email."] = "Forespørsel om å tilbakestille passord er mottatt. Sjekk e-posten din.";
-$a->strings["Site Member (%s)"] = "Nettstedsmedlem (%s)";
-$a->strings["Password reset requested at %s"] = "Forespurt om å tilbakestille passord hos %s";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Forespørsel kunne ikke bekreftes. (Du kan ha sendt den inn tidligere.) Tilbakestilling av passord mislyktes.";
-$a->strings["Password Reset"] = "Tilbakestill passord";
-$a->strings["Your password has been reset as requested."] = "Ditt passord har blitt tilbakestilt som forespurt.";
-$a->strings["Your new password is"] = "Ditt nye passord er";
-$a->strings["Save or copy your new password - and then"] = "Lagre eller kopier ditt nye passord, og deretter kan du";
-$a->strings["click here to login"] = "klikke her for å logge inn";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Ditt passord kan endres på siden <em>Innstillinger</em> etter vellykket innlogging.";
-$a->strings["Your password has changed at %s"] = "Ditt passord er endret hos %s";
-$a->strings["Forgot your Password?"] = "Glemt passord ditt?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Skriv e-postadressen din og send inn for å tilbakestille passordet ditt. Sjekk deretter din e-post for videre instruksjoner.";
-$a->strings["Email Address"] = "E-postadresse";
-$a->strings["Reset"] = "Tilbakestill";
-$a->strings["Page owner information could not be retrieved."] = "Informasjon om sideeier kunne ikke hentes.";
-$a->strings["Album not found."] = "Albumet ble ikke funnet.";
-$a->strings["Delete Album"] = "Slett album";
-$a->strings["Delete Photo"] = "Slett bilde";
-$a->strings["No photos selected"] = "Ingen bilder valgt";
-$a->strings["Access to this item is restricted."] = "Tilgang til dette elementet er begrenset.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt.";
-$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB lagringsplass til bilder er brukt.";
-$a->strings["Upload Photos"] = "Last opp bilder";
-$a->strings["Enter an album name"] = "Skriv et albumnavn";
-$a->strings["or select an existing album (doubleclick)"] = "eller velg et eksisterende album (dobbeltklikk)";
-$a->strings["Create a status post for this upload"] = "Lag et statusinnlegg for denne opplastingen";
-$a->strings["Album name could not be decoded"] = "Albumnavnet kunne ikke dekodes";
-$a->strings["Contact Photos"] = "Kontaktbilder";
-$a->strings["Show Newest First"] = "Vis nyeste først";
-$a->strings["Show Oldest First"] = "Vis eldste først";
-$a->strings["View Photo"] = "Vis foto";
-$a->strings["Edit Album"] = "Endre album";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Tillatelse avvist. Tilgang til dette elementet kan være begrenset.";
-$a->strings["Photo not available"] = "Bilde er utilgjengelig";
-$a->strings["Use as profile photo"] = "Bruk som profilbilde";
-$a->strings["Private Photo"] = "Privat bilde";
-$a->strings["Previous"] = "Forrige";
-$a->strings["View Full Size"] = "Vis i full størrelse";
-$a->strings["Next"] = "Neste";
-$a->strings["Remove"] = "Fjern";
-$a->strings["Edit photo"] = "Endre bilde";
-$a->strings["Rotate CW (right)"] = "Roter med klokka (mot høyre)";
-$a->strings["Rotate CCW (left)"] = "Roter mot klokka (venstre)";
-$a->strings["Enter a new album name"] = "Skriv et nytt albumnavn";
-$a->strings["or select an existing one (doubleclick)"] = "eller velg et eksisterende album (dobbeltklikk)";
-$a->strings["Caption"] = "Overskrift";
-$a->strings["Add a Tag"] = "Legg til merkelapp";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Eksempel: @bob, @Barbara_Jensen, @jim@example.com";
-$a->strings["Flag as adult in album view"] = "Flag som voksent i albumvisning";
-$a->strings["In This Photo:"] = "I dette bildet:";
-$a->strings["Map"] = "Kart";
-$a->strings["View Album"] = "Vis album";
-$a->strings["Recent Photos"] = "Nye bilder";
-$a->strings["\$Projectname channel"] = "\$Projectname-kanal";
-$a->strings["Website:"] = "Nettsted:";
-$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Fjerntliggende kanal [%s] (foreløpig ikke kjent på dette nettstedet)";
-$a->strings["Rating (this information is public)"] = "Vurdering (denne informasjonen er offentlig)";
-$a->strings["Optionally explain your rating (this information is public)"] = "Velg om du vil forklare din vurdering (denne informasjonen er offentlig)";
-$a->strings["Calendar entries imported."] = "Kalenderhendelsene er importert.";
-$a->strings["No calendar entries found."] = "Ingen kalenderhendelser funnet.";
-$a->strings["Event can not end before it has started."] = "Hendelsen kan ikke slutte før den starter.";
-$a->strings["Unable to generate preview."] = "Klarer ikke å lage forhåndsvisning.";
-$a->strings["Event title and start time are required."] = "Hendelsestittel og starttidspunkt er påkrevd.";
-$a->strings["Event not found."] = "Hendelsen ble ikke funnet.";
-$a->strings["l, F j"] = "l, F j";
-$a->strings["Edit event"] = "Endre hendelse";
-$a->strings["Delete event"] = "Slett hendelse";
-$a->strings["calendar"] = "kalender";
-$a->strings["Create New Event"] = "Lag ny hendelse";
-$a->strings["Export"] = "Eksport";
-$a->strings["Import"] = "Importer";
-$a->strings["Event removed"] = "Hendelse slettet";
-$a->strings["Failed to remove event"] = "Mislyktes med å slette hendelse";
-$a->strings["Event details"] = "Hendelsesdetaljer";
-$a->strings["Starting date and Title are required."] = "Startdato og Tittel er påkrevd.";
-$a->strings["Categories (comma-separated list)"] = "Kategorier (kommaseparert liste)";
-$a->strings["Event Starts:"] = "Hendelsen starter:";
-$a->strings["Finish date/time is not known or not relevant"] = "Sluttdato/-tidspunkt er ikke kjent eller ikke relevant";
-$a->strings["Event Finishes:"] = "Hendelsen slutter:";
-$a->strings["Adjust for viewer timezone"] = "Juster i forhold til tilskuerens tidssone";
-$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Viktig for hendelser som skjer på et bestemt sted. Ikke praktisk for globale ferier eller fridager.";
-$a->strings["Title:"] = "Tittel:";
-$a->strings["Share this event"] = "Del denne hendelsen";
-$a->strings["%s element installed"] = "%s element installert";
-$a->strings["%s element installation failed"] = "Installasjon av %s-element mislyktes";
-$a->strings["Fetching URL returns error: %1\$s"] = "Henting av URL gir følgende feil: %1\$s";
-$a->strings["Profile Match"] = "Profiltreff";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "Ingen nøkkelord å sammenlikne. Vennligst legg til nøkkelord til din standardprofil.";
-$a->strings["is interested in:"] = "er interessert i:";
-$a->strings["No matches"] = "Ingen treff";
-$a->strings["Image uploaded but image cropping failed."] = "Bildet ble lastet opp, men beskjæring av bildet mislyktes.";
-$a->strings["Image resize failed."] = "Endring av bildestørrelse mislyktes.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Hold nede Shift-knappen og last siden på nytt eller tøm nettleserens mellomlager hvis det nye bildet ikke vises umiddelbart.";
-$a->strings["Image upload failed."] = "Opplasting av bildet mislyktes.";
-$a->strings["Unable to process image."] = "Kan ikke behandle bildet.";
-$a->strings["female"] = "kvinne";
-$a->strings["%1\$s updated her %2\$s"] = "%1\$s oppdaterte %2\$s sitt";
-$a->strings["male"] = "mann";
-$a->strings["%1\$s updated his %2\$s"] = "%1\$s oppdaterte %2\$s sitt";
-$a->strings["%1\$s updated their %2\$s"] = "%1\$s oppdaterte %2\$s deres";
-$a->strings["profile photo"] = "profilbilde";
-$a->strings["Photo not available."] = "Bildet er ikke tilgjengelig.";
-$a->strings["Upload File:"] = "Last opp fil:";
-$a->strings["Select a profile:"] = "Velg en profil:";
-$a->strings["Upload Profile Photo"] = "Last opp profilbilde:";
-$a->strings["or"] = "eller";
-$a->strings["skip this step"] = "hopp over dette steget";
-$a->strings["select a photo from your photo albums"] = "velg et bilde fra dine fotoalbum";
-$a->strings["Crop Image"] = "Beskjær bildet";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Vennligst juster bildebeskjæringen for optimal visning.";
-$a->strings["Done Editing"] = "Avslutt redigering";
-$a->strings["Channel added."] = "Kanal lagt til.";
-$a->strings["Tag removed"] = "Merkelapp fjernet";
-$a->strings["Remove Item Tag"] = "Fjern merkelapp fra element";
-$a->strings["Select a tag to remove: "] = "Velg merkelapp å fjerne:";
-$a->strings["No ratings"] = "Ingen vurderinger";
-$a->strings["Ratings"] = "Vurderinger";
-$a->strings["Rating: "] = "Vurdering:";
-$a->strings["Website: "] = "Nettsted:";
-$a->strings["Description: "] = "Beskrivelse:";
-$a->strings["This site is not a directory server"] = "Dette nettstedet er ikke en katalogtjener";
-$a->strings["Unable to lookup recipient."] = "Ikke i stand til å slå opp mottaker.";
-$a->strings["Unable to communicate with requested channel."] = "Ikke i stand til å kommunisere med forespurt kanal.";
-$a->strings["Cannot verify requested channel."] = "Kan ikke bekrefte forespurt kanal.";
-$a->strings["Selected channel has private message restrictions. Send failed."] = "Valgt kanal har restriksjoner for private meldinger. Sending feilet.";
-$a->strings["Messages"] = "Meldinger";
-$a->strings["Message deleted."] = "Melding slettet.";
-$a->strings["Message recalled."] = "Innlegg tilbakekalt.";
-$a->strings["Send Private Message"] = "Send privat melding";
-$a->strings["To:"] = "Til:";
-$a->strings["Subject:"] = "Emne:";
-$a->strings["Your message:"] = "Din melding:";
-$a->strings["Send"] = "Send";
-$a->strings["Delete message"] = "Slett melding";
-$a->strings["Recall message"] = "Tilbakekall innlegg";
-$a->strings["Message has been recalled."] = "Innlegget har blitt tilbakekalt.";
-$a->strings["Delete Conversation"] = "Slett samtale";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Ingen sikret kommunikasjon tilgjengelig. Du kan <strong>muligens</strong> greie å svare via senderens profilside.";
-$a->strings["Send Reply"] = "Send svar";
-$a->strings["Page Title"] = "Sidetittel";
-$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Antallet daglige registreringer ved nettstedet er overskredet. Vær vennlig å prøve igjen imorgen.";
-$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Vennligst angi at tjenesteavtalen er akseptert. Registrering mislyktes.";
-$a->strings["Passwords do not match."] = "Passordene er ikke like.";
-$a->strings["Registration successful. Please check your email for validation instructions."] = "Registreringen er vellykket. Vennligst sjekk e-posten din for å bekrefte opprettelsen.";
-$a->strings["Your registration is pending approval by the site owner."] = "Din registrering venter på godkjenning av nettstedets eier.";
-$a->strings["Your registration can not be processed."] = "Din registrering kan ikke behandles.";
-$a->strings["Registration on this site/hub is by approval only."] = "Registrering på dette nettstedet/denne hubben skjer bare gjennom godkjenning.";
-$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registrer på et annet tilknyttet nettsted/hub</a>";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Dette nettstedet har overskredet antallet tillate kontoregistreringer per dag. Vennligst prøv igjen imorgen.";
-$a->strings["Terms of Service"] = "Tjenesteavtale";
-$a->strings["I accept the %s for this website"] = "Jeg godtar %s for dette nettstedet";
-$a->strings["I am over 13 years of age and accept the %s for this website"] = "Jeg er over 13 år gammel og aksepterer %s for dette nettstedet.";
-$a->strings["Membership on this site is by invitation only."] = "Medlemskap ved dette nettstedet skjer kun via invitasjon.";
-$a->strings["Please enter your invitation code"] = "Vennligst skriv din invitasjonskode";
-$a->strings["Your email address"] = "Din e-postadresse";
-$a->strings["Choose a password"] = "Velg et passord";
-$a->strings["Please re-enter your password"] = "Vennligst skriv ditt passord en gang til";
-$a->strings["Block Name"] = "Byggeklossens navn";
-$a->strings["Block Title"] = "Byggeklossens tittel";
-$a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "Sletting av kontoer er ikke tillatt innen 48 timer etter endring av kontopassordet.";
-$a->strings["Remove This Account"] = "Slett denne kontoen";
-$a->strings["This account and all its channels will be completely removed from the network. "] = "Denne kontoen og alle dens kanaler vil bli fullstendig fjernet fra nettverket.";
-$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Slett denne kontoen, alle dens kanaler og alle dens kanalkloner fra dette nettverket";
-$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Som standard vil bare forekomster av kanalene lokalisert på denne hubben bli slettet fra nettverket";
-$a->strings["Remove Account"] = "Slett konto";
-$a->strings["No service class restrictions found."] = "Ingen restriksjoner er funnet i tjenesteklasse.";
-$a->strings["Item not available."] = "Elementet er ikke tilgjengelig.";
-$a->strings["Failed to create source. No channel selected."] = "Mislyktes med å lage kilde. Ingen kanal er valgt.";
-$a->strings["Source created."] = "Kilden er laget.";
-$a->strings["Source updated."] = "Kilden er oppdatert.";
-$a->strings["*"] = "*";
-$a->strings["Manage remote sources of content for your channel."] = "HÃ¥ndtere eksterne innholdskilder til din kanal.";
-$a->strings["New Source"] = "Ny kilde";
-$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importer alt eller et utvalgt av innhold fra følgende kanal inn i denne kanalen og distribuer det i henhold til dine egne kanalinnstillinger.";
-$a->strings["Only import content with these words (one per line)"] = "Bare importer innhold med disse ordene (ett ord per linje)";
-$a->strings["Leave blank to import all public content"] = "La stå tomt for å importere alt offentlig innhold";
-$a->strings["Source not found."] = "Kilden ble ikke funnet.";
-$a->strings["Edit Source"] = "Endre kilde";
-$a->strings["Delete Source"] = "Slett kilde";
-$a->strings["Source removed"] = "Kilden er fjernet";
-$a->strings["Unable to remove source."] = "Ikke i stand til å fjerne kilde.";
-$a->strings["Remote privacy information not available."] = "Ekstern personverninformasjon er ikke tilgjengelig.";
-$a->strings["Visible to:"] = "Synlig for:";
-$a->strings["network"] = "nettverk";
-$a->strings["RSS"] = "RSS";
-$a->strings["Please login."] = "Vennligst logg inn.";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Vi støtte på et problem under innloggingen med din OpenID. Vennligst sjekk at ID-en er stavet riktig.";
-$a->strings["The error message was:"] = "Feilmeldingen var:";
-$a->strings["Authentication failed."] = "Autentisering mislyktes.";
-$a->strings["Remote Authentication"] = "Fjernautentisering";
-$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Skriv din kanaladresse (for eksempel channel@exampel.com)";
-$a->strings["Authenticate"] = "Autentiser";
-$a->strings["This directory server requires an access token"] = "Denne katalogtjeneren krever en tilgangsnøkkel (access token)";
-$a->strings["Version %s"] = "Versjon %s";
-$a->strings["Installed plugins/addons/apps:"] = "Installerte tilleggsfunksjoner/tillegg/apper:";
-$a->strings["No installed plugins/addons/apps"] = "Ingen installerte tilleggsfunksjoner/tillegg/apper";
-$a->strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Dette er en \$Projectname-hub - et globalt samhandlende nettverk av desentraliserte nettsteder med innbygget personvern.";
-$a->strings["Tag: "] = "Merkelapp:";
-$a->strings["Last background fetch: "] = "Siste innhenting i bakgrunnen:";
-$a->strings["Current load average: "] = "Gjeldende belastningsgjennomsnitt:";
-$a->strings["Running at web location"] = "Kjører på webplasseringen";
-$a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about \$Projectname."] = "Vennligst besøk <a href=\"https://redmatrix.me\">redmatrix.me</a> for å lære mer om \$Projectname.";
-$a->strings["Bug reports and issues: please visit"] = "Feilmeldinger og feilretting: vennligst besøk";
-$a->strings["\$projectname issues"] = "\$projectname problemer";
-$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Forslag, ros og så videre - vennligst e-post \"redmatrix\" hos librelist - punktum com";
-$a->strings["Site Administrators"] = "Nettstedsadministratorer";
-$a->strings["Your service plan only allows %d channels."] = "Din tjenesteplan tillater bare %d kanaler.";
-$a->strings["Nothing to import."] = "Ingenting å importere.";
-$a->strings["Unable to download data from old server"] = "Ikke i stand til å laste ned data fra gammel tjener";
-$a->strings["Imported file is empty."] = "Importert fil er tom.";
-$a->strings["Warning: Database versions differ by %1\$d updates."] = "Advarsel: databaseversjoner avviker med %1\$d oppdateringer.";
-$a->strings["No channel. Import failed."] = "Ingen kanal. Import mislyktes.";
-$a->strings["You must be logged in to use this feature."] = "Du må være innlogget for å bruke denne funksjonen.";
-$a->strings["Import Channel"] = "Importer kanal";
-$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Bruk dette skjemaet for å importere en eksisterende kanal fra en annen tjener/hub. Du kan hente inn kanalidentiteten fra den gamle tjeneren/huben via nettverket eller ved å bruke en eksportfil.";
-$a->strings["File to Upload"] = "Fil som skal lastes opp";
-$a->strings["Or provide the old server/hub details"] = "Eller oppgi detaljene fra den gamle tjeneren/hub-en";
-$a->strings["Your old identity address (xyz@example.com)"] = "Din gamle identitetsadresse (xyz@example.com)";
-$a->strings["Your old login email address"] = "Din gamle innloggings e-postadresse";
-$a->strings["Your old login password"] = "Ditt gamle innloggingspassord";
-$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Enten du tar det ene eller det andre valget, vennligst angi om du vil at denne hubben skal være din nye primære adresse, eller om din gamle plassering skal fortsette å ha denne rollen. Du kan lage innlegg fra den ene eller den andre plasseringen, men bare en av dem kan markeres som den primære plasseringen for filer, bilder og media.";
-$a->strings["Make this hub my primary location"] = "Gjør dette nettstedet til min primære plassering";
-$a->strings["Import existing posts if possible (experimental - limited by available memory"] = "Importer eksisterende innlegg om mulig (eksperimentelt - begrenset av tilgjengelig minne)";
-$a->strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Denne prosessen kan ta flere minutter å fullføre. Vennligst send inn dette skjemaet bare en gang og la siden være åpen inntil den er ferdig.";
-$a->strings["Thing updated"] = "Tingen er oppdatert";
-$a->strings["Object store: failed"] = "Objektlagring: mislyktes";
-$a->strings["Thing added"] = "Ting lagt til";
-$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-$a->strings["Show Thing"] = "Vis ting";
-$a->strings["item not found."] = "element ble ikke funnet.";
-$a->strings["Edit Thing"] = "Endre ting";
-$a->strings["Select a profile"] = "Velg en profil";
-$a->strings["Post an activity"] = "Legg inn en aktivitet";
-$a->strings["Only sends to viewers of the applicable profile"] = "Sender bare til seere av den aktuelle profilen";
-$a->strings["Name of thing e.g. something"] = "Navn på ting for eksempel noe";
-$a->strings["URL of thing (optional)"] = "URL til ting (valgfritt)";
-$a->strings["URL for photo of thing (optional)"] = "URL til bilde av ting (valgfritt)";
-$a->strings["Add Thing to your Profile"] = "Legg til ting i din profil";
-$a->strings["Total invitation limit exceeded."] = "Grensen for totalt antall invitasjoner er overskredet.";
-$a->strings["%s : Not a valid email address."] = "%s : ikke en gyldig e-postadresse.";
-$a->strings["Please join us on \$Projectname"] = "Bli med oss på \$Projectname";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Invitasjonsgrensen er overskredet. Vennligst kontakt administratoren ved ditt nettsted.";
-$a->strings["%s : Message delivery failed."] = "%s : meldingslevering feilet.";
-$a->strings["%d message sent."] = array(
-	0 => "%d melding sendt.",
-	1 => "%d meldinger sendt.",
-);
-$a->strings["You have no more invitations available"] = "Du har ikke flere invitasjoner tilgjengelig";
-$a->strings["Send invitations"] = "Send invitasjoner";
-$a->strings["Enter email addresses, one per line:"] = "Skriv e-postadresser, en per linje:";
-$a->strings["Please join my community on \$Projectname."] = "Du er velkommen til å bli med i mitt fellesskap på \$Projectname.";
-$a->strings["You will need to supply this invitation code: "] = "Du må oppgi denne invitasjonskoden:";
-$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registrer ved enhver \$Projectname-lokasjon (de er alle forbundet med hverandre)";
-$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Skriv inn min \$Projectname-adresse i nettstedets søkefelt.";
-$a->strings["or visit "] = "eller besøk";
-$a->strings["3. Click [Connect]"] = "3. Klikk [Forbindelse]";
-$a->strings["[Embedded content - reload page to view]"] = "[Innebygget innhold - last siden på nytt for å se]";
-$a->strings["Source of Item"] = "Kilde til element";
+$a->strings["Delete layout?"] = "Slett layout?";
+$a->strings["Layout Description (Optional)"] = "Layoutens beskrivelse (valgfritt)";
+$a->strings["Layout Name"] = "Layout-navn";
+$a->strings["Edit Layout"] = "Endre layout";
 $a->strings["Name is required"] = "Navn er påkrevd";
 $a->strings["Key and Secret are required"] = "Nøkkel og hemmelighet er påkrevd";
 $a->strings["Passwords do not match. Password unchanged."] = "Passordene stemmer ikke overens. Passord uforandret.";
@@ -1847,6 +1852,7 @@ $a->strings["0 or blank prevents expiration"] = "0 eller blankt forhindrer utlø
 $a->strings["Maximum Friend Requests/Day:"] = "Maksimalt antall venneforespørsler per dag:";
 $a->strings["May reduce spam activity"] = "Kan redusere søppelpostaktivitet";
 $a->strings["Default Post Permissions"] = "Standard innleggstillatelser";
+$a->strings["(click to open/close)"] = "(klikk for å åpne/lukke)";
 $a->strings["Channel permissions category:"] = "Kategori med kanaltillatelser:";
 $a->strings["Maximum private messages per day from unknown people:"] = "Maksimalt antall private meldinger per dag fra ukjente personer:";
 $a->strings["Useful to reduce spamming"] = "Nyttig for å redusere søppelpost";
@@ -1886,24 +1892,125 @@ $a->strings["Change the behaviour of this account for special situations"] = "En
 $a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = "Vennligst skru på ekspertmodus (under <a href=\"settings/features\">Innstillinger > Ekstra funksjoner</a>) for å justere!";
 $a->strings["Miscellaneous Settings"] = "Diverse innstillinger";
 $a->strings["Default photo upload folder"] = "Standard mappe for opplasting av bilder";
+$a->strings["%Y - current year, %m -  current month"] = "%Y - nåværende år, %m - nåværende måned";
 $a->strings["Default file upload folder"] = "Standard mappe for opplasting av filer";
 $a->strings["Personal menu to display in your channel pages"] = "Personlig meny som kan vises på dine kanalsider";
 $a->strings["Remove this channel."] = "Fjern denne kanalen.";
+$a->strings["Firefox Share \$Projectname provider"] = "\$Projectname Firefox Share tilbyder";
+$a->strings["Start calendar week on monday"] = "Start uken med mandag i kalenderen";
+$a->strings["Page Title"] = "Sidetittel";
+$a->strings["App installed."] = "App installert.";
+$a->strings["Malformed app."] = "Feil oppsett for app-en.";
+$a->strings["Embed code"] = "Innbyggingskode";
+$a->strings["Edit App"] = "Endre app";
+$a->strings["Create App"] = "Lag app";
+$a->strings["Name of app"] = "Navn på app";
+$a->strings["Location (URL) of app"] = "Plassering (URL) til app";
+$a->strings["Photo icon URL"] = "Bildeikon URL";
+$a->strings["80 x 80 pixels - optional"] = "80 x80 pixler - valgfritt";
+$a->strings["Version ID"] = "Versjons-ID";
+$a->strings["Price of app"] = "Pris på app";
+$a->strings["Location (URL) to purchase app"] = "Plassering (URL) for å kjøpe app";
+$a->strings["- select -"] = "- velg -";
+$a->strings["Comanche page description language help"] = "Hjelp med Comanche sidebeskrivelsesspråk";
+$a->strings["Layout Description"] = "Layout-beskrivelse";
+$a->strings["Download PDL file"] = "Last ned PDL-fil";
+$a->strings["Location not found."] = "Plassering er ikke funnet.";
+$a->strings["Location lookup failed."] = "Oppslag på plassering mislyktes.";
+$a->strings["Please select another location to become primary before removing the primary location."] = "Vennligst velg en annen plassering som primær før du sletter gjeldende primære plassering.";
+$a->strings["Syncing locations"] = "Synkroniserer plasseringer";
+$a->strings["No locations found."] = "Ingen plasseringer ble funnet.";
+$a->strings["Manage Channel Locations"] = "HÃ¥ndter kanalplasseringer";
+$a->strings["Location (address)"] = "Plassering (adresse)";
+$a->strings["Primary Location"] = "Hovedplassering";
+$a->strings["Drop location"] = "Slett plassering";
+$a->strings["Sync now"] = "Synkroniser nå";
+$a->strings["Please wait several minutes between consecutive operations."] = "Vennligst vent flere minutter mellom hver etterfølgende operasjon.";
+$a->strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Når mulig, fjern en plassering ved å logge inn på det nettstedet eller den hub-en og fjern din kanal.";
+$a->strings["Use this form to drop the location if the hub is no longer operating."] = "Bruk dette skjemaet for å fjerne plasseringen hvis huben ikke er i drift lenger.";
+$a->strings["\$Projectname"] = "\$Projectname";
+$a->strings["Welcome to %s"] = "Velkommen til %s";
+$a->strings["Please login."] = "Vennligst logg inn.";
 $a->strings["Xchan Lookup"] = "Xchan oppslag";
 $a->strings["Lookup xchan beginning with (or webbie): "] = "Slå opp xchan som begynner med (eller webbie):";
-$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du har laget %1$.0f av %2$.0f tillatte kanaler.";
-$a->strings["Create a new channel"] = "Lag en ny kanal";
-$a->strings["Current Channel"] = "Gjeldende kanal";
-$a->strings["Switch to one of your channels by selecting it."] = "Bytt til en av dine kanaler ved å velge den.";
-$a->strings["Default Channel"] = "Standardkanal";
-$a->strings["Make Default"] = "Gjør til standard";
-$a->strings["%d new messages"] = "%d nye meldinger";
-$a->strings["%d new introductions"] = "%d nye introduksjoner";
-$a->strings["Delegated Channels"] = "Delegerte kanaler";
-$a->strings["Authorize application connection"] = "Tillat programforbindelse";
-$a->strings["Return to your app and insert this Securty Code:"] = "GÃ¥ tilbake til din app og legg inn denne sikkerhetskoden:";
-$a->strings["Please login to continue."] = "Vennligst logg inn for å fortsette.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vil du tillate dette programmet å få tilgang til dine innlegg og kontakter, og/eller lage nye innlegg for deg?";
+$a->strings["Not found."] = "Ikke funnet.";
+$a->strings["You must be logged in to see this page."] = "Du må være innloegget for å se denne siden.";
+$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Utilstrekkelig tillatelse. Forespørsel omdirigert til profilsiden.";
+$a->strings["Item not available."] = "Elementet er ikke tilgjengelig.";
+$a->strings["Page owner information could not be retrieved."] = "Informasjon om sideeier kunne ikke hentes.";
+$a->strings["Album not found."] = "Albumet ble ikke funnet.";
+$a->strings["Delete Album"] = "Slett album";
+$a->strings["Delete Photo"] = "Slett bilde";
+$a->strings["No photos selected"] = "Ingen bilder valgt";
+$a->strings["Access to this item is restricted."] = "Tilgang til dette elementet er begrenset.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt.";
+$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB lagringsplass til bilder er brukt.";
+$a->strings["Upload Photos"] = "Last opp bilder";
+$a->strings["Enter an album name"] = "Skriv et albumnavn";
+$a->strings["or select an existing album (doubleclick)"] = "eller velg et eksisterende album (dobbeltklikk)";
+$a->strings["Create a status post for this upload"] = "Lag et statusinnlegg for denne opplastingen";
+$a->strings["Caption (optional):"] = "Bildetekst (valgfritt):";
+$a->strings["Description (optional):"] = "Beskrivelse (valgfritt):";
+$a->strings["Album name could not be decoded"] = "Albumnavnet kunne ikke dekodes";
+$a->strings["Contact Photos"] = "Kontaktbilder";
+$a->strings["Show Newest First"] = "Vis nyeste først";
+$a->strings["Show Oldest First"] = "Vis eldste først";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Tillatelse avvist. Tilgang til dette elementet kan være begrenset.";
+$a->strings["Photo not available"] = "Bilde er utilgjengelig";
+$a->strings["Use as profile photo"] = "Bruk som profilbilde";
+$a->strings["Private Photo"] = "Privat bilde";
+$a->strings["Previous"] = "Forrige";
+$a->strings["View Full Size"] = "Vis i full størrelse";
+$a->strings["Edit photo"] = "Endre bilde";
+$a->strings["Rotate CW (right)"] = "Roter med klokka (mot høyre)";
+$a->strings["Rotate CCW (left)"] = "Roter mot klokka (venstre)";
+$a->strings["Enter a new album name"] = "Skriv et nytt albumnavn";
+$a->strings["or select an existing one (doubleclick)"] = "eller velg et eksisterende album (dobbeltklikk)";
+$a->strings["Caption"] = "Overskrift";
+$a->strings["Add a Tag"] = "Legg til merkelapp";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Eksempel: @bob, @Barbara_Jensen, @jim@example.com";
+$a->strings["Flag as adult in album view"] = "Flag som voksent i albumvisning";
+$a->strings["In This Photo:"] = "I dette bildet:";
+$a->strings["Map"] = "Kart";
+$a->strings["View Album"] = "Vis album";
+$a->strings["Recent Photos"] = "Nye bilder";
+$a->strings["Remote privacy information not available."] = "Ekstern personverninformasjon er ikke tilgjengelig.";
+$a->strings["Visible to:"] = "Synlig for:";
+$a->strings["Export Channel"] = "Eksporter kanal";
+$a->strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Eksporter grunnleggende informasjon om kanalen din til en fil. Denne er en sikkerhetskopi av dine forbindelser, tillatelser, profil og grunnleggende data, som kan brukes til å importere dine data til en ny hub, men den tar ikke med innholdet.";
+$a->strings["Export Content"] = "Eksporter innhold";
+$a->strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Eksporter din kanalinformasjon og det nyeste innholdet til en JSON-sikkerhetskopi, som kan gjenopprettes eller importeres til en annen hub. Denne lager en sikkerhetskopi av alle dine forbindelser, tillatelser, profildata og flere måneder av innholdet ditt. Denne filen kan være SVÆRT stor. Vennligst vær tålmodig - det kan ta flere minutter før denne nedlastningen begynner.";
+$a->strings["Export your posts from a given year."] = "Eksporter dine innlegg fra et bestemt år";
+$a->strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Du kan også eksportere dine innlegg og samtaler for et bestemt år eller måned. Juster datoen i din nettlesers adresselinje for å velge andre datoer. Hvis eksporten feiler (muligens på grunn av utilstrekkelig minne på din hub), vennligst prøv igjen med et mer begrenset datoområde.";
+$a->strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "For å velge alle innlegg for et gitt år, slik som iår, besøk <a href=\"%1\$s\">%2\$s</a>";
+$a->strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "For å velge alle innlegg fra en gitt måned, slik som januar i år, besøk <a href=\"%1\$s\">%2\$s</a>";
+$a->strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Disse innholdsfilene kan importeres eller gjenopprettes ved å besøke <a href=\"%1\$s\">%2\$s</a> på ethvert nettsted som inneholder din kanal. For best resultat, vennligst importer eller gjenopprett disse etter dato (eldste først).";
+$a->strings["Item is not editable"] = "Elementet kan ikke endres";
+$a->strings["Delete item?"] = "Slett element?";
+$a->strings["Edit post"] = "Endre innlegg";
+$a->strings["Channel added."] = "Kanal lagt til.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Vi støtte på et problem under innloggingen med din OpenID. Vennligst sjekk at ID-en er stavet riktig.";
+$a->strings["The error message was:"] = "Feilmeldingen var:";
+$a->strings["Authentication failed."] = "Autentisering mislyktes.";
+$a->strings["Remote Authentication"] = "Fjernautentisering";
+$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Skriv din kanaladresse (for eksempel channel@exampel.com)";
+$a->strings["Authenticate"] = "Autentiser";
+$a->strings["Room not found"] = "Rommet ble ikke funnet";
+$a->strings["Leave Room"] = "Forlat rom";
+$a->strings["Delete This Room"] = "Slett dette rommet";
+$a->strings["I am away right now"] = "Jeg er borte akkurat nå";
+$a->strings["I am online"] = "Jeg er online";
+$a->strings["Bookmark this room"] = "Bokmerk dette rommet";
+$a->strings["New Chatroom"] = "Nytt chatrom";
+$a->strings["Chatroom Name"] = "Navn på chatrom";
+$a->strings["Expiration of chats (minutes)"] = "Chat utgår (antall minutter)";
+$a->strings["%1\$s's Chatrooms"] = "%1\$s sine chatrom";
+$a->strings["Items tagged with: %s"] = "Elementer merket med: %s";
+$a->strings["Search results for: %s"] = "Søkeresultater for: %s";
+$a->strings["Source of Item"] = "Kilde til element";
+$a->strings["Share content from Firefox to \$Projectname"] = "Del innhold fra Firefox til \$Projectname";
+$a->strings["Activate the Firefox \$Projectname provider"] = "Skru på Firefox \$Projectname tilbyderen";
+$a->strings["Hub not found."] = "Hubben ble ikke funnet.";
 $a->strings["Blocked"] = "Blokkert";
 $a->strings["Ignored"] = "Ignorert";
 $a->strings["Hidden"] = "Skjult";
@@ -1923,205 +2030,147 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
 $a->strings["Edit connection"] = "Endre forbindelse";
 $a->strings["Search your connections"] = "Søk blant dine forbindelser";
 $a->strings["Finding: "] = "Fant:";
-$a->strings["Delete layout?"] = "Slett layout?";
-$a->strings["Edit Layout"] = "Endre layout";
-$a->strings["Delete webpage?"] = "Slett webside?";
-$a->strings["Page link title"] = "Sidens lenketittel";
-$a->strings["Edit Webpage"] = "Endre webside";
-$a->strings["Collection created."] = "Samling opprettet.";
-$a->strings["Could not create collection."] = "Kunne ikke lage samling.";
-$a->strings["Collection updated."] = "Samlingen er oppdatert.";
-$a->strings["Create a collection of channels."] = "Lag en samling med kanaler.";
-$a->strings["Collection Name: "] = "Navn på samling:";
-$a->strings["Members are visible to other channels"] = "Medlemmer er synlig for andre kanaler";
-$a->strings["Collection removed."] = "Samling fjernet.";
-$a->strings["Unable to remove collection."] = "Ikke i stand til å fjerne samlingen.";
-$a->strings["Collection Editor"] = "Samlingsbehandler";
-$a->strings["Members"] = "Medlemmer";
-$a->strings["All Connected Channels"] = "Alle tilkoblede kanaler";
-$a->strings["Click on a channel to add or remove."] = "Klikk på en kanal for å legge til eller fjerne.";
-$a->strings["Continue"] = "Fortsett";
-$a->strings["Premium Channel Setup"] = "Premiumkanal-oppsett";
-$a->strings["Enable premium channel connection restrictions"] = "Slå på restriksjoner for forbindelse med premiumkanal";
-$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Vennligst skriv dine restriksjoner og betingelser, slik som PayPal-kvittering, retningslinjer for bruk, og så videre.";
-$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Denne kanalen kan kreve ytterligere steg og bekreftelse av følgende betingelser før tilkobling:";
-$a->strings["Potential connections will then see the following text before proceeding:"] = "Potensielle forbindelser vil da se følgende tekst før de går videre:";
-$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Ved å fortsette bekrefter jeg at jeg har oppfylt alle instruksjoner gitt på denne siden.";
-$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Ingen spesifikke instruksjoner er gitt av kanaleieren.)";
-$a->strings["Restricted or Premium Channel"] = "Begrenset kanal eller premiumkanal";
-$a->strings["No connections."] = "Ingen forbindelser.";
-$a->strings["Visit %s's profile [%s]"] = "Besøk %s sin profil [%s]";
-$a->strings["Location not found."] = "Plassering er ikke funnet.";
-$a->strings["Location lookup failed."] = "Oppslag på plassering mislyktes.";
-$a->strings["Please select another location to become primary before removing the primary location."] = "Vennligst velg en annen plassering som primær før du sletter gjeldende primære plassering.";
-$a->strings["No locations found."] = "Ingen plasseringer ble funnet.";
-$a->strings["Manage Channel Locations"] = "HÃ¥ndter kanalplasseringer";
-$a->strings["Location (address)"] = "Plassering (adresse)";
-$a->strings["Primary Location"] = "Hovedplassering";
-$a->strings["Drop location"] = "Slett plassering";
-$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fjernautentisering blokkert. Du er logget inn på dette nettstedet lokalt. Vennligst logg ut og prøv på nytt.";
-$a->strings["\$Projectname Server - Setup"] = "\$Projectname-tjener - oppsett";
-$a->strings["Could not connect to database."] = "Fikk ikke kontakt med databasen.";
-$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Fikk ikke kontakt med det angitte nettstedets URL. Problemet kan muligens skyldes SSL-sertifikatet eller DNS.";
-$a->strings["Could not create table."] = "Kunne ikke lage tabellen.";
-$a->strings["Your site database has been installed."] = "Databasen til ditt nettsted har blitt installert.";
-$a->strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Du må kanskje importere filen \"install/schmea_xxx.sql\" manuelt ved å bruke en databaseklient.";
-$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Vennligst les filen \"install/INSTALL.txt\".";
-$a->strings["System check"] = "Systemsjekk";
-$a->strings["Check again"] = "Sjekk igjen";
-$a->strings["Database connection"] = "Databaseforbindelse";
-$a->strings["In order to install \$Projectname we need to know how to connect to your database."] = "For å installere \$Projectname må du oppgi hvordan din database kan kontaktes.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Vennligst kontakt din nettstedstilbyder eller nettstedsadministrator hvis du har spørsmål om disse innstillingene.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Databasen du oppgir nedenfor må finnes på forhånd. Hvis den ikke finnes, vennligst lag den før du fortsetter.";
-$a->strings["Database Server Name"] = "Navn på databasetjener";
-$a->strings["Default is localhost"] = "Standard er localhost";
-$a->strings["Database Port"] = "Databaseport";
-$a->strings["Communication port number - use 0 for default"] = "Kommunikasjonsportnummer - bruk 0 for standard";
-$a->strings["Database Login Name"] = "Database innloggingsnavn";
-$a->strings["Database Login Password"] = "Database innloggingspassord";
-$a->strings["Database Name"] = "Databasenavn";
-$a->strings["Database Type"] = "Databasetype";
-$a->strings["Site administrator email address"] = "E-postadressen til administrator ved nettstedet";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Din konto sin e-postadresse må være lik denne for å kunne bruke web-administrasjonspanelet.";
-$a->strings["Website URL"] = "Nettstedets URL";
-$a->strings["Please use SSL (https) URL if available."] = "Vennligst bruk SSL (https) URL hvis tilgjengelig.";
-$a->strings["Please select a default timezone for your website"] = "Vennligst velg en standard tidssone for ditt nettsted";
-$a->strings["Site settings"] = "Nettstedets innstillinger";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Fant ikke en kommandolinjeversjon av PHP i webtjenerens sti (PATH).";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Hvis du ikke har en kommandolinjeversjon av PHP installert på tjeneren, så vil du ikke kunne kjøre bakgrunnshenting via cron.";
-$a->strings["PHP executable path"] = "PHP-kjørefilens sti";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Skriv full sti til kjørefilen for PHP. Du kan la denne stå blank for å fortsette installasjonen.";
-$a->strings["Command line PHP"] = "Kommandolinje PHP";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Kommandolinjeversjonen av PHP på ditt system har ikke \"register_argc_argv\" påskrudd.";
-$a->strings["This is required for message delivery to work."] = "Dette er påkrevd for at meldingslevering skal virke.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "Den største totale opplastingsstørrelsen du er tillatt er satt til %s. Filstørrelsen på en enkelt fil er satt til å maksimalt være %s. Du har lov til å laste opp inntil %d filer samtidig.";
-$a->strings["You can adjust these settings in the servers php.ini."] = "Du kan justere disse innstillingene i tjenerens php.ini.";
-$a->strings["PHP upload limits"] = "PHP opplastingsgrenser";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Feil: \"openssl_pkey_new\"-funksjonen på dette systemet er ikke i stand til å lage krypteringsnøkler";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Ved kjøring på Windows, vennligst se \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Generate encryption keys"] = "Lag krypteringsnøkler";
-$a->strings["libCurl PHP module"] = "libCurl PHP-modul";
-$a->strings["GD graphics PHP module"] = "GD graphics PHP-modul";
-$a->strings["OpenSSL PHP module"] = "OpenSSL PHP-modul";
-$a->strings["mysqli or postgres PHP module"] = "MySQLi eller Postgres PHP modul";
-$a->strings["mb_string PHP module"] = "mb_string PHP-modul";
-$a->strings["mcrypt PHP module"] = "mcrypt PHP-modul";
-$a->strings["xml PHP module"] = "XML PHP modul";
-$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite-modul";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Feil: Apache web-tjenerens mod-rewrite-modul er påkrevd, men ikke installert.";
-$a->strings["proc_open"] = "proc_open";
-$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Feil: proc_open er påkrevd, men er enten ikke installert eller har blitt avskrudd i php.ini";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Feil: libCURL PHP-modul er påkrevd, men er ikke installert.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Feil: GD graphics PHP-modul med JPEG-støtte er påkrevd, men er ikke installert.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Feil: openssl PHP-modul er påkrevd, men er ikke installert.";
-$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Feil: mysqli eller postgres PHP modul er påkrevd, men ingen av dem er installert.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Feil: mb_string PHP-modul er påkrevd, men  er ikke installert.";
-$a->strings["Error: mcrypt PHP module required but not installed."] = "Feil: mcrypt PHP-modul er påkrevd, men er ikke installert.";
-$a->strings["Error: xml PHP module required for DAV but not installed."] = "Feil: XML PHP modul er påkrevet for DAV, men den er ikke installert.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Web-installasjonen må kunne lage en fil kalt \".htconfig.php\" i toppkatalogen til web-tjeneren din, men dette får den ikke til.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Dette er oftest tillatelsesinnstilling, ettersom webtjeneren kanskje kan skrive til filer i din mappe - selv om du kan.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "På slutten av denne prosedyren vil vi gi deg en tekst til å lagre i en fil kalt .htconfig.php i toppkatalogen til din Red.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativt, så kan du hoppe over denne prosedyren og gjennomføre en manuell installasjon. Vennligst se filen \"install/INSTALL.txt\" for instruksjoner.";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php kan skrives til";
-$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red bruker malmotoren Smarty3 for å gjengi sine webvisninger. Smarty3 kompilerer malene om til PHP for å framskynde gjengivelsen.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."] = "For å kunne lagre disse kompilerte malene, så må webtjeneren ha skrivetilgang til katalogen %s under Red sin hovedmappe.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Vennligst sikre at brukeren som din web-tjeneste kjører som (for eksempel www-data) har skrivetilgang til denne katalogen.";
-$a->strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Merknad: som et sikkerhetstiltak bør du bare gi webtjerenn skrivetilgang til %s - ikke til malfilene (.tpl) som den inneholder.";
-$a->strings["%s is writable"] = "%s kan skrives til";
-$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red bruker lagringsmappen for å lagre opplastede filer. Webtjeneren trenger å ha skrivetilgang til lagringsmappen under Red sin toppnivåmappe.";
-$a->strings["store is writable"] = "lageret kan skrives til";
-$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "SSL-sertifikatet kan ikke kontrolleres. Fiks sertifikatet eller skru av https tilgang til dette nettstedet.";
-$a->strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "Hvis du har HTTPS-tilgang til ditt nettsted eller tillater forbindelser til TCP port 443 (HTTPS-porten), så MÅ du bruke nettlesergodkjent sertifkater. Du MÅ IKKE bruke egensignert sertifikater!";
-$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Denne begrensningen er tatt inn fordi offentlige innlegg fra deg kan for eksempel inneholde referanser til bilder på din egen hub.";
-$a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "Hvis sertifikatet ditt ikke gjenkjennes, så vil medlemmer på andre nettsteder (som selv kan ha godkjente sertifikater) få en beskjed med en advarsel på deres eget nettsted som klager over sikkerhetsproblemer.";
-$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Dette kan gi problemer med brukervennlighet (ikke bare på ditt eget nettsted), så vi må insistere på dette kravet.";
-$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Det finnes tilbydere som utsteder gratis sertifikater som er gyldige i nettlesere.";
-$a->strings["SSL certificate validation"] = "SSL sertifikat-kontroll";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "URL omskriving (rewrite) i .htaccess virker ikke. Sjekk konfigurasjonen til tjeneren din. Test:";
-$a->strings["Url rewrite is working"] = "URL rewrite virker";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Databasekonfigurasjonsfilen \".htconfig.php\" kunne ikke skrives. Vennligst bruk den medfølgende teksten for å lage en konfigurasjonsfil i toppkatalogen av din web-tjener.";
-$a->strings["Errors encountered creating database tables."] = "Feil oppstod under opprettelsen av databasetabeller.";
-$a->strings["<h1>What next</h1>"] = "<h1>Hva gjenstår</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "VIKTIG: Du må [manuelt] sette opp en automatisert tidfestet oppgave til bakgrunnshenteren.";
-$a->strings["Files: shared with me"] = "Filer: delt med meg";
-$a->strings["NEW"] = "NY";
-$a->strings["Remove all files"] = "Fjern alle filer";
-$a->strings["Remove this file"] = "Fjern denne filen";
+$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du har laget %1$.0f av %2$.0f tillatte kanaler.";
+$a->strings["Create a new channel"] = "Lag en ny kanal";
+$a->strings["Current Channel"] = "Gjeldende kanal";
+$a->strings["Switch to one of your channels by selecting it."] = "Bytt til en av dine kanaler ved å velge den.";
+$a->strings["Default Channel"] = "Standardkanal";
+$a->strings["Make Default"] = "Gjør til standard";
+$a->strings["%d new messages"] = "%d nye meldinger";
+$a->strings["%d new introductions"] = "%d nye introduksjoner";
+$a->strings["Delegated Channels"] = "Delegerte kanaler";
+$a->strings["Unable to update menu."] = "Ikke i stand til å oppdatere meny.";
+$a->strings["Unable to create menu."] = "Ikke i stand til å lage meny.";
+$a->strings["Menu Name"] = "Menynavn";
+$a->strings["Unique name (not visible on webpage) - required"] = "Unikt navn (ikke synlig på websiden) - påkrevet";
+$a->strings["Menu Title"] = "Menytittel";
+$a->strings["Visible on webpage - leave empty for no title"] = "Synlig på websiden - la stå tomt for ingen tittel";
+$a->strings["Allow Bookmarks"] = "Tillat bokmerker";
+$a->strings["Menu may be used to store saved bookmarks"] = "Menyen kan brukes til å lagre lagrede bokmerker";
+$a->strings["Submit and proceed"] = "Send inn og fortsett";
+$a->strings["Drop"] = "Slett";
+$a->strings["Bookmarks allowed"] = "Bokmerker tillatt";
+$a->strings["Delete this menu"] = "Slett denne menyen";
+$a->strings["Edit menu contents"] = "Endre menyinnholdet";
+$a->strings["Edit this menu"] = "Endre denne menyen";
+$a->strings["Menu could not be deleted."] = "Menyen kunne ikke bli slettet.";
+$a->strings["Menu not found."] = "Menyen ble ikke funnet.";
+$a->strings["Edit Menu"] = "Endre meny";
+$a->strings["Add or remove entries to this menu"] = "Legg til eller fjern punkter i denne menyen";
+$a->strings["Menu name"] = "Menynavn";
+$a->strings["Must be unique, only seen by you"] = "Må være unik, ses bare av deg";
+$a->strings["Menu title"] = "Menytittel";
+$a->strings["Menu title as seen by others"] = "Menytittelen andre ser";
+$a->strings["Allow bookmarks"] = "Tillat bokmerker";
+$a->strings["Unable to lookup recipient."] = "Ikke i stand til å slå opp mottaker.";
+$a->strings["Unable to communicate with requested channel."] = "Ikke i stand til å kommunisere med forespurt kanal.";
+$a->strings["Cannot verify requested channel."] = "Kan ikke bekrefte forespurt kanal.";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "Valgt kanal har restriksjoner for private meldinger. Sending feilet.";
+$a->strings["Messages"] = "Meldinger";
+$a->strings["Message recalled."] = "Innlegg tilbakekalt.";
+$a->strings["Conversation removed."] = "Samtale fjernet.";
+$a->strings["Requested channel is not in this network"] = "Forespurt kanal er ikke tilgjengelig i dette nettverket.";
+$a->strings["Send Private Message"] = "Send privat melding";
+$a->strings["To:"] = "Til:";
+$a->strings["Subject:"] = "Emne:";
+$a->strings["Send"] = "Send";
+$a->strings["Delete message"] = "Slett melding";
+$a->strings["Delivery report"] = "Leveringsrapport";
+$a->strings["Recall message"] = "Tilbakekall innlegg";
+$a->strings["Message has been recalled."] = "Innlegget har blitt tilbakekalt.";
+$a->strings["Delete Conversation"] = "Slett samtale";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Ingen sikret kommunikasjon tilgjengelig. Du kan <strong>muligens</strong> greie å svare via senderens profilside.";
+$a->strings["Send Reply"] = "Send svar";
+$a->strings["Your message for %s (%s):"] = "Din melding til %s (%s):";
+$a->strings["Documentation Search"] = "Søk i dokumentasjon";
+$a->strings["Help:"] = "Hjelp:";
+$a->strings["Not Found"] = "Ikke funnet";
+$a->strings["\$Projectname Documentation"] = "\$Projectname dokumentasjon";
+$a->strings["No service class restrictions found."] = "Ingen restriksjoner er funnet i tjenesteklasse.";
+$a->strings["Version %s"] = "Versjon %s";
+$a->strings["Installed plugins/addons/apps:"] = "Installerte tilleggsfunksjoner/tillegg/apper:";
+$a->strings["No installed plugins/addons/apps"] = "Ingen installerte tilleggsfunksjoner/tillegg/apper";
+$a->strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Dette er en \$Projectname-hub - et globalt samhandlende nettverk av desentraliserte nettsteder med innbygget personvern.";
+$a->strings["Tag: "] = "Merkelapp:";
+$a->strings["Last background fetch: "] = "Siste innhenting i bakgrunnen:";
+$a->strings["Current load average: "] = "Gjeldende belastningsgjennomsnitt:";
+$a->strings["Running at web location"] = "Kjører på webplasseringen";
+$a->strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Vennligst besøk <a href=\"http://hubzilla.org\">hubzilla.org</a> for å lære mer om \$Projectname.";
+$a->strings["Bug reports and issues: please visit"] = "Feilmeldinger og feilretting: vennligst besøk";
+$a->strings["\$projectname issues"] = "\$projectname problemer";
+$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Forslag, ros og så videre - vennligst e-post \"redmatrix\" hos librelist - punktum com";
+$a->strings["Site Administrators"] = "Nettstedsadministratorer";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Ingen forslag tilgjengelige. Hvis dette er et nytt nettsted, vennligst prøv igjen om 24 timer.";
-$a->strings["Profile not found."] = "Profilen ble ikke funnet.";
-$a->strings["Profile deleted."] = "Profilen er slettet.";
-$a->strings["Profile-"] = "Profil-";
-$a->strings["New profile created."] = "Ny profil opprettet.";
-$a->strings["Profile unavailable to clone."] = "Profilen er utilgjengelig for klonen.";
-$a->strings["Profile unavailable to export."] = "Profilen er utilgjengelig for eksport.";
-$a->strings["Profile Name is required."] = "Profilnavn er påkrevd.";
-$a->strings["Marital Status"] = "Sivilstand";
-$a->strings["Romantic Partner"] = "Romantisk partner";
-$a->strings["Likes"] = "Liker";
-$a->strings["Dislikes"] = "Liker ikke";
-$a->strings["Work/Employment"] = "Arbeid/sysselsetting";
-$a->strings["Religion"] = "Religion";
-$a->strings["Political Views"] = "Politiske synspunkter";
-$a->strings["Sexual Preference"] = "Seksuelle preferanser";
-$a->strings["Homepage"] = "Hjemmeside";
-$a->strings["Interests"] = "Interesser";
-$a->strings["Profile updated."] = "Profilen er oppdatert.";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Skjul kontakt-/vennelisten din fra de som ser på denne profilen?";
-$a->strings["Edit Profile Details"] = "Endre profildetaljer";
-$a->strings["View this profile"] = "Vis denne profilen";
-$a->strings["Change Profile Photo"] = "Endre profilbilde";
-$a->strings["Create a new profile using these settings"] = "Lag en ny profil ved å bruke disse innstillingene";
-$a->strings["Clone this profile"] = "Klon denne profilen";
-$a->strings["Delete this profile"] = "Slett denne profilen";
-$a->strings["Import profile from file"] = "Importer profil fra fil";
-$a->strings["Export profile to file"] = "Eksporter profil til fil";
-$a->strings["Profile Name:"] = "Profilnavn:";
-$a->strings["Your Full Name:"] = "Ditt fulle navn:";
-$a->strings["Title/Description:"] = "Tittel/Beskrivelse:";
-$a->strings["Your Gender:"] = "Ditt kjønn:";
-$a->strings["Birthday :"] = "Fødselsdag:";
-$a->strings["Street Address:"] = "Gateadresse:";
-$a->strings["Locality/City:"] = "Sted/By:";
-$a->strings["Postal/Zip Code:"] = "Postnummer/ZIP-kode:";
-$a->strings["Country:"] = "Land:";
-$a->strings["Region/State:"] = "Region/fylke:";
-$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Sivilstand:";
-$a->strings["Who: (if applicable)"] = "Hvem: (hvis det er aktuelt) ";
-$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Eksempler: kari123, Kari Villiamsen, kari@example.com";
-$a->strings["Since [date]:"] = "Siden [dato]:";
-$a->strings["Homepage URL:"] = "Hjemmeside URL:";
-$a->strings["Religious Views:"] = "Religiøse synspunkter:";
-$a->strings["Keywords:"] = "Nøkkelord:";
-$a->strings["Example: fishing photography software"] = "Eksempel: fisking fotografering programvare";
-$a->strings["Used in directory listings"] = "Brukt i katalogoppføringer";
-$a->strings["Tell us about yourself..."] = "Fortell oss om deg selv...";
-$a->strings["Hobbies/Interests"] = "Hobbier/Interesser";
-$a->strings["Contact information and Social Networks"] = "Kontaktinformasjon og sosiale nettverk";
-$a->strings["My other channels"] = "Mine andre kanaler";
-$a->strings["Musical interests"] = "Musikkinteresser";
-$a->strings["Books, literature"] = "Bøker, litteratur";
-$a->strings["Television"] = "TV/fjernsyn";
-$a->strings["Film/dance/culture/entertainment"] = "Film/dans/kultur/underholdning";
-$a->strings["Love/romance"] = "Kjærlighet/romantikk";
-$a->strings["Work/employment"] = "Arbeid/sysselsetting";
-$a->strings["School/education"] = "Skole/utdanning";
-$a->strings["This is your default profile."] = "Dette er din standardprofil.";
-$a->strings["Age: "] = "Alder:";
-$a->strings["Edit/Manage Profiles"] = "Endre/håndter profiler";
-$a->strings["Add profile things"] = "Legg til profilting";
-$a->strings["Include desirable objects in your profile"] = "Inkluder ønskverdige objekter i din profil";
+$a->strings["Calendar entries imported."] = "Kalenderhendelsene er importert.";
+$a->strings["No calendar entries found."] = "Ingen kalenderhendelser funnet.";
+$a->strings["Event can not end before it has started."] = "Hendelsen kan ikke slutte før den starter.";
+$a->strings["Unable to generate preview."] = "Klarer ikke å lage forhåndsvisning.";
+$a->strings["Event title and start time are required."] = "Hendelsestittel og starttidspunkt er påkrevd.";
+$a->strings["Event not found."] = "Hendelsen ble ikke funnet.";
+$a->strings["Edit event titel"] = "Rediger hendelsens tittel";
+$a->strings["Event titel"] = "Hendelsens tittel";
+$a->strings["Categories (comma-separated list)"] = "Kategorier (kommaseparert liste)";
+$a->strings["Edit Category"] = "Endre kategori";
+$a->strings["Category"] = "Kategori";
+$a->strings["Edit start date and time"] = "Endre startdato og tidspunkt";
+$a->strings["Start date and time"] = "Startdato og tidspunkt";
+$a->strings["Finish date and time are not known or not relevant"] = "Sluttdato og tidspunkt er ikke kjent eller ikke relevant";
+$a->strings["Edit finish date and time"] = "Endre sluttdato og tidspunkt";
+$a->strings["Finish date and time"] = "Sluttdato og tidspunkt";
+$a->strings["Adjust for viewer timezone"] = "Juster i forhold til tilskuerens tidssone";
+$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Viktig for hendelser som skjer på et bestemt sted. Ikke praktisk for globale ferier eller fridager.";
+$a->strings["Edit Description"] = "Endre beskrivelse";
+$a->strings["Edit Location"] = "Endre plassering";
+$a->strings["Share this event"] = "Del denne hendelsen";
+$a->strings["Advanced Options"] = "Avanserte alternativer";
+$a->strings["l, F j"] = "l, F j";
+$a->strings["Edit event"] = "Endre hendelse";
+$a->strings["Delete event"] = "Slett hendelse";
+$a->strings["calendar"] = "kalender";
+$a->strings["Edit Event"] = "Endre hendelse";
+$a->strings["Create Event"] = "Lag hendelse";
+$a->strings["Today"] = "Idag";
+$a->strings["Event removed"] = "Hendelse slettet";
+$a->strings["Failed to remove event"] = "Mislyktes med å slette hendelse";
 $a->strings["Invalid profile identifier."] = "Ugyldig profil-identifikator.";
 $a->strings["Profile Visibility Editor"] = "Endre profilsynlighet";
 $a->strings["Click on a contact to add or remove."] = "Klikk på en kontakt for å legge til eller fjerne.";
 $a->strings["Visible To"] = "Synlig for";
-$a->strings["Select a bookmark folder"] = "Velg en bokmerkemappe";
-$a->strings["Save Bookmark"] = "Lagre bokmerke";
-$a->strings["URL of bookmark"] = "URL-en til bokmerket";
-$a->strings["Or enter new bookmark folder name"] = "Eller skriv nytt navn på bokmerkemappe";
-$a->strings["Import completed"] = "Import ferdig";
-$a->strings["Import Items"] = "Importer elementer";
-$a->strings["Use this form to import existing posts and content from an export file."] = "Bruk dette skjemaet for å importere eksisterende innlegg og innhold fra en eksportfil.";
+$a->strings["Unable to create element."] = "Klarer ikke å lage element.";
+$a->strings["Unable to update menu element."] = "Ikke i stand til å oppdatere menyelement.";
+$a->strings["Unable to add menu element."] = "Ikke i stand til å legge til menyelement.";
+$a->strings["Menu Item Permissions"] = "Menyelement Tillatelser";
+$a->strings["Link Name"] = "Lenkenavn";
+$a->strings["Link or Submenu Target"] = "Lenke- eller undermeny-mål";
+$a->strings["Enter URL of the link or select a menu name to create a submenu"] = "Skriv URL-en til lenken eller velg et menynavn for å lage en undermeny";
+$a->strings["Use magic-auth if available"] = "Bruk magic-autent hvis mulig";
+$a->strings["Open link in new window"] = "Ã…pne lenke i nytt vindu";
+$a->strings["Order in list"] = "Ordne i liste";
+$a->strings["Higher numbers will sink to bottom of listing"] = "Høyere tall vil synke mot bunnen av listen";
+$a->strings["Submit and finish"] = "Send inn og avslutt";
+$a->strings["Submit and continue"] = "Send inn og fortsett";
+$a->strings["Menu:"] = "Meny:";
+$a->strings["Link Target"] = "Lenkemål";
+$a->strings["Edit menu"] = "Endre meny";
+$a->strings["Edit element"] = "Endre element";
+$a->strings["Drop element"] = "Slett element";
+$a->strings["New element"] = "Nytt element";
+$a->strings["Edit this menu container"] = "Endre denne menybeholderen";
+$a->strings["Add menu element"] = "Legg til menyelement";
+$a->strings["Delete this menu item"] = "Slett dette menyelementet";
+$a->strings["Edit this menu item"] = "Endre dette menyelementet";
+$a->strings["Menu item not found."] = "Menyelement ble ikke funnet.";
+$a->strings["Menu item deleted."] = "Menyelement slettet.";
+$a->strings["Menu item could not be deleted."] = "Menyelement kunne ikke bli slettet.";
+$a->strings["Edit Menu Element"] = "Endre menyelement";
+$a->strings["Link text"] = "Lenketekst";
+$a->strings["Who likes me?"] = "Hvem liker meg?";
+$a->strings["Files: shared with me"] = "Filer: delt med meg";
+$a->strings["NEW"] = "NY";
+$a->strings["Remove all files"] = "Fjern alle filer";
+$a->strings["Remove this file"] = "Fjern denne filen";
+$a->strings["No connections."] = "Ingen forbindelser.";
+$a->strings["Visit %s's profile [%s]"] = "Besøk %s sin profil [%s]";
 $a->strings["Focus (Hubzilla default)"] = "Focus (Hubzilla standardtema)";
 $a->strings["Theme settings"] = "Temainnstillinger";
 $a->strings["Select scheme"] = "Velg skjema";
@@ -2156,6 +2205,7 @@ $a->strings["Left align page content"] = "Venstrejuster sideinnhold";
 $a->strings["Set minimum opacity of nav bar - to hide it"] = "Angi minste dekkevne for navigasjonslinjen - for å skjule den";
 $a->strings["Set size of conversation author photo"] = "Angi størrelsen for samtalens forfatterbilde";
 $a->strings["Set size of followup author photos"] = "Angi størrelsen på forfatterbilder ved oppfølging";
+$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fjernautentisering blokkert. Du er logget inn på dette nettstedet lokalt. Vennligst logg ut og prøv på nytt.";
 $a->strings["Update %s failed. See error logs."] = "Oppdatering %s mislyktes. Se feilloggen.";
 $a->strings["Update Error at %s"] = "Oppdateringsfeil ved %s";
 $a->strings["Create an account to access services and applications within the Hubzilla"] = "Lag en konto for å få tilgang til tjenester og programmer i Hubzilla";
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index bc7642841..4f669bfea 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the Red package.
 # 
 # Translators:
-# jeroenpraat <jeroenpraat@xs4all.nl>, 2015
+# jeroenpraat <jeroenpraat@xs4all.nl>, 2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-27 00:03-0800\n"
-"PO-Revision-Date: 2015-11-28 22:02+0000\n"
+"POT-Creation-Date: 2016-01-01 00:03-0800\n"
+"PO-Revision-Date: 2016-01-02 13:02+0000\n"
 "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
 "Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../include/Contact.php:101 ../../include/identity.php:953
+#: ../../include/Contact.php:101 ../../include/identity.php:947
 #: ../../include/widgets.php:137 ../../include/widgets.php:175
 #: ../../include/conversation.php:953 ../../mod/match.php:64
 #: ../../mod/directory.php:318 ../../mod/suggest.php:52
@@ -54,17 +54,17 @@ msgstr "Ongeldige omschrijving chatkanaal"
 msgid "Room not found."
 msgstr "Chatkanaal niet gevonden"
 
-#: ../../include/chat.php:133 ../../include/items.php:4396
-#: ../../include/attach.php:140 ../../include/attach.php:188
-#: ../../include/attach.php:251 ../../include/attach.php:265
-#: ../../include/attach.php:272 ../../include/attach.php:337
-#: ../../include/attach.php:351 ../../include/attach.php:358
-#: ../../include/attach.php:436 ../../include/attach.php:884
-#: ../../include/attach.php:955 ../../include/attach.php:1107
-#: ../../include/photos.php:29 ../../mod/filestorage.php:18
+#: ../../include/chat.php:133 ../../include/items.php:4405
+#: ../../include/photos.php:29 ../../include/attach.php:140
+#: ../../include/attach.php:188 ../../include/attach.php:251
+#: ../../include/attach.php:265 ../../include/attach.php:272
+#: ../../include/attach.php:337 ../../include/attach.php:351
+#: ../../include/attach.php:358 ../../include/attach.php:436
+#: ../../include/attach.php:888 ../../include/attach.php:959
+#: ../../include/attach.php:1111 ../../mod/filestorage.php:18
 #: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/group.php:9 ../../mod/item.php:205
-#: ../../mod/item.php:213 ../../mod/item.php:1049 ../../mod/common.php:35
+#: ../../mod/filestorage.php:115 ../../mod/group.php:9 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:1050 ../../mod/common.php:35
 #: ../../mod/achievements.php:30 ../../mod/rate.php:111
 #: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/id.php:71
 #: ../../mod/like.php:177 ../../mod/page.php:31 ../../mod/page.php:86
@@ -77,20 +77,20 @@ msgstr "Chatkanaal niet gevonden"
 #: ../../mod/editwebpage.php:125 ../../mod/profile.php:64
 #: ../../mod/profile.php:72 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/fsuggest.php:78 ../../mod/sources.php:66
-#: ../../mod/notifications.php:66 ../../mod/photos.php:70
-#: ../../mod/profile_photo.php:341 ../../mod/profile_photo.php:354
-#: ../../mod/thing.php:271 ../../mod/thing.php:291 ../../mod/thing.php:328
-#: ../../mod/editblock.php:65 ../../mod/network.php:12
-#: ../../mod/pdledit.php:21 ../../mod/register.php:72
+#: ../../mod/notifications.php:66 ../../mod/invite.php:13
+#: ../../mod/invite.php:87 ../../mod/profile_photo.php:341
+#: ../../mod/profile_photo.php:354 ../../mod/thing.php:271
+#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/editblock.php:65
+#: ../../mod/network.php:12 ../../mod/pdledit.php:21 ../../mod/register.php:72
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
 #: ../../mod/settings.php:568 ../../mod/webpages.php:69
 #: ../../mod/appman.php:66 ../../mod/layouts.php:69 ../../mod/layouts.php:76
-#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/mail.php:118
-#: ../../mod/regmod.php:17 ../../mod/channel.php:100 ../../mod/channel.php:214
-#: ../../mod/channel.php:254 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../mod/editpost.php:13 ../../mod/chat.php:94 ../../mod/chat.php:99
-#: ../../mod/viewsrc.php:14 ../../mod/authtest.php:13
-#: ../../mod/connections.php:29 ../../mod/manage.php:6 ../../mod/menu.php:74
+#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/regmod.php:17
+#: ../../mod/channel.php:100 ../../mod/channel.php:214
+#: ../../mod/channel.php:254 ../../mod/photos.php:70 ../../mod/editpost.php:13
+#: ../../mod/chat.php:94 ../../mod/chat.php:99 ../../mod/viewsrc.php:14
+#: ../../mod/authtest.php:13 ../../mod/connections.php:29
+#: ../../mod/manage.php:6 ../../mod/menu.php:74 ../../mod/mail.php:126
 #: ../../mod/service_limits.php:7 ../../mod/suggest.php:26
 #: ../../mod/events.php:260 ../../mod/message.php:16 ../../mod/block.php:22
 #: ../../mod/block.php:72 ../../mod/mitem.php:111 ../../mod/sharedwithme.php:7
@@ -120,15 +120,390 @@ msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
 msgid "Cloned channel not found. Import failed."
 msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
 
+#: ../../include/text.php:394
+msgid "prev"
+msgstr "vorige"
+
+#: ../../include/text.php:396
+msgid "first"
+msgstr "eerste"
+
+#: ../../include/text.php:425
+msgid "last"
+msgstr "laatste"
+
+#: ../../include/text.php:428
+msgid "next"
+msgstr "volgende"
+
+#: ../../include/text.php:438
+msgid "older"
+msgstr "ouder"
+
+#: ../../include/text.php:440
+msgid "newer"
+msgstr "nieuwer"
+
+#: ../../include/text.php:803
+msgid "No connections"
+msgstr "Geen connecties"
+
+#: ../../include/text.php:815
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d connectie"
+msgstr[1] "%d connecties"
+
+#: ../../include/text.php:828 ../../mod/viewconnections.php:101
+msgid "View Connections"
+msgstr "Connecties weergeven"
+
+#: ../../include/text.php:885 ../../include/text.php:897
+#: ../../include/nav.php:159 ../../include/apps.php:147
+#: ../../mod/search.php:40
+msgid "Search"
+msgstr "Zoeken"
+
+#: ../../include/text.php:886 ../../include/text.php:898
+#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:100 ../../mod/admin.php:1454 ../../mod/admin.php:1474
+#: ../../mod/filer.php:49
+msgid "Save"
+msgstr "Opslaan"
+
+#: ../../include/text.php:972
+msgid "poke"
+msgstr "aanstoten"
+
+#: ../../include/text.php:972 ../../include/conversation.php:243
+msgid "poked"
+msgstr "aangestoten"
+
+#: ../../include/text.php:973
+msgid "ping"
+msgstr "ping"
+
+#: ../../include/text.php:973
+msgid "pinged"
+msgstr "gepingd"
+
+#: ../../include/text.php:974
+msgid "prod"
+msgstr "por"
+
+#: ../../include/text.php:974
+msgid "prodded"
+msgstr "gepord"
+
+#: ../../include/text.php:975
+msgid "slap"
+msgstr "slaan"
+
+#: ../../include/text.php:975
+msgid "slapped"
+msgstr "sloeg"
+
+#: ../../include/text.php:976
+msgid "finger"
+msgstr "finger"
+
+#: ../../include/text.php:976
+msgid "fingered"
+msgstr "gefingerd"
+
+#: ../../include/text.php:977
+msgid "rebuff"
+msgstr "afpoeieren"
+
+#: ../../include/text.php:977
+msgid "rebuffed"
+msgstr "afgepoeierd"
+
+#: ../../include/text.php:987
+msgid "happy"
+msgstr "gelukkig"
+
+#: ../../include/text.php:988
+msgid "sad"
+msgstr "bedroefd"
+
+#: ../../include/text.php:989
+msgid "mellow"
+msgstr "mellow"
+
+#: ../../include/text.php:990
+msgid "tired"
+msgstr "moe"
+
+#: ../../include/text.php:991
+msgid "perky"
+msgstr "parmantig"
+
+#: ../../include/text.php:992
+msgid "angry"
+msgstr "boos"
+
+#: ../../include/text.php:993
+msgid "stupefied"
+msgstr "verbijsterd"
+
+#: ../../include/text.php:994
+msgid "puzzled"
+msgstr "verward"
+
+#: ../../include/text.php:995
+msgid "interested"
+msgstr "geïnteresseerd"
+
+#: ../../include/text.php:996
+msgid "bitter"
+msgstr "verbitterd"
+
+#: ../../include/text.php:997
+msgid "cheerful"
+msgstr "vrolijk"
+
+#: ../../include/text.php:998
+msgid "alive"
+msgstr "levendig"
+
+#: ../../include/text.php:999
+msgid "annoyed"
+msgstr "geërgerd"
+
+#: ../../include/text.php:1000
+msgid "anxious"
+msgstr "bezorgd"
+
+#: ../../include/text.php:1001
+msgid "cranky"
+msgstr "humeurig"
+
+#: ../../include/text.php:1002
+msgid "disturbed"
+msgstr "verontrust"
+
+#: ../../include/text.php:1003
+msgid "frustrated"
+msgstr "gefrustreerd "
+
+#: ../../include/text.php:1004
+msgid "depressed"
+msgstr "gedeprimeerd"
+
+#: ../../include/text.php:1005
+msgid "motivated"
+msgstr "gemotiveerd"
+
+#: ../../include/text.php:1006
+msgid "relaxed"
+msgstr "ontspannen"
+
+#: ../../include/text.php:1007
+msgid "surprised"
+msgstr "verrast"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "maandag"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "dinsdag"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "woensdag"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "donderdag"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "vrijdag"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "zaterdag"
+
+#: ../../include/text.php:1179 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "zondag"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:45
+msgid "January"
+msgstr "januari"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:46
+msgid "February"
+msgstr "februari"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:47
+msgid "March"
+msgstr "maart"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:48
+msgid "April"
+msgstr "april"
+
+#: ../../include/text.php:1183
+msgid "May"
+msgstr "mei"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:50
+msgid "June"
+msgstr "juni"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:51
+msgid "July"
+msgstr "juli"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:52
+msgid "August"
+msgstr "augustus"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:53
+msgid "September"
+msgstr "september"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:54
+msgid "October"
+msgstr "oktober"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:55
+msgid "November"
+msgstr "november"
+
+#: ../../include/text.php:1183 ../../include/js_strings.php:56
+msgid "December"
+msgstr "december"
+
+#: ../../include/text.php:1260 ../../include/text.php:1264
+msgid "Unknown Attachment"
+msgstr "Onbekende bijlage"
+
+#: ../../include/text.php:1266 ../../include/RedDAV/RedBrowser.php:237
+#: ../../mod/sharedwithme.php:97
+msgid "Size"
+msgstr "Grootte"
+
+#: ../../include/text.php:1266
+msgid "unknown"
+msgstr "onbekend"
+
+#: ../../include/text.php:1302
+msgid "remove category"
+msgstr "categorie verwijderen"
+
+#: ../../include/text.php:1379
+msgid "remove from file"
+msgstr "uit map verwijderen"
+
+#: ../../include/text.php:1410 ../../include/event.php:22
+#: ../../include/bb2diaspora.php:465
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d F Y \\@ G:i"
+
+#: ../../include/text.php:1414 ../../include/event.php:30
+#: ../../include/bb2diaspora.php:471
+msgid "Starts:"
+msgstr "Start:"
+
+#: ../../include/text.php:1418 ../../include/event.php:40
+#: ../../include/bb2diaspora.php:479
+msgid "Finishes:"
+msgstr "Einde:"
+
+#: ../../include/text.php:1425 ../../include/event.php:52
+#: ../../include/identity.php:998 ../../include/bb2diaspora.php:487
+#: ../../mod/directory.php:304
+msgid "Location:"
+msgstr "Plaats:"
+
+#: ../../include/text.php:1521 ../../include/text.php:1532
+msgid "Click to open/close"
+msgstr "Klik om te openen of te sluiten"
+
+#: ../../include/text.php:1716 ../../mod/events.php:623
+msgid "Link to Source"
+msgstr "Originele locatie"
+
+#: ../../include/text.php:1737 ../../include/text.php:1809
+msgid "default"
+msgstr "standaard"
+
+#: ../../include/text.php:1745
+msgid "Page layout"
+msgstr "Pagina-lay-out"
+
+#: ../../include/text.php:1745
+msgid "You can create your own with the layouts tool"
+msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
+
+#: ../../include/text.php:1787
+msgid "Page content type"
+msgstr "Opmaaktype pagina"
+
+#: ../../include/text.php:1821
+msgid "Select an alternate language"
+msgstr "Kies een andere taal"
+
+#: ../../include/text.php:1940 ../../include/conversation.php:120
+#: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
+msgid "photo"
+msgstr "foto"
+
+#: ../../include/text.php:1943 ../../include/event.php:904
+#: ../../include/conversation.php:123 ../../mod/tagger.php:47
+#: ../../mod/like.php:363 ../../mod/events.php:249
+msgid "event"
+msgstr "gebeurtenis"
+
+#: ../../include/text.php:1946 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:83
+msgid "status"
+msgstr "bericht"
+
+#: ../../include/text.php:1948 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr "reactie"
+
+#: ../../include/text.php:1953
+msgid "activity"
+msgstr "activiteit"
+
+#: ../../include/text.php:2248
+msgid "Design Tools"
+msgstr "Ontwerp-hulpmiddelen"
+
+#: ../../include/text.php:2251 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr "Blokken"
+
+#: ../../include/text.php:2252 ../../mod/menu.php:103
+msgid "Menus"
+msgstr "Menu's"
+
+#: ../../include/text.php:2253 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr "Lay-outs"
+
+#: ../../include/text.php:2254
+msgid "Pages"
+msgstr "Pagina's"
+
+#: ../../include/text.php:2606 ../../include/RedDAV/RedBrowser.php:131
+msgid "Collection"
+msgstr "map"
+
 #: ../../include/RedDAV/RedBrowser.php:107
 #: ../../include/RedDAV/RedBrowser.php:239
 msgid "parent"
 msgstr "omhoog"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2582
-msgid "Collection"
-msgstr "map"
-
 #: ../../include/RedDAV/RedBrowser.php:134
 msgid "Principal"
 msgstr "principal"
@@ -149,16 +524,16 @@ msgstr "Planning-postvak IN"
 msgid "Schedule Outbox"
 msgstr "Planning-postvak UIT"
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1317
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1330
 #: ../../include/conversation.php:1027 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../mod/photos.php:759
-#: ../../mod/photos.php:1198
+#: ../../include/apps.php:415 ../../mod/photos.php:754
+#: ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr "Onbekend"
 
 #: ../../include/RedDAV/RedBrowser.php:226 ../../include/conversation.php:1629
 #: ../../include/nav.php:93 ../../include/apps.php:135
-#: ../../mod/fbrowser.php:114
+#: ../../mod/fbrowser.php:109
 msgid "Files"
 msgstr "Bestanden"
 
@@ -178,13 +553,13 @@ msgid "Create"
 msgstr "Aanmaken"
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1329
-#: ../../mod/photos.php:784 ../../mod/photos.php:1317
-#: ../../mod/profile_photo.php:453
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1343
+#: ../../mod/profile_photo.php:453 ../../mod/photos.php:781
+#: ../../mod/photos.php:1316
 msgid "Upload"
 msgstr "Uploaden"
 
-#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:974
+#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:986
 #: ../../mod/settings.php:588 ../../mod/settings.php:614
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
@@ -194,11 +569,6 @@ msgstr "Naam"
 msgid "Type"
 msgstr "Type"
 
-#: ../../include/RedDAV/RedBrowser.php:237 ../../include/text.php:1248
-#: ../../mod/sharedwithme.php:97
-msgid "Size"
-msgstr "Grootte"
-
 #: ../../include/RedDAV/RedBrowser.php:238 ../../mod/sharedwithme.php:98
 msgid "Last Modified"
 msgstr "Laatst gewijzigd"
@@ -219,10 +589,10 @@ msgstr "Bewerken"
 #: ../../include/RedDAV/RedBrowser.php:241 ../../include/conversation.php:657
 #: ../../include/ItemObject.php:120 ../../include/apps.php:260
 #: ../../mod/group.php:173 ../../mod/blocks.php:155 ../../mod/connedit.php:551
-#: ../../mod/editwebpage.php:223 ../../mod/photos.php:1129
-#: ../../mod/thing.php:258 ../../mod/editblock.php:181 ../../mod/admin.php:809
-#: ../../mod/admin.php:968 ../../mod/editlayout.php:179
-#: ../../mod/settings.php:649 ../../mod/webpages.php:183
+#: ../../mod/editwebpage.php:223 ../../mod/thing.php:258
+#: ../../mod/editblock.php:181 ../../mod/admin.php:821 ../../mod/admin.php:980
+#: ../../mod/editlayout.php:179 ../../mod/settings.php:649
+#: ../../mod/webpages.php:183 ../../mod/photos.php:1126
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -253,7 +623,7 @@ msgid "Delete this item?"
 msgstr "Dit item verwijderen?"
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:696
-#: ../../mod/photos.php:1047 ../../mod/photos.php:1165
+#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
 msgid "Comment"
 msgstr "Reactie"
 
@@ -319,24 +689,25 @@ msgid "Describe (optional)"
 msgstr "Omschrijving (optioneel)"
 
 #: ../../include/js_strings.php:22 ../../include/widgets.php:676
-#: ../../include/ItemObject.php:697 ../../mod/filestorage.php:156
-#: ../../mod/group.php:81 ../../mod/connect.php:93 ../../mod/rate.php:168
-#: ../../mod/mood.php:135 ../../mod/setup.php:331 ../../mod/setup.php:371
-#: ../../mod/pconfig.php:108 ../../mod/poke.php:171 ../../mod/profiles.php:675
+#: ../../include/widgets.php:688 ../../include/ItemObject.php:697
+#: ../../mod/filestorage.php:156 ../../mod/group.php:81
+#: ../../mod/connect.php:93 ../../mod/rate.php:168 ../../mod/mood.php:135
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/pconfig.php:108
+#: ../../mod/poke.php:171 ../../mod/profiles.php:675
 #: ../../mod/connedit.php:715 ../../mod/fsuggest.php:108
 #: ../../mod/sources.php:104 ../../mod/sources.php:138
-#: ../../mod/import.php:527 ../../mod/photos.php:637 ../../mod/photos.php:1008
-#: ../../mod/photos.php:1048 ../../mod/photos.php:1166 ../../mod/thing.php:313
+#: ../../mod/import.php:527 ../../mod/invite.php:142 ../../mod/thing.php:313
 #: ../../mod/thing.php:359 ../../mod/import_items.php:122
-#: ../../mod/pdledit.php:58 ../../mod/admin.php:435 ../../mod/admin.php:802
-#: ../../mod/admin.php:966 ../../mod/admin.php:1103 ../../mod/admin.php:1297
-#: ../../mod/admin.php:1382 ../../mod/settings.php:586
+#: ../../mod/pdledit.php:58 ../../mod/admin.php:447 ../../mod/admin.php:814
+#: ../../mod/admin.php:978 ../../mod/admin.php:1115 ../../mod/admin.php:1309
+#: ../../mod/admin.php:1394 ../../mod/settings.php:586
 #: ../../mod/settings.php:698 ../../mod/settings.php:726
 #: ../../mod/settings.php:749 ../../mod/settings.php:834
 #: ../../mod/settings.php:1023 ../../mod/appman.php:99 ../../mod/locs.php:116
-#: ../../mod/mail.php:371 ../../mod/xchan.php:11 ../../mod/invite.php:142
-#: ../../mod/chat.php:184 ../../mod/chat.php:213 ../../mod/events.php:476
-#: ../../mod/events.php:673 ../../mod/mitem.php:231
+#: ../../mod/xchan.php:11 ../../mod/photos.php:637 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1045 ../../mod/photos.php:1163 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/mail.php:380 ../../mod/events.php:461
+#: ../../mod/events.php:658 ../../mod/mitem.php:231
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Opslaan"
@@ -350,7 +721,7 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr "Niet opgeslagen wijzigingen. Ben je er zeker van dat je deze pagina wil verlaten?"
 
 #: ../../include/js_strings.php:25 ../../mod/pubsites.php:28
-#: ../../mod/profiles.php:464 ../../mod/events.php:467
+#: ../../mod/profiles.php:464 ../../mod/events.php:452
 msgid "Location"
 msgstr "Locatie"
 
@@ -427,55 +798,11 @@ msgstr " "
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1165
-msgid "January"
-msgstr "januari"
-
-#: ../../include/js_strings.php:46 ../../include/text.php:1165
-msgid "February"
-msgstr "februari"
-
-#: ../../include/js_strings.php:47 ../../include/text.php:1165
-msgid "March"
-msgstr "maart"
-
-#: ../../include/js_strings.php:48 ../../include/text.php:1165
-msgid "April"
-msgstr "april"
-
 #: ../../include/js_strings.php:49
 msgctxt "long"
 msgid "May"
 msgstr "mei"
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1165
-msgid "June"
-msgstr "juni"
-
-#: ../../include/js_strings.php:51 ../../include/text.php:1165
-msgid "July"
-msgstr "juli"
-
-#: ../../include/js_strings.php:52 ../../include/text.php:1165
-msgid "August"
-msgstr "augustus"
-
-#: ../../include/js_strings.php:53 ../../include/text.php:1165
-msgid "September"
-msgstr "september"
-
-#: ../../include/js_strings.php:54 ../../include/text.php:1165
-msgid "October"
-msgstr "oktober"
-
-#: ../../include/js_strings.php:55 ../../include/text.php:1165
-msgid "November"
-msgstr "november"
-
-#: ../../include/js_strings.php:56 ../../include/text.php:1165
-msgid "December"
-msgstr "december"
-
 #: ../../include/js_strings.php:57
 msgid "Jan"
 msgstr "jan"
@@ -525,34 +852,6 @@ msgstr "nov"
 msgid "Dec"
 msgstr "dec"
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1161
-msgid "Sunday"
-msgstr "zondag"
-
-#: ../../include/js_strings.php:70 ../../include/text.php:1161
-msgid "Monday"
-msgstr "maandag"
-
-#: ../../include/js_strings.php:71 ../../include/text.php:1161
-msgid "Tuesday"
-msgstr "dinsdag"
-
-#: ../../include/js_strings.php:72 ../../include/text.php:1161
-msgid "Wednesday"
-msgstr "woensdag"
-
-#: ../../include/js_strings.php:73 ../../include/text.php:1161
-msgid "Thursday"
-msgstr "donderdag"
-
-#: ../../include/js_strings.php:74 ../../include/text.php:1161
-msgid "Friday"
-msgstr "vrijdag"
-
-#: ../../include/js_strings.php:75 ../../include/text.php:1161
-msgid "Saturday"
-msgstr "zaterdag"
-
 #: ../../include/js_strings.php:76
 msgid "Sun"
 msgstr "zo"
@@ -614,7 +913,7 @@ msgstr "Geen gebruikersnaam in het importbestand gevonden."
 msgid "Import completed."
 msgstr "Import voltooid."
 
-#: ../../include/comanche.php:34 ../../mod/admin.php:351
+#: ../../include/comanche.php:34 ../../mod/admin.php:356
 msgid "Default"
 msgstr "Standaard"
 
@@ -625,148 +924,75 @@ msgstr "Standaard"
 msgid "Permission denied"
 msgstr "Toegang geweigerd"
 
-#: ../../include/items.php:1128 ../../include/items.php:1174
+#: ../../include/items.php:1130 ../../include/items.php:1176
 msgid "(Unknown)"
 msgstr "(Onbekend)"
 
-#: ../../include/items.php:1371
+#: ../../include/items.php:1373
 msgid "Visible to anybody on the internet."
 msgstr "Voor iedereen op het internet zichtbaar."
 
-#: ../../include/items.php:1373
+#: ../../include/items.php:1375
 msgid "Visible to you only."
 msgstr "Alleen voor jou zichtbaar."
 
-#: ../../include/items.php:1375
+#: ../../include/items.php:1377
 msgid "Visible to anybody in this network."
 msgstr "Voor iedereen in dit netwerk zichtbaar."
 
-#: ../../include/items.php:1377
+#: ../../include/items.php:1379
 msgid "Visible to anybody authenticated."
 msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
 
-#: ../../include/items.php:1379
+#: ../../include/items.php:1381
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Voor iedereen op %s zichtbaar."
 
-#: ../../include/items.php:1381
+#: ../../include/items.php:1383
 msgid "Visible to all connections."
 msgstr "Voor alle connecties zichtbaar."
 
-#: ../../include/items.php:1383
+#: ../../include/items.php:1385
 msgid "Visible to approved connections."
 msgstr "Voor alle goedgekeurde connecties zichtbaar."
 
-#: ../../include/items.php:1385
+#: ../../include/items.php:1387
 msgid "Visible to specific connections."
 msgstr "Voor specifieke connecties zichtbaar."
 
-#: ../../include/items.php:4317 ../../mod/filestorage.php:27
-#: ../../mod/thing.php:86 ../../mod/admin.php:127 ../../mod/admin.php:1005
-#: ../../mod/admin.php:1210 ../../mod/display.php:36 ../../mod/viewsrc.php:20
+#: ../../include/items.php:4326 ../../mod/filestorage.php:27
+#: ../../mod/display.php:36 ../../mod/thing.php:86 ../../mod/admin.php:129
+#: ../../mod/admin.php:1017 ../../mod/admin.php:1222 ../../mod/viewsrc.php:20
 msgid "Item not found."
 msgstr "Item niet gevonden."
 
-#: ../../include/items.php:4826 ../../mod/group.php:38 ../../mod/group.php:137
+#: ../../include/items.php:4838 ../../mod/group.php:38 ../../mod/group.php:137
 msgid "Collection not found."
 msgstr "Collectie niet gevonden."
 
-#: ../../include/items.php:4842
+#: ../../include/items.php:4854
 msgid "Collection is empty."
 msgstr "Collectie is leeg"
 
-#: ../../include/items.php:4849
+#: ../../include/items.php:4861
 #, php-format
 msgid "Collection: %s"
 msgstr "Collectie: %s"
 
-#: ../../include/items.php:4859 ../../mod/connedit.php:683
+#: ../../include/items.php:4871 ../../mod/connedit.php:683
 #, php-format
 msgid "Connection: %s"
 msgstr "Connectie: %s"
 
-#: ../../include/items.php:4861
+#: ../../include/items.php:4873
 msgid "Connection not found."
 msgstr "Connectie niet gevonden."
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "Geen ontvanger opgegeven."
-
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[geen onderwerp]"
-
-#: ../../include/message.php:43
-msgid "Unable to determine sender."
-msgstr "Afzender kan niet bepaald worden."
-
-#: ../../include/message.php:218
-msgid "Stored post could not be verified."
-msgstr "Opgeslagen bericht kon niet worden geverifieerd."
-
-#: ../../include/network.php:630
-msgid "view full size"
-msgstr "volledige grootte tonen"
-
-#: ../../include/network.php:1608 ../../include/enotify.php:57
-msgid "$Projectname Notification"
-msgstr "$Projectname-notificatie"
-
-#: ../../include/network.php:1609 ../../include/enotify.php:58
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/network.php:1611 ../../include/enotify.php:60
-msgid "Thank You,"
-msgstr "Bedankt,"
-
-#: ../../include/network.php:1613 ../../include/enotify.php:62
-#, php-format
-msgid "%s Administrator"
-msgstr "Beheerder %s"
-
-#: ../../include/network.php:1655 ../../include/account.php:316
-#: ../../include/account.php:343 ../../include/account.php:403
-msgid "Administrator"
-msgstr "Beheerder"
-
-#: ../../include/network.php:1669
-msgid "No Subject"
-msgstr "Geen onderwerp"
-
-#: ../../include/event.php:22 ../../include/bb2diaspora.php:471
-#: ../../include/text.php:1392
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d F Y \\@ G:i"
-
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:477
-#: ../../include/text.php:1396
-msgid "Starts:"
-msgstr "Start:"
-
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:485
-#: ../../include/text.php:1400
-msgid "Finishes:"
-msgstr "Einde:"
-
-#: ../../include/event.php:52 ../../include/identity.php:1004
-#: ../../include/bb2diaspora.php:493 ../../include/text.php:1407
-#: ../../mod/directory.php:304
-msgid "Location:"
-msgstr "Plaats:"
-
 #: ../../include/event.php:768
 msgid "This event has been added to your calendar."
 msgstr "Dit evenement is aan jouw agenda toegevoegd."
 
-#: ../../include/event.php:904 ../../include/conversation.php:123
-#: ../../include/text.php:1919 ../../mod/tagger.php:47 ../../mod/like.php:363
-#: ../../mod/events.php:249
-msgid "event"
-msgstr "gebeurtenis"
-
 #: ../../include/event.php:967
 msgid "Not specified"
 msgstr "Niet aangegeven"
@@ -846,206 +1072,206 @@ msgstr "Opgevraagd kanaal is niet beschikbaar."
 msgid "Requested profile is not available."
 msgstr "Opgevraagd profiel is niet beschikbaar"
 
-#: ../../include/identity.php:966 ../../mod/profiles.php:782
+#: ../../include/identity.php:960 ../../mod/profiles.php:782
 msgid "Change profile photo"
 msgstr "Profielfoto veranderen"
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:966
 msgid "Profiles"
 msgstr "Profielen"
 
-#: ../../include/identity.php:972
+#: ../../include/identity.php:966
 msgid "Manage/edit profiles"
 msgstr "Profielen beheren/bewerken"
 
-#: ../../include/identity.php:973 ../../mod/profiles.php:783
+#: ../../include/identity.php:967 ../../mod/profiles.php:783
 msgid "Create New Profile"
 msgstr "Nieuw profiel aanmaken"
 
-#: ../../include/identity.php:976 ../../include/nav.php:90
+#: ../../include/identity.php:970 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr "Profiel bewerken"
 
-#: ../../include/identity.php:988 ../../mod/profiles.php:794
+#: ../../include/identity.php:982 ../../mod/profiles.php:794
 msgid "Profile Image"
 msgstr "Profielfoto"
 
-#: ../../include/identity.php:991
+#: ../../include/identity.php:985
 msgid "visible to everybody"
 msgstr "Voor iedereen zichtbaar"
 
-#: ../../include/identity.php:992 ../../mod/profiles.php:677
+#: ../../include/identity.php:986 ../../mod/profiles.php:677
 #: ../../mod/profiles.php:798
 msgid "Edit visibility"
 msgstr "Zichtbaarheid bewerken"
 
-#: ../../include/identity.php:1008 ../../include/identity.php:1248
+#: ../../include/identity.php:1002 ../../include/identity.php:1242
 msgid "Gender:"
 msgstr "Geslacht:"
 
-#: ../../include/identity.php:1009 ../../include/identity.php:1292
+#: ../../include/identity.php:1003 ../../include/identity.php:1286
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../include/identity.php:1010 ../../include/identity.php:1303
+#: ../../include/identity.php:1004 ../../include/identity.php:1297
 msgid "Homepage:"
 msgstr "Homepagina:"
 
-#: ../../include/identity.php:1011
+#: ../../include/identity.php:1005
 msgid "Online Now"
 msgstr "Nu online"
 
-#: ../../include/identity.php:1095 ../../include/identity.php:1173
+#: ../../include/identity.php:1089 ../../include/identity.php:1167
 #: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr "G:i, l d F"
 
-#: ../../include/identity.php:1096 ../../include/identity.php:1174
+#: ../../include/identity.php:1090 ../../include/identity.php:1168
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:1141 ../../include/identity.php:1213
+#: ../../include/identity.php:1135 ../../include/identity.php:1207
 #: ../../mod/ping.php:341
 msgid "[today]"
 msgstr "[vandaag]"
 
-#: ../../include/identity.php:1152
+#: ../../include/identity.php:1146
 msgid "Birthday Reminders"
 msgstr "Verjaardagsherinneringen"
 
-#: ../../include/identity.php:1153
+#: ../../include/identity.php:1147
 msgid "Birthdays this week:"
 msgstr "Verjaardagen deze week:"
 
-#: ../../include/identity.php:1206
+#: ../../include/identity.php:1200
 msgid "[No description]"
 msgstr "[Geen omschrijving]"
 
-#: ../../include/identity.php:1224
+#: ../../include/identity.php:1218
 msgid "Event Reminders"
 msgstr "Herinneringen"
 
-#: ../../include/identity.php:1225
+#: ../../include/identity.php:1219
 msgid "Events this week:"
 msgstr "Gebeurtenissen deze week:"
 
-#: ../../include/identity.php:1238 ../../include/identity.php:1355
+#: ../../include/identity.php:1232 ../../include/identity.php:1349
 #: ../../include/apps.php:138 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../../include/identity.php:1246 ../../mod/settings.php:1029
+#: ../../include/identity.php:1240 ../../mod/settings.php:1029
 msgid "Full Name:"
 msgstr "Volledige naam:"
 
-#: ../../include/identity.php:1253
+#: ../../include/identity.php:1247
 msgid "Like this channel"
 msgstr "Vind dit kanaal leuk"
 
-#: ../../include/identity.php:1264 ../../include/taxonomy.php:414
+#: ../../include/identity.php:1258 ../../include/taxonomy.php:414
 #: ../../include/conversation.php:1721 ../../include/ItemObject.php:179
-#: ../../mod/photos.php:1086
+#: ../../mod/photos.php:1083
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "vindt dit leuk"
 msgstr[1] "vinden dit leuk"
 
-#: ../../include/identity.php:1277
+#: ../../include/identity.php:1271
 msgid "j F, Y"
 msgstr "F j Y"
 
-#: ../../include/identity.php:1278
+#: ../../include/identity.php:1272
 msgid "j F"
 msgstr "F j"
 
-#: ../../include/identity.php:1285
+#: ../../include/identity.php:1279
 msgid "Birthday:"
 msgstr "Geboortedatum:"
 
-#: ../../include/identity.php:1289 ../../mod/directory.php:299
+#: ../../include/identity.php:1283 ../../mod/directory.php:299
 msgid "Age:"
 msgstr "Leeftijd:"
 
-#: ../../include/identity.php:1298
+#: ../../include/identity.php:1292
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "voor %1$d %2$s"
 
-#: ../../include/identity.php:1301 ../../mod/profiles.php:699
+#: ../../include/identity.php:1295 ../../mod/profiles.php:699
 msgid "Sexual Preference:"
 msgstr "Seksuele voorkeur:"
 
-#: ../../include/identity.php:1305 ../../mod/profiles.php:701
+#: ../../include/identity.php:1299 ../../mod/profiles.php:701
 #: ../../mod/directory.php:315
 msgid "Hometown:"
 msgstr "Oorspronkelijk uit:"
 
-#: ../../include/identity.php:1307
+#: ../../include/identity.php:1301
 msgid "Tags:"
 msgstr "Tags:"
 
-#: ../../include/identity.php:1309 ../../mod/profiles.php:702
+#: ../../include/identity.php:1303 ../../mod/profiles.php:702
 msgid "Political Views:"
 msgstr "Politieke overtuigingen:"
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1305
 msgid "Religion:"
 msgstr "Religie:"
 
-#: ../../include/identity.php:1313 ../../mod/directory.php:317
+#: ../../include/identity.php:1307 ../../mod/directory.php:317
 msgid "About:"
 msgstr "Over:"
 
-#: ../../include/identity.php:1315
+#: ../../include/identity.php:1309
 msgid "Hobbies/Interests:"
 msgstr "Hobby's/interesses:"
 
-#: ../../include/identity.php:1317 ../../mod/profiles.php:705
+#: ../../include/identity.php:1311 ../../mod/profiles.php:705
 msgid "Likes:"
 msgstr "Houdt van:"
 
-#: ../../include/identity.php:1319 ../../mod/profiles.php:706
+#: ../../include/identity.php:1313 ../../mod/profiles.php:706
 msgid "Dislikes:"
 msgstr "Houdt niet van:"
 
-#: ../../include/identity.php:1321
+#: ../../include/identity.php:1315
 msgid "Contact information and Social Networks:"
 msgstr "Contactinformatie en sociale netwerken:"
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1317
 msgid "My other channels:"
 msgstr "Mijn andere kanalen"
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1319
 msgid "Musical interests:"
 msgstr "Muzikale interesses:"
 
-#: ../../include/identity.php:1327
+#: ../../include/identity.php:1321
 msgid "Books, literature:"
 msgstr "Boeken, literatuur:"
 
-#: ../../include/identity.php:1329
+#: ../../include/identity.php:1323
 msgid "Television:"
 msgstr "Televisie:"
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1325
 msgid "Film/dance/culture/entertainment:"
 msgstr "Films/dansen/cultuur/vermaak:"
 
-#: ../../include/identity.php:1333
+#: ../../include/identity.php:1327
 msgid "Love/Romance:"
 msgstr "Liefde/romantiek:"
 
-#: ../../include/identity.php:1335
+#: ../../include/identity.php:1329
 msgid "Work/employment:"
 msgstr "Werk/beroep:"
 
-#: ../../include/identity.php:1337
+#: ../../include/identity.php:1331
 msgid "School/education:"
 msgstr "School/opleiding:"
 
-#: ../../include/identity.php:1357
+#: ../../include/identity.php:1351
 msgid "Like this thing"
 msgstr "Vind dit ding leuk"
 
@@ -1094,30 +1320,65 @@ msgstr "vind dit niet leuk"
 msgid "dislikes"
 msgstr "vindt dit niet leuk"
 
-#: ../../include/acl_selectors.php:240
+#: ../../include/photos.php:112
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"
+
+#: ../../include/photos.php:119
+msgid "Image file is empty."
+msgstr "Afbeeldingsbestand is leeg"
+
+#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
+msgid "Unable to process image"
+msgstr "Afbeelding kan niet verwerkt worden"
+
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr "Foto kan niet worden opgeslagen"
+
+#: ../../include/photos.php:297
+msgid "a new photo"
+msgstr "een nieuwe foto"
+
+#: ../../include/photos.php:301
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s plaatste %2$s op %3$s"
+
+#: ../../include/photos.php:506 ../../include/conversation.php:1625
+msgid "Photo Albums"
+msgstr "Fotoalbums"
+
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Nieuwe foto's uploaden"
+
+#: ../../include/acl_selectors.php:218
 msgid "Visible to your default audience"
 msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld"
 
-#: ../../include/acl_selectors.php:241
+#: ../../include/acl_selectors.php:243
 msgid "Show"
 msgstr "Tonen"
 
-#: ../../include/acl_selectors.php:242
+#: ../../include/acl_selectors.php:244
 msgid "Don't show"
 msgstr "Niet tonen"
 
-#: ../../include/acl_selectors.php:247
+#: ../../include/acl_selectors.php:249
 msgid "Other networks and post services"
 msgstr "Andere netwerken en diensten"
 
-#: ../../include/acl_selectors.php:249 ../../mod/filestorage.php:147
-#: ../../mod/photos.php:631 ../../mod/photos.php:1001 ../../mod/thing.php:310
-#: ../../mod/thing.php:356 ../../mod/chat.php:211
+#: ../../include/acl_selectors.php:251 ../../mod/filestorage.php:147
+#: ../../mod/thing.php:310 ../../mod/thing.php:356 ../../mod/photos.php:631
+#: ../../mod/photos.php:998 ../../mod/chat.php:211
 msgid "Permissions"
 msgstr "Permissies"
 
-#: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:384
-#: ../../mod/photos.php:1218
+#: ../../include/acl_selectors.php:252 ../../include/ItemObject.php:384
+#: ../../mod/photos.php:1215
 msgid "Close"
 msgstr "Sluiten"
 
@@ -1152,68 +1413,60 @@ msgstr "Item niet gevonden"
 msgid "No source file."
 msgstr "Geen bronbestand."
 
-#: ../../include/attach.php:514
+#: ../../include/attach.php:518
 msgid "Cannot locate file to replace"
 msgstr "Kan het te vervangen bestand niet vinden"
 
-#: ../../include/attach.php:532
+#: ../../include/attach.php:536
 msgid "Cannot locate file to revise/update"
 msgstr "Kan het bestand wat aangepast moet worden niet vinden"
 
-#: ../../include/attach.php:667
+#: ../../include/attach.php:671
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "Bestand is groter dan de toegelaten %d"
 
-#: ../../include/attach.php:681
+#: ../../include/attach.php:685
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."
 
-#: ../../include/attach.php:837
+#: ../../include/attach.php:841
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."
 
-#: ../../include/attach.php:850
+#: ../../include/attach.php:854
 msgid "Stored file could not be verified. Upload failed."
 msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."
 
-#: ../../include/attach.php:898 ../../include/attach.php:914
+#: ../../include/attach.php:902 ../../include/attach.php:918
 msgid "Path not available."
 msgstr "Pad niet beschikbaar."
 
-#: ../../include/attach.php:960 ../../include/attach.php:1112
+#: ../../include/attach.php:964 ../../include/attach.php:1116
 msgid "Empty pathname"
 msgstr "Padnaam leeg"
 
-#: ../../include/attach.php:986
+#: ../../include/attach.php:990
 msgid "duplicate filename or path"
 msgstr "dubbele bestandsnaam of pad"
 
-#: ../../include/attach.php:1008
+#: ../../include/attach.php:1012
 msgid "Path not found."
 msgstr "Pad niet gevonden"
 
-#: ../../include/attach.php:1066
+#: ../../include/attach.php:1070
 msgid "mkdir failed."
 msgstr "directory aanmaken (mkdir) mislukt."
 
-#: ../../include/attach.php:1070
+#: ../../include/attach.php:1074
 msgid "database storage failed."
 msgstr "opslag in database mislukt."
 
-#: ../../include/attach.php:1118
+#: ../../include/attach.php:1122
 msgid "Empty path"
 msgstr "Ontbrekend bestandspad"
 
-#: ../../include/bb2diaspora.php:382
-msgid "Attachments:"
-msgstr "Bijlagen:"
-
-#: ../../include/bb2diaspora.php:473
-msgid "$Projectname event notification:"
-msgstr "Notificatie $Projectname-gebeurtenis:"
-
 #: ../../include/notify.php:20
 msgid "created a new post"
 msgstr "maakte een nieuw bericht aan"
@@ -1277,12 +1530,6 @@ msgstr "Voorbeeld: bob@example.com, http://example.com/barbara"
 msgid "Notes"
 msgstr "Aantekeningen"
 
-#: ../../include/widgets.php:192 ../../include/text.php:868
-#: ../../include/text.php:880 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100
-#: ../../mod/admin.php:1442 ../../mod/admin.php:1462 ../../mod/filer.php:49
-msgid "Save"
-msgstr "Opslaan"
-
 #: ../../include/widgets.php:266
 msgid "Remove term"
 msgstr "Verwijder zoekterm"
@@ -1372,8 +1619,8 @@ msgid "Channel Sources"
 msgstr "Kanaalbronnen"
 
 #: ../../include/widgets.php:554 ../../include/nav.php:202
-#: ../../include/apps.php:134 ../../mod/admin.php:1064
-#: ../../mod/admin.php:1264
+#: ../../include/apps.php:134 ../../mod/admin.php:1076
+#: ../../mod/admin.php:1276
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -1433,130 +1680,150 @@ msgstr "Week tonen"
 msgid "Month View"
 msgstr "Maand tonen"
 
-#: ../../include/widgets.php:674 ../../mod/events.php:669
+#: ../../include/widgets.php:674 ../../mod/events.php:654
 msgid "Export"
 msgstr "Exporteren"
 
-#: ../../include/widgets.php:675 ../../mod/events.php:672
+#: ../../include/widgets.php:675 ../../mod/events.php:657
 msgid "Import"
 msgstr "Importeren"
 
-#: ../../include/widgets.php:749
+#: ../../include/widgets.php:685
+msgid "Events Tools"
+msgstr "Agenda-hulpmiddelen"
+
+#: ../../include/widgets.php:686
+msgid "Export Calendar"
+msgstr "Exporteren"
+
+#: ../../include/widgets.php:687
+msgid "Import Calendar"
+msgstr "Importeren"
+
+#: ../../include/widgets.php:761
 msgid "Chat Rooms"
 msgstr "Chatkanalen"
 
-#: ../../include/widgets.php:769
+#: ../../include/widgets.php:781
 msgid "Bookmarked Chatrooms"
 msgstr "Bladwijzers van chatkanalen"
 
-#: ../../include/widgets.php:789
+#: ../../include/widgets.php:801
 msgid "Suggested Chatrooms"
 msgstr "Voorgestelde chatkanalen"
 
-#: ../../include/widgets.php:916 ../../include/widgets.php:974
+#: ../../include/widgets.php:928 ../../include/widgets.php:986
 msgid "photo/image"
 msgstr "foto/afbeelding"
 
-#: ../../include/widgets.php:1069 ../../include/widgets.php:1071
+#: ../../include/widgets.php:1081 ../../include/widgets.php:1083
 msgid "Rate Me"
 msgstr "Beoordeel mij"
 
-#: ../../include/widgets.php:1075
+#: ../../include/widgets.php:1087
 msgid "View Ratings"
 msgstr "Bekijk beoordelingen"
 
-#: ../../include/widgets.php:1086
+#: ../../include/widgets.php:1098
 msgid "Public Hubs"
 msgstr "Openbare hubs"
 
-#: ../../include/widgets.php:1134
+#: ../../include/widgets.php:1146
 msgid "Forums"
 msgstr "Forums"
 
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1175
 msgid "Tasks"
 msgstr "Taken"
 
-#: ../../include/widgets.php:1170
+#: ../../include/widgets.php:1184
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: ../../include/widgets.php:1172
+#: ../../include/widgets.php:1186
 msgid "Project/Site Information"
 msgstr "Project- en hub-informatie"
 
-#: ../../include/widgets.php:1173
+#: ../../include/widgets.php:1187
 msgid "For Members"
 msgstr "Voor leden"
 
-#: ../../include/widgets.php:1174
+#: ../../include/widgets.php:1188
 msgid "For Administrators"
 msgstr "Voor beheerders"
 
-#: ../../include/widgets.php:1175
+#: ../../include/widgets.php:1189
 msgid "For Developers"
 msgstr "Voor ontwikkelaars"
 
-#: ../../include/widgets.php:1200 ../../mod/admin.php:434
+#: ../../include/widgets.php:1214 ../../mod/admin.php:446
 msgid "Site"
 msgstr "Hub-instellingen"
 
-#: ../../include/widgets.php:1201
+#: ../../include/widgets.php:1215
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../../include/widgets.php:1202 ../../mod/admin.php:965
+#: ../../include/widgets.php:1216 ../../mod/admin.php:977
 msgid "Channels"
 msgstr "Kanalen"
 
-#: ../../include/widgets.php:1203 ../../mod/admin.php:1062
-#: ../../mod/admin.php:1102
+#: ../../include/widgets.php:1217 ../../mod/admin.php:1074
+#: ../../mod/admin.php:1114
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../../include/widgets.php:1204 ../../mod/admin.php:1262
-#: ../../mod/admin.php:1296
+#: ../../include/widgets.php:1218 ../../mod/admin.php:1274
+#: ../../mod/admin.php:1308
 msgid "Themes"
 msgstr "Thema's"
 
-#: ../../include/widgets.php:1205
+#: ../../include/widgets.php:1219
 msgid "Inspect queue"
 msgstr "Inspecteer berichtenwachtrij"
 
-#: ../../include/widgets.php:1206
+#: ../../include/widgets.php:1220
 msgid "Profile Config"
 msgstr "Profielconfiguratie"
 
-#: ../../include/widgets.php:1207
+#: ../../include/widgets.php:1221
 msgid "DB updates"
 msgstr "Database-updates"
 
-#: ../../include/widgets.php:1225 ../../include/widgets.php:1231
-#: ../../mod/admin.php:1381
+#: ../../include/widgets.php:1239 ../../include/widgets.php:1245
+#: ../../mod/admin.php:1393
 msgid "Logs"
 msgstr "Logboeken"
 
-#: ../../include/widgets.php:1229 ../../include/nav.php:210
+#: ../../include/widgets.php:1243 ../../include/nav.php:210
 msgid "Admin"
 msgstr "Beheer"
 
-#: ../../include/widgets.php:1230
+#: ../../include/widgets.php:1244
 msgid "Plugin Features"
 msgstr "Plug-in-opties"
 
-#: ../../include/widgets.php:1232
+#: ../../include/widgets.php:1246
 msgid "User registrations waiting for confirmation"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../include/widgets.php:1311 ../../mod/photos.php:753
-#: ../../mod/photos.php:1286
+#: ../../include/widgets.php:1324 ../../mod/photos.php:748
+#: ../../mod/photos.php:1283
 msgid "View Photo"
 msgstr "Foto weergeven"
 
-#: ../../include/widgets.php:1327 ../../mod/photos.php:782
+#: ../../include/widgets.php:1341 ../../mod/photos.php:779
 msgid "Edit Album"
 msgstr "Album bewerken"
 
+#: ../../include/bb2diaspora.php:376
+msgid "Attachments:"
+msgstr "Bijlagen:"
+
+#: ../../include/bb2diaspora.php:467
+msgid "$Projectname event notification:"
+msgstr "Notificatie $Projectname-gebeurtenis:"
+
 #: ../../include/bookmarks.php:35
 #, php-format
 msgid "%1$s's bookmarks"
@@ -2073,11 +2340,11 @@ msgid "YYYY-MM-DD or MM-DD"
 msgstr "JJJJ-MM-DD of MM-DD"
 
 #: ../../include/datetime.php:236 ../../mod/appman.php:91
-#: ../../mod/appman.php:92 ../../mod/events.php:452 ../../mod/events.php:457
+#: ../../mod/appman.php:92 ../../mod/events.php:437 ../../mod/events.php:442
 msgid "Required"
 msgstr "Vereist"
 
-#: ../../include/datetime.php:263 ../../boot.php:2289
+#: ../../include/datetime.php:263 ../../boot.php:2291
 msgid "never"
 msgstr "nooit"
 
@@ -2157,29 +2424,14 @@ msgstr "Verjaardag van %1$s"
 msgid "Happy Birthday %1$s"
 msgstr "Gefeliciteerd met je verjaardag %1$s"
 
-#: ../../include/api.php:1302
+#: ../../include/api.php:1336
 msgid "Public Timeline"
 msgstr "Openbare tijdlijn"
 
-#: ../../include/conversation.php:120 ../../include/text.php:1916
-#: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
-msgid "photo"
-msgstr "foto"
-
 #: ../../include/conversation.php:126 ../../mod/like.php:113
 msgid "channel"
 msgstr "kanaal"
 
-#: ../../include/conversation.php:148 ../../include/text.php:1922
-#: ../../mod/like.php:361 ../../mod/subthread.php:83
-msgid "status"
-msgstr "bericht"
-
-#: ../../include/conversation.php:150 ../../include/text.php:1924
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr "reactie"
-
 #: ../../include/conversation.php:164 ../../mod/like.php:410
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -2200,52 +2452,48 @@ msgstr "%1$s is nu met %2$s verbonden"
 msgid "%1$s poked %2$s"
 msgstr "%1$s heeft %2$s aangestoten"
 
-#: ../../include/conversation.php:243 ../../include/text.php:954
-msgid "poked"
-msgstr "aangestoten"
-
 #: ../../include/conversation.php:260 ../../mod/mood.php:63
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s is %2$s"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1063
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Likes"
 msgstr "vinden dit leuk"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1063
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Dislikes"
 msgstr "vinden dit niet leuk"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Agree"
 msgstr "eens"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Disagree"
 msgstr "oneens"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1064
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Abstain"
 msgstr "onthoudingen"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Attending"
 msgstr "aanwezig"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Not attending"
 msgstr "niet aanwezig"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1065
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Might attend"
 msgstr "mogelijk aanwezig"
@@ -2256,7 +2504,7 @@ msgstr "Kies"
 
 #: ../../include/conversation.php:664 ../../include/ItemObject.php:89
 msgid "Private Message"
-msgstr "Privébericht"
+msgstr "Niet voor iedereen zichtbaar"
 
 #: ../../include/conversation.php:671 ../../include/ItemObject.php:227
 msgid "Message signature validated"
@@ -2300,8 +2548,8 @@ msgstr "In context bekijken"
 
 #: ../../include/conversation.php:740 ../../include/conversation.php:1227
 #: ../../include/ItemObject.php:389 ../../mod/editwebpage.php:190
-#: ../../mod/photos.php:1029 ../../mod/editblock.php:150
-#: ../../mod/editlayout.php:148 ../../mod/editpost.php:129
+#: ../../mod/editblock.php:150 ../../mod/editlayout.php:148
+#: ../../mod/photos.php:1026 ../../mod/editpost.php:129
 msgid "Please wait"
 msgstr "Even wachten"
 
@@ -2407,8 +2655,8 @@ msgstr "%s vinden dit niet leuk."
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Voor <strong>iedereen</strong> zichtbaar"
 
-#: ../../include/conversation.php:1155 ../../mod/mail.php:194
-#: ../../mod/mail.php:308
+#: ../../include/conversation.php:1155 ../../mod/mail.php:202
+#: ../../mod/mail.php:316
 msgid "Please enter a link URL:"
 msgstr "Vul een internetadres/URL in:"
 
@@ -2432,22 +2680,22 @@ msgstr "Bewaar in map: "
 msgid "Where are you right now?"
 msgstr "Waar bevind je je op dit moment?"
 
-#: ../../include/conversation.php:1161 ../../mod/mail.php:195
-#: ../../mod/mail.php:309 ../../mod/editpost.php:56
+#: ../../include/conversation.php:1161 ../../mod/editpost.php:56
+#: ../../mod/mail.php:203 ../../mod/mail.php:317
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verloopt op DD-MM-YYYY om HH:MM"
 
 #: ../../include/conversation.php:1169 ../../include/page_widgets.php:40
 #: ../../include/ItemObject.php:706 ../../mod/editwebpage.php:212
-#: ../../mod/photos.php:1049 ../../mod/editblock.php:171
-#: ../../mod/webpages.php:188 ../../mod/editpost.php:149
-#: ../../mod/events.php:473
+#: ../../mod/editblock.php:171 ../../mod/webpages.php:188
+#: ../../mod/photos.php:1046 ../../mod/editpost.php:149
+#: ../../mod/events.php:458
 msgid "Preview"
 msgstr "Voorvertoning"
 
 #: ../../include/conversation.php:1192 ../../mod/blocks.php:154
-#: ../../mod/photos.php:1028 ../../mod/webpages.php:182
-#: ../../mod/layouts.php:184
+#: ../../mod/webpages.php:182 ../../mod/layouts.php:184
+#: ../../mod/photos.php:1025
 msgid "Share"
 msgstr "Delen"
 
@@ -2501,7 +2749,7 @@ msgstr "foto uploaden"
 
 #: ../../include/conversation.php:1206 ../../mod/editwebpage.php:183
 #: ../../mod/editblock.php:143 ../../mod/editlayout.php:141
-#: ../../mod/mail.php:240 ../../mod/mail.php:369 ../../mod/editpost.php:119
+#: ../../mod/editpost.php:119 ../../mod/mail.php:248 ../../mod/mail.php:378
 msgid "Attach file"
 msgstr "Bestand toevoegen"
 
@@ -2511,7 +2759,7 @@ msgstr "bestand toevoegen"
 
 #: ../../include/conversation.php:1208 ../../mod/editwebpage.php:184
 #: ../../mod/editblock.php:144 ../../mod/editlayout.php:142
-#: ../../mod/mail.php:241 ../../mod/mail.php:370 ../../mod/editpost.php:120
+#: ../../mod/editpost.php:120 ../../mod/mail.php:249 ../../mod/mail.php:379
 msgid "Insert web link"
 msgstr "Weblink invoegen"
 
@@ -2572,7 +2820,7 @@ msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
 
 #: ../../include/conversation.php:1228 ../../mod/editwebpage.php:191
 #: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
-#: ../../mod/editpost.php:130 ../../mod/events.php:474
+#: ../../mod/editpost.php:130 ../../mod/events.php:459
 msgid "Permission settings"
 msgstr "Permissies"
 
@@ -2594,7 +2842,7 @@ msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"
 
 #: ../../include/conversation.php:1252 ../../mod/editwebpage.php:217
 #: ../../mod/editblock.php:176 ../../mod/editlayout.php:173
-#: ../../mod/mail.php:245 ../../mod/mail.php:374 ../../mod/editpost.php:155
+#: ../../mod/editpost.php:155 ../../mod/mail.php:253 ../../mod/mail.php:383
 msgid "Set expiration date"
 msgstr "Verloopdatum instellen"
 
@@ -2603,7 +2851,7 @@ msgid "Set publish date"
 msgstr "Publicatiedatum instellen"
 
 #: ../../include/conversation.php:1257 ../../include/ItemObject.php:709
-#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:157
+#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385
 msgid "Encrypt text"
 msgstr "Tekst versleutelen"
 
@@ -2611,8 +2859,8 @@ msgstr "Tekst versleutelen"
 msgid "OK"
 msgstr "OK"
 
-#: ../../include/conversation.php:1260 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../include/conversation.php:1260 ../../mod/fbrowser.php:77
+#: ../../mod/fbrowser.php:112 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
 #: ../../mod/settings.php:587 ../../mod/settings.php:613
 #: ../../mod/editpost.php:160
 msgid "Cancel"
@@ -2671,7 +2919,7 @@ msgstr "Spam"
 msgid "Posts flagged as SPAM"
 msgstr "Berichten gemarkeerd als SPAM"
 
-#: ../../include/conversation.php:1601 ../../mod/admin.php:973
+#: ../../include/conversation.php:1601 ../../mod/admin.php:985
 msgid "Channel"
 msgstr "Kanaal"
 
@@ -2692,10 +2940,6 @@ msgstr "Profiel"
 msgid "Photos"
 msgstr "Foto's"
 
-#: ../../include/conversation.php:1625 ../../include/photos.php:483
-msgid "Photo Albums"
-msgstr "Fotoalbums"
-
 #: ../../include/conversation.php:1632
 msgid "Files and Storage"
 msgstr "Bestanden en opslagruimte"
@@ -2723,13 +2967,13 @@ msgid "Manage Webpages"
 msgstr "Webpagina's beheren"
 
 #: ../../include/conversation.php:1697 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1082
-#: ../../mod/photos.php:1094
+#: ../../include/ItemObject.php:187 ../../mod/photos.php:1079
+#: ../../mod/photos.php:1091
 msgid "View all"
 msgstr "Toon alles"
 
 #: ../../include/conversation.php:1724 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1091
+#: ../../mod/photos.php:1088
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -2827,8 +3071,8 @@ msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:79 ../../mod/id.php:15
-#: ../../mod/id.php:16 ../../mod/admin.php:805 ../../mod/admin.php:814
-#: ../../boot.php:1488
+#: ../../mod/id.php:16 ../../mod/admin.php:817 ../../mod/admin.php:826
+#: ../../boot.php:1490
 msgid "Email"
 msgstr "E-mail"
 
@@ -2856,23 +3100,6 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/zot.php:685
-msgid "Invalid data packet"
-msgstr "Datapakket ongeldig"
-
-#: ../../include/zot.php:701
-msgid "Unable to verify channel signature"
-msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
-
-#: ../../include/zot.php:2265
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
-
-#: ../../include/zot.php:3592
-msgid "invalid target signature"
-msgstr "ongeldig doelkenmerk"
-
 #: ../../include/bbcode.php:123 ../../include/bbcode.php:794
 #: ../../include/bbcode.php:797 ../../include/bbcode.php:802
 #: ../../include/bbcode.php:805 ../../include/bbcode.php:808
@@ -2943,7 +3170,7 @@ msgid_plural "%d invitations available"
 msgstr[0] "%d uitnodiging beschikbaar"
 msgstr[1] "%d uitnodigingen beschikbaar"
 
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:439
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:451
 msgid "Advanced"
 msgstr "Geavanceerd"
 
@@ -2996,46 +3223,22 @@ msgstr[1] "%d gemeenschappelijke connecties"
 msgid "show more"
 msgstr "meer connecties weergeven"
 
-#: ../../include/dir_fns.php:139
-msgid "Directory Options"
-msgstr "Opties kanalengids"
-
-#: ../../include/dir_fns.php:141
-msgid "Safe Mode"
-msgstr "Veilig zoeken"
-
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:106
-#: ../../mod/photos.php:626 ../../mod/admin.php:410 ../../mod/settings.php:577
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:462
-#: ../../mod/events.php:463 ../../mod/events.php:472 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490
-msgid "No"
-msgstr "Nee"
+#: ../../include/enotify.php:57 ../../include/network.php:1608
+msgid "$Projectname Notification"
+msgstr "$Projectname-notificatie"
 
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/api.php:105 ../../mod/photos.php:626 ../../mod/admin.php:412
-#: ../../mod/settings.php:577 ../../mod/menu.php:96 ../../mod/menu.php:153
-#: ../../mod/events.php:462 ../../mod/events.php:463 ../../mod/events.php:472
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490
-msgid "Yes"
-msgstr "Ja"
+#: ../../include/enotify.php:58 ../../include/network.php:1609
+msgid "$projectname"
+msgstr "$projectname"
 
-#: ../../include/dir_fns.php:142
-msgid "Public Forums Only"
-msgstr "Alleen openbare forums"
+#: ../../include/enotify.php:60 ../../include/network.php:1611
+msgid "Thank You,"
+msgstr "Bedankt,"
 
-#: ../../include/dir_fns.php:143
-msgid "This Website Only"
-msgstr "Alleen deze hub"
+#: ../../include/enotify.php:62 ../../include/network.php:1613
+#, php-format
+msgid "%s Administrator"
+msgstr "Beheerder %s"
 
 #: ../../include/enotify.php:96
 #, php-format
@@ -3232,19 +3435,19 @@ msgstr "Antwoord van het kanaal op afstand was niet volledig."
 msgid "Channel was deleted and no longer exists."
 msgstr "Kanaal is verwijderd en bestaat niet meer."
 
-#: ../../include/follow.php:152 ../../include/follow.php:180
+#: ../../include/follow.php:153 ../../include/follow.php:183
 msgid "Protocol disabled."
 msgstr "Protocol uitgeschakeld."
 
-#: ../../include/follow.php:170
+#: ../../include/follow.php:173
 msgid "Channel discovery failed."
 msgstr "Kanaal ontdekken mislukt."
 
-#: ../../include/follow.php:196
+#: ../../include/follow.php:199
 msgid "local account not found."
 msgstr "lokale account niet gevonden."
 
-#: ../../include/follow.php:220
+#: ../../include/follow.php:224
 msgid "Cannot connect to yourself."
 msgstr "Kan niet met jezelf verbinden"
 
@@ -3256,7 +3459,23 @@ msgstr "Ingesloten inhoud"
 msgid "Embedding disabled"
 msgstr "Insluiten uitgeschakeld"
 
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1485
+#: ../../include/message.php:19
+msgid "No recipient provided."
+msgstr "Geen ontvanger opgegeven."
+
+#: ../../include/message.php:24
+msgid "[no subject]"
+msgstr "[geen onderwerp]"
+
+#: ../../include/message.php:44
+msgid "Unable to determine sender."
+msgstr "Afzender kan niet bepaald worden."
+
+#: ../../include/message.php:219
+msgid "Stored post could not be verified."
+msgstr "Opgeslagen bericht kon niet worden geverifieerd."
+
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1487
 msgid "Logout"
 msgstr "Uitloggen"
 
@@ -3270,7 +3489,7 @@ msgstr "Home"
 
 #: ../../include/nav.php:85
 msgid "Your posts and conversations"
-msgstr "Jouw berichten en conversaties"
+msgstr "Jouw kanaal"
 
 #: ../../include/nav.php:86
 msgid "Your profile page"
@@ -3312,7 +3531,7 @@ msgstr "Jouw bladwijzers"
 msgid "Your webpages"
 msgstr "Jouw webpagina's"
 
-#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1486
+#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1488
 msgid "Login"
 msgstr "Inloggen"
 
@@ -3337,7 +3556,7 @@ msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub"
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1462
+#: ../../include/nav.php:149 ../../mod/register.php:226 ../../boot.php:1470
 msgid "Register"
 msgstr "Registreren"
 
@@ -3346,7 +3565,7 @@ msgid "Create an account"
 msgstr "Maak een account aan"
 
 #: ../../include/nav.php:154 ../../include/apps.php:142
-#: ../../mod/layouts.php:176 ../../mod/help.php:202 ../../mod/help.php:207
+#: ../../mod/layouts.php:176 ../../mod/help.php:204 ../../mod/help.php:209
 msgid "Help"
 msgstr "Hulp"
 
@@ -3358,12 +3577,6 @@ msgstr "Hulp en documentatie"
 msgid "Applications, utilities, links, games"
 msgstr "Apps"
 
-#: ../../include/nav.php:159 ../../include/text.php:867
-#: ../../include/text.php:879 ../../include/apps.php:147
-#: ../../mod/search.php:40
-msgid "Search"
-msgstr "Zoeken"
-
 #: ../../include/nav.php:159
 msgid "Search site @name, #tag, ?docs, content"
 msgstr "Zoek een @kanaal, doorzoek inhoud hub met tekst en #tags, of doorzoek ?documentatie "
@@ -3390,11 +3603,11 @@ msgstr "Markeer alle gridnotificaties als bekeken"
 
 #: ../../include/nav.php:177 ../../include/apps.php:137
 msgid "Channel Home"
-msgstr "Tijdlijn kanaal"
+msgstr "Jouw kanaal"
 
 #: ../../include/nav.php:177
 msgid "Channel home"
-msgstr "Tijdlijn kanaal"
+msgstr "Jouw kanaal"
 
 #: ../../include/nav.php:178
 msgid "Mark all channel notifications seen"
@@ -3483,244 +3696,46 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. "
 
-#: ../../include/text.php:394
-msgid "prev"
-msgstr "vorige"
-
-#: ../../include/text.php:396
-msgid "first"
-msgstr "eerste"
-
-#: ../../include/text.php:425
-msgid "last"
-msgstr "laatste"
-
-#: ../../include/text.php:428
-msgid "next"
-msgstr "volgende"
-
-#: ../../include/text.php:438
-msgid "older"
-msgstr "ouder"
-
-#: ../../include/text.php:440
-msgid "newer"
-msgstr "nieuwer"
-
-#: ../../include/text.php:785
-msgid "No connections"
-msgstr "Geen connecties"
-
-#: ../../include/text.php:797
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d connectie"
-msgstr[1] "%d connecties"
-
-#: ../../include/text.php:810 ../../mod/viewconnections.php:101
-msgid "View Connections"
-msgstr "Connecties weergeven"
-
-#: ../../include/text.php:954
-msgid "poke"
-msgstr "aanstoten"
-
-#: ../../include/text.php:955
-msgid "ping"
-msgstr "ping"
-
-#: ../../include/text.php:955
-msgid "pinged"
-msgstr "gepingd"
-
-#: ../../include/text.php:956
-msgid "prod"
-msgstr "por"
-
-#: ../../include/text.php:956
-msgid "prodded"
-msgstr "gepord"
-
-#: ../../include/text.php:957
-msgid "slap"
-msgstr "slaan"
-
-#: ../../include/text.php:957
-msgid "slapped"
-msgstr "sloeg"
-
-#: ../../include/text.php:958
-msgid "finger"
-msgstr "finger"
-
-#: ../../include/text.php:958
-msgid "fingered"
-msgstr "gefingerd"
-
-#: ../../include/text.php:959
-msgid "rebuff"
-msgstr "afpoeieren"
-
-#: ../../include/text.php:959
-msgid "rebuffed"
-msgstr "afgepoeierd"
-
-#: ../../include/text.php:969
-msgid "happy"
-msgstr "gelukkig"
-
-#: ../../include/text.php:970
-msgid "sad"
-msgstr "bedroefd"
-
-#: ../../include/text.php:971
-msgid "mellow"
-msgstr "mellow"
-
-#: ../../include/text.php:972
-msgid "tired"
-msgstr "moe"
-
-#: ../../include/text.php:973
-msgid "perky"
-msgstr "parmantig"
-
-#: ../../include/text.php:974
-msgid "angry"
-msgstr "boos"
-
-#: ../../include/text.php:975
-msgid "stupified"
-msgstr "beteuterd"
-
-#: ../../include/text.php:976
-msgid "puzzled"
-msgstr "verward"
-
-#: ../../include/text.php:977
-msgid "interested"
-msgstr "geïnteresseerd"
-
-#: ../../include/text.php:978
-msgid "bitter"
-msgstr "verbitterd"
-
-#: ../../include/text.php:979
-msgid "cheerful"
-msgstr "vrolijk"
-
-#: ../../include/text.php:980
-msgid "alive"
-msgstr "levendig"
-
-#: ../../include/text.php:981
-msgid "annoyed"
-msgstr "geërgerd"
-
-#: ../../include/text.php:982
-msgid "anxious"
-msgstr "bezorgd"
-
-#: ../../include/text.php:983
-msgid "cranky"
-msgstr "humeurig"
-
-#: ../../include/text.php:984
-msgid "disturbed"
-msgstr "verontrust"
-
-#: ../../include/text.php:985
-msgid "frustrated"
-msgstr "gefrustreerd "
-
-#: ../../include/text.php:986
-msgid "depressed"
-msgstr "gedeprimeerd"
-
-#: ../../include/text.php:987
-msgid "motivated"
-msgstr "gemotiveerd"
-
-#: ../../include/text.php:988
-msgid "relaxed"
-msgstr "ontspannen"
-
-#: ../../include/text.php:989
-msgid "surprised"
-msgstr "verrast"
-
-#: ../../include/text.php:1165
-msgid "May"
-msgstr "mei"
-
-#: ../../include/text.php:1242 ../../include/text.php:1246
-msgid "Unknown Attachment"
-msgstr "Onbekende bijlage"
-
-#: ../../include/text.php:1248
-msgid "unknown"
-msgstr "onbekend"
-
-#: ../../include/text.php:1284
-msgid "remove category"
-msgstr "categorie verwijderen"
-
-#: ../../include/text.php:1361
-msgid "remove from file"
-msgstr "uit map verwijderen"
-
-#: ../../include/text.php:1507 ../../include/text.php:1518
-msgid "Click to open/close"
-msgstr "Klik om te openen of te sluiten"
-
-#: ../../include/text.php:1692 ../../mod/events.php:638
-msgid "Link to Source"
-msgstr "Originele locatie"
-
-#: ../../include/text.php:1713 ../../include/text.php:1785
-msgid "default"
-msgstr "standaard"
-
-#: ../../include/text.php:1721
-msgid "Page layout"
-msgstr "Pagina-lay-out"
-
-#: ../../include/text.php:1721
-msgid "You can create your own with the layouts tool"
-msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
-
-#: ../../include/text.php:1763
-msgid "Page content type"
-msgstr "Opmaaktype pagina"
-
-#: ../../include/text.php:1797
-msgid "Select an alternate language"
-msgstr "Kies een andere taal"
-
-#: ../../include/text.php:1929
-msgid "activity"
-msgstr "activiteit"
+#: ../../include/dir_fns.php:139
+msgid "Directory Options"
+msgstr "Opties kanalengids"
 
-#: ../../include/text.php:2224
-msgid "Design Tools"
-msgstr "Ontwerp-hulpmiddelen"
+#: ../../include/dir_fns.php:141
+msgid "Safe Mode"
+msgstr "Veilig zoeken"
 
-#: ../../include/text.php:2227 ../../mod/blocks.php:147
-msgid "Blocks"
-msgstr "Blokken"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:102
+#: ../../mod/admin.php:415 ../../mod/settings.php:577 ../../mod/photos.php:626
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:447
+#: ../../mod/events.php:448 ../../mod/events.php:457 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1492
+msgid "No"
+msgstr "Nee"
 
-#: ../../include/text.php:2228 ../../mod/menu.php:103
-msgid "Menus"
-msgstr "Menu's"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/api.php:101 ../../mod/admin.php:417 ../../mod/settings.php:577
+#: ../../mod/photos.php:626 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1492
+msgid "Yes"
+msgstr "Ja"
 
-#: ../../include/text.php:2229 ../../mod/layouts.php:174
-msgid "Layouts"
-msgstr "Lay-outs"
+#: ../../include/dir_fns.php:142
+msgid "Public Forums Only"
+msgstr "Alleen openbare forums"
 
-#: ../../include/text.php:2230
-msgid "Pages"
-msgstr "Pagina's"
+#: ../../include/dir_fns.php:143
+msgid "This Website Only"
+msgstr "Alleen deze hub"
 
 #: ../../include/group.php:26
 msgid ""
@@ -3733,7 +3748,7 @@ msgstr "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande item
 msgid "Add new connections to this collection (privacy group)"
 msgstr "Voeg nieuwe connecties aan deze collectie toe (privacy-groep)"
 
-#: ../../include/group.php:251 ../../mod/admin.php:814
+#: ../../include/group.php:251 ../../mod/admin.php:826
 msgid "All Channels"
 msgstr "Alle kanalen"
 
@@ -3757,6 +3772,23 @@ msgstr "Nieuwe collectie toevoegen"
 msgid "Channels not in any collection"
 msgstr "Kanalen die zich in geen enkele collectie bevinden"
 
+#: ../../include/zot.php:676
+msgid "Invalid data packet"
+msgstr "Datapakket ongeldig"
+
+#: ../../include/zot.php:692
+msgid "Unable to verify channel signature"
+msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
+
+#: ../../include/zot.php:2268
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
+
+#: ../../include/zot.php:3584
+msgid "invalid target signature"
+msgstr "ongeldig doelkenmerk"
+
 #: ../../include/page_widgets.php:6
 msgid "New Page"
 msgstr "Nieuwe pagina"
@@ -3788,32 +3820,24 @@ msgstr "Aangemaakt"
 msgid "Edited"
 msgstr "Bewerkt"
 
+#: ../../include/network.php:630
+msgid "view full size"
+msgstr "volledige grootte tonen"
+
+#: ../../include/network.php:1655 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
+msgid "Administrator"
+msgstr "Beheerder"
+
+#: ../../include/network.php:1669
+msgid "No Subject"
+msgstr "Geen onderwerp"
+
 #: ../../include/dba/dba_driver.php:141
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden"
 
-#: ../../include/photos.php:112
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"
-
-#: ../../include/photos.php:119
-msgid "Image file is empty."
-msgstr "Afbeeldingsbestand is leeg"
-
-#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
-msgid "Unable to process image"
-msgstr "Afbeelding kan niet verwerkt worden"
-
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr "Foto kan niet worden opgeslagen"
-
-#: ../../include/photos.php:487
-msgid "Upload New Photos"
-msgstr "Nieuwe foto's uploaden"
-
 #: ../../include/ItemObject.php:130
 msgid "Save to Folder"
 msgstr "In map opslaan"
@@ -3862,11 +3886,11 @@ msgstr "met ster"
 msgid "Add Tag"
 msgstr "Tag toevoegen"
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:1026
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
 msgid "I like this (toggle)"
 msgstr "Vind ik leuk"
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:1027
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
 msgid "I don't like this (toggle)"
 msgstr "Vind ik niet leuk"
 
@@ -3922,18 +3946,18 @@ msgstr "Aan agenda toevoegen"
 msgid "Mark all seen"
 msgstr "Markeer alles als bekeken"
 
-#: ../../include/ItemObject.php:378 ../../mod/photos.php:1212
+#: ../../include/ItemObject.php:378 ../../mod/photos.php:1209
 msgctxt "noun"
 msgid "Likes"
 msgstr "vinden dit leuk"
 
-#: ../../include/ItemObject.php:379 ../../mod/photos.php:1213
+#: ../../include/ItemObject.php:379 ../../mod/photos.php:1210
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "vinden dit niet leuk"
 
-#: ../../include/ItemObject.php:694 ../../mod/photos.php:1045
-#: ../../mod/photos.php:1163
+#: ../../include/ItemObject.php:694 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
 msgid "This is you"
 msgstr "Dit ben jij"
 
@@ -3949,78 +3973,6 @@ msgstr "Link invoegen"
 msgid "Video"
 msgstr "Video"
 
-#: ../../include/account.php:27
-msgid "Not a valid email address"
-msgstr "Geen geldig e-mailadres"
-
-#: ../../include/account.php:29
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Jouw e-maildomein is op deze hub niet toegestaan"
-
-#: ../../include/account.php:35
-msgid "Your email address is already registered at this site."
-msgstr "Jouw e-mailadres is al op deze hub geregistreerd."
-
-#: ../../include/account.php:67
-msgid "An invitation is required."
-msgstr "Een uitnodiging is vereist"
-
-#: ../../include/account.php:71
-msgid "Invitation could not be verified."
-msgstr "Uitnodiging kon niet geverifieerd worden"
-
-#: ../../include/account.php:121
-msgid "Please enter the required information."
-msgstr "Vul de vereiste informatie in."
-
-#: ../../include/account.php:188
-msgid "Failed to store account information."
-msgstr "Account-informatie kon niet opgeslagen worden."
-
-#: ../../include/account.php:248
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Registratiebevestiging voor %s"
-
-#: ../../include/account.php:314
-#, php-format
-msgid "Registration request at %s"
-msgstr "Registratiebevestiging voor %s"
-
-#: ../../include/account.php:338
-msgid "your registration password"
-msgstr "jouw registratiewachtwoord"
-
-#: ../../include/account.php:341 ../../include/account.php:401
-#, php-format
-msgid "Registration details for %s"
-msgstr "Registratiegegevens voor %s"
-
-#: ../../include/account.php:410
-msgid "Account approved."
-msgstr "Account goedgekeurd"
-
-#: ../../include/account.php:449
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registratie ingetrokken voor %s"
-
-#: ../../include/account.php:494
-msgid "Account verified. Please login."
-msgstr "Account is geverifieerd. Je kan inloggen."
-
-#: ../../include/account.php:707 ../../include/account.php:709
-msgid "Click here to upgrade."
-msgstr "Klik hier om te upgraden."
-
-#: ../../include/account.php:715
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden."
-
-#: ../../include/account.php:720
-msgid "This action is not available under your subscription plan."
-msgstr "Deze handeling is niet mogelijk met jouw abonnement."
-
 #: ../../include/apps.php:128
 msgid "Site Admin"
 msgstr "Hubbeheerder"
@@ -4202,12 +4154,84 @@ msgstr "Groepsopslag"
 msgid "Custom/Expert Mode"
 msgstr "Expertmodus/handmatig aanpassen"
 
-#: ../../include/photo/photo_driver.php:719 ../../mod/photos.php:94
-#: ../../mod/photos.php:699 ../../mod/profile_photo.php:147
+#: ../../include/photo/photo_driver.php:719 ../../mod/profile_photo.php:147
 #: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:379
+#: ../../mod/photos.php:94 ../../mod/photos.php:699
 msgid "Profile Photos"
 msgstr "Profielfoto's"
 
+#: ../../include/account.php:27
+msgid "Not a valid email address"
+msgstr "Geen geldig e-mailadres"
+
+#: ../../include/account.php:29
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Jouw e-maildomein is op deze hub niet toegestaan"
+
+#: ../../include/account.php:35
+msgid "Your email address is already registered at this site."
+msgstr "Jouw e-mailadres is al op deze hub geregistreerd."
+
+#: ../../include/account.php:67
+msgid "An invitation is required."
+msgstr "Een uitnodiging is vereist"
+
+#: ../../include/account.php:71
+msgid "Invitation could not be verified."
+msgstr "Uitnodiging kon niet geverifieerd worden"
+
+#: ../../include/account.php:121
+msgid "Please enter the required information."
+msgstr "Vul de vereiste informatie in."
+
+#: ../../include/account.php:188
+msgid "Failed to store account information."
+msgstr "Account-informatie kon niet opgeslagen worden."
+
+#: ../../include/account.php:248
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr "Registratiebevestiging voor %s"
+
+#: ../../include/account.php:314
+#, php-format
+msgid "Registration request at %s"
+msgstr "Registratiebevestiging voor %s"
+
+#: ../../include/account.php:338
+msgid "your registration password"
+msgstr "jouw registratiewachtwoord"
+
+#: ../../include/account.php:341 ../../include/account.php:401
+#, php-format
+msgid "Registration details for %s"
+msgstr "Registratiegegevens voor %s"
+
+#: ../../include/account.php:410
+msgid "Account approved."
+msgstr "Account goedgekeurd"
+
+#: ../../include/account.php:449
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registratie ingetrokken voor %s"
+
+#: ../../include/account.php:494
+msgid "Account verified. Please login."
+msgstr "Account is geverifieerd. Je kan inloggen."
+
+#: ../../include/account.php:707 ../../include/account.php:709
+msgid "Click here to upgrade."
+msgstr "Klik hier om te upgraden."
+
+#: ../../include/account.php:715
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden."
+
+#: ../../include/account.php:720
+msgid "This action is not available under your subscription plan."
+msgstr "Deze handeling is niet mogelijk met jouw abonnement."
+
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
 msgstr "Toegang geweigerd"
@@ -4300,36 +4324,36 @@ msgstr "Alle kanaalconnecties"
 msgid "Click on a channel to add or remove."
 msgstr "Klik op een kanaal om deze toe te voegen of te verwijderen."
 
-#: ../../mod/item.php:173
+#: ../../mod/item.php:174
 msgid "Unable to locate original post."
 msgstr "Niet in staat om de originele locatie van het bericht te vinden. "
 
-#: ../../mod/item.php:417
+#: ../../mod/item.php:418
 msgid "Empty post discarded."
 msgstr "Leeg bericht geannuleerd"
 
-#: ../../mod/item.php:457
+#: ../../mod/item.php:458
 msgid "Executable content type not permitted to this channel."
 msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."
 
-#: ../../mod/item.php:822
+#: ../../mod/item.php:823
 msgid "Duplicate post suppressed."
 msgstr "Dubbel bericht tegengehouden."
 
-#: ../../mod/item.php:953
+#: ../../mod/item.php:954
 msgid "System error. Post not saved."
 msgstr "Systeemfout. Bericht niet opgeslagen."
 
-#: ../../mod/item.php:1220
+#: ../../mod/item.php:1221
 msgid "Unable to obtain post information from database."
 msgstr "Niet in staat om informatie over dit bericht uit de database te verkrijgen."
 
-#: ../../mod/item.php:1227
+#: ../../mod/item.php:1228
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt."
 
-#: ../../mod/item.php:1234
+#: ../../mod/item.php:1235
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt."
@@ -4409,7 +4433,8 @@ msgstr "Geen overeenkomsten"
 msgid "OpenID protocol error. No ID returned."
 msgstr "OpenID-protocolfout. Geen ID terugontvangen."
 
-#: ../../mod/openid.php:72 ../../mod/openid.php:179 ../../mod/post.php:285
+#: ../../mod/openid.php:72 ../../mod/openid.php:179
+#: ../../Zotlabs/Zot/Auth.php:248
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Welkom %s. Authenticatie op afstand geslaagd."
@@ -4645,7 +4670,7 @@ msgstr "Ongeldig item."
 msgid "Channel not found."
 msgstr "Kanaal niet gevonden."
 
-#: ../../mod/page.php:89 ../../mod/display.php:110 ../../mod/help.php:214
+#: ../../mod/page.php:89 ../../mod/display.php:110 ../../mod/help.php:216
 #: ../../mod/block.php:75 ../../index.php:241
 msgid "Page not found."
 msgstr "Pagina niet gevonden."
@@ -4757,8 +4782,8 @@ msgstr "Lees meer over kanaaltypes"
 msgid "No ratings"
 msgstr "Geen beoordelingen"
 
-#: ../../mod/ratings.php:82 ../../mod/search.php:13 ../../mod/directory.php:59
-#: ../../mod/photos.php:490 ../../mod/display.php:13
+#: ../../mod/ratings.php:82 ../../mod/display.php:13
+#: ../../mod/directory.php:59 ../../mod/photos.php:490 ../../mod/search.php:13
 #: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr "Openbare toegang geweigerd."
@@ -4815,8 +4840,8 @@ msgstr "Please see the file \"install/INSTALL.txt\"."
 msgid "System check"
 msgstr "System check"
 
-#: ../../mod/setup.php:285 ../../mod/photos.php:914 ../../mod/events.php:668
-#: ../../mod/events.php:675
+#: ../../mod/setup.php:285 ../../mod/photos.php:911 ../../mod/events.php:653
+#: ../../mod/events.php:660
 msgid "Next"
 msgstr "Volgende"
 
@@ -5204,15 +5229,6 @@ msgstr "Mijn bladwijzers"
 msgid "My Connections Bookmarks"
 msgstr "Bladwijzers van mijn connecties"
 
-#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:157
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../mod/home.php:75
-#, php-format
-msgid "Welcome to %s"
-msgstr "Welkom op %s"
-
 #: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
 msgid "This setting requires special processing and editing has been blocked."
 msgstr "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd."
@@ -5317,7 +5333,7 @@ msgstr "Homepage"
 msgid "Interests"
 msgstr "Interesses"
 
-#: ../../mod/profiles.php:457 ../../mod/admin.php:974
+#: ../../mod/profiles.php:457 ../../mod/admin.php:986
 msgid "Address"
 msgstr "Kanaaladres"
 
@@ -5501,16 +5517,6 @@ msgstr "Dingen aan je profiel toevoegen"
 msgid "Include desirable objects in your profile"
 msgstr "Voeg door jou gewenste dingen aan jouw profiel toe"
 
-#: ../../mod/search.php:212
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "Items getagd met %s"
-
-#: ../../mod/search.php:214
-#, php-format
-msgid "Search results for: %s"
-msgstr "Zoekresultaten voor %s"
-
 #: ../../mod/connedit.php:75
 msgid "Could not access contact record."
 msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
@@ -5570,11 +5576,11 @@ msgstr "Kanaal-activiteit"
 msgid "View recent posts and comments"
 msgstr "Recente berichten en reacties weergeven"
 
-#: ../../mod/connedit.php:519 ../../mod/admin.php:811
+#: ../../mod/connedit.php:519 ../../mod/admin.php:823
 msgid "Unblock"
 msgstr "Deblokkeren"
 
-#: ../../mod/connedit.php:519 ../../mod/admin.php:810
+#: ../../mod/connedit.php:519 ../../mod/admin.php:822
 msgid "Block"
 msgstr "Blokkeren"
 
@@ -5730,7 +5736,7 @@ msgid ""
 " communication."
 msgstr "(%s) wil met jou verbinden. Keur dit connectieverzoek goed om onderling te kunnen communiceren."
 
-#: ../../mod/connedit.php:710 ../../mod/admin.php:807
+#: ../../mod/connedit.php:710 ../../mod/admin.php:819
 msgid "Approve"
 msgstr "Goedkeuren"
 
@@ -5903,19 +5909,19 @@ msgstr "voegde jouw kanaal toe"
 msgid "posted an event"
 msgstr "plaatste een gebeurtenis"
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
+#: ../../mod/api.php:74 ../../mod/api.php:98
 msgid "Authorize application connection"
 msgstr "Geef toestemming voor applicatiekoppeling"
 
-#: ../../mod/api.php:77
+#: ../../mod/api.php:75
 msgid "Return to your app and insert this Securty Code:"
 msgstr "Ga terug naar je app en voeg deze beveiligingscode in:"
 
-#: ../../mod/api.php:89
+#: ../../mod/api.php:85
 msgid "Please login to continue."
 msgstr "Inloggen om verder te kunnen gaan."
 
-#: ../../mod/api.php:104
+#: ../../mod/api.php:100
 msgid ""
 "Do you want to authorize this application to access your posts and contacts,"
 " and/or create new posts for you?"
@@ -5941,7 +5947,7 @@ msgstr "Bladwijzer opslaan"
 msgid "URL of bookmark"
 msgstr "URL van bladwijzer"
 
-#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:465
+#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:450
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -6044,7 +6050,7 @@ msgstr "Verwijder item-tag"
 msgid "Select a tag to remove: "
 msgstr "Kies een tag om te verwijderen"
 
-#: ../../mod/tagrm.php:133 ../../mod/photos.php:954
+#: ../../mod/tagrm.php:133 ../../mod/photos.php:951
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -6155,7 +6161,7 @@ msgid ""
 "Password reset failed."
 msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1494
+#: ../../mod/lostpass.php:86 ../../boot.php:1496
 msgid "Password Reset"
 msgstr "Wachtwoord vergeten?"
 
@@ -6313,156 +6319,75 @@ msgid ""
 "only once and leave this page open until finished."
 msgstr "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid."
 
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr "Informatie over de pagina-eigenaar werd niet ontvangen."
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr "Album niet gevonden."
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr "Verwijder album"
+#: ../../mod/invite.php:25
+msgid "Total invitation limit exceeded."
+msgstr "Limiet voor aantal uitnodigingen overschreden."
 
-#: ../../mod/photos.php:171 ../../mod/photos.php:1009
-msgid "Delete Photo"
-msgstr "Verwijder foto"
+#: ../../mod/invite.php:49
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : Geen geldig e-mailadres."
 
-#: ../../mod/photos.php:501
-msgid "No photos selected"
-msgstr "Geen foto's geselecteerd"
+#: ../../mod/invite.php:59
+msgid "Please join us on $Projectname"
+msgstr "Uitnodiging voor $Projectname"
 
-#: ../../mod/photos.php:550
-msgid "Access to this item is restricted."
-msgstr "Toegang tot dit item is beperkt."
+#: ../../mod/invite.php:70
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder."
 
-#: ../../mod/photos.php:589
+#: ../../mod/invite.php:75
 #, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt."
+msgid "%s : Message delivery failed."
+msgstr "%s: Aflevering bericht mislukt."
 
-#: ../../mod/photos.php:592
+#: ../../mod/invite.php:79
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB aan foto-opslag gebruikt."
-
-#: ../../mod/photos.php:620
-msgid "Upload Photos"
-msgstr "Foto's uploaden"
-
-#: ../../mod/photos.php:624
-msgid "Enter an album name"
-msgstr "Vul een albumnaam in"
-
-#: ../../mod/photos.php:625
-msgid "or select an existing album (doubleclick)"
-msgstr "of kies een bestaand album (dubbelklikken)"
-
-#: ../../mod/photos.php:626
-msgid "Create a status post for this upload"
-msgstr "Plaats een bericht voor deze upload."
-
-#: ../../mod/photos.php:627
-msgid "Caption (optional):"
-msgstr "Bijschrift (optioneel):"
-
-#: ../../mod/photos.php:628
-msgid "Description (optional):"
-msgstr "Omschrijving (optioneel):"
-
-#: ../../mod/photos.php:655
-msgid "Album name could not be decoded"
-msgstr "Albumnaam kon niet gedecodeerd worden"
-
-#: ../../mod/photos.php:699 ../../mod/photos.php:1236
-#: ../../mod/photos.php:1253
-msgid "Contact Photos"
-msgstr "Connectiefoto's"
-
-#: ../../mod/photos.php:727
-msgid "Show Newest First"
-msgstr "Nieuwste eerst weergeven"
-
-#: ../../mod/photos.php:729
-msgid "Show Oldest First"
-msgstr "Oudste eerst weergeven"
-
-#: ../../mod/photos.php:827
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."
-
-#: ../../mod/photos.php:829
-msgid "Photo not available"
-msgstr "Foto niet aanwezig"
-
-#: ../../mod/photos.php:887
-msgid "Use as profile photo"
-msgstr "Als profielfoto gebruiken"
-
-#: ../../mod/photos.php:894
-msgid "Private Photo"
-msgstr "Privéfoto"
-
-#: ../../mod/photos.php:905 ../../mod/events.php:667 ../../mod/events.php:674
-msgid "Previous"
-msgstr "Vorige"
-
-#: ../../mod/photos.php:909
-msgid "View Full Size"
-msgstr "Volledige grootte weergeven"
-
-#: ../../mod/photos.php:988
-msgid "Edit photo"
-msgstr "Foto bewerken"
-
-#: ../../mod/photos.php:990
-msgid "Rotate CW (right)"
-msgstr "Draai met de klok mee (naar rechts)"
-
-#: ../../mod/photos.php:991
-msgid "Rotate CCW (left)"
-msgstr "Draai tegen de klok in (naar links)"
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d bericht verzonden."
+msgstr[1] "%d berichten verzonden."
 
-#: ../../mod/photos.php:994
-msgid "Enter a new album name"
-msgstr "Vul een nieuwe albumnaam in"
+#: ../../mod/invite.php:98
+msgid "You have no more invitations available"
+msgstr "Je hebt geen uitnodigingen meer beschikbaar"
 
-#: ../../mod/photos.php:995
-msgid "or select an existing one (doubleclick)"
-msgstr "of kies een bestaand album (dubbelklikken)"
+#: ../../mod/invite.php:129
+msgid "Send invitations"
+msgstr "Uitnodigingen verzenden"
 
-#: ../../mod/photos.php:998
-msgid "Caption"
-msgstr "Bijschrift"
+#: ../../mod/invite.php:130
+msgid "Enter email addresses, one per line:"
+msgstr "Voer e-mailadressen in, één per regel:"
 
-#: ../../mod/photos.php:1000
-msgid "Add a Tag"
-msgstr "Tag toevoegen"
+#: ../../mod/invite.php:131 ../../mod/mail.php:246
+msgid "Your message:"
+msgstr "Jouw bericht:"
 
-#: ../../mod/photos.php:1004
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"
+#: ../../mod/invite.php:132
+msgid "Please join my community on $Projectname."
+msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op $Projectname te vergezellen. Lees meer over $Projectname  op https://redmatrix.me."
 
-#: ../../mod/photos.php:1007
-msgid "Flag as adult in album view"
-msgstr "Markeer als voor volwassenen in albumweergave"
+#: ../../mod/invite.php:134
+msgid "You will need to supply this invitation code: "
+msgstr "Je moet deze uitnodigingscode opgeven: "
 
-#: ../../mod/photos.php:1199
-msgid "In This Photo:"
-msgstr "Op deze foto:"
+#: ../../mod/invite.php:135
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Registreer je op een willekeurige $Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):"
 
-#: ../../mod/photos.php:1204
-msgid "Map"
-msgstr "Kaart"
+#: ../../mod/invite.php:137
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn $Projectname-kanaaladres in het zoekveld invullen:"
 
-#: ../../mod/photos.php:1292
-msgid "View Album"
-msgstr "Album weergeven"
+#: ../../mod/invite.php:138
+msgid "or visit "
+msgstr "of bezoek "
 
-#: ../../mod/photos.php:1315
-msgid "Recent Photos"
-msgstr "Recente foto's"
+#: ../../mod/invite.php:140
+msgid "3. Click [Connect]"
+msgstr "3. Klik op [+ Verbinden]"
 
 #: ../../mod/probe.php:24 ../../mod/probe.php:30
 #, php-format
@@ -6688,6 +6613,10 @@ msgstr "forum"
 msgid "Search Results For:"
 msgstr "Zoekresultaten voor:"
 
+#: ../../mod/network.php:169 ../../mod/channel.php:131 ../../mod/rpost.php:114
+msgid "Public"
+msgstr "Openbaar"
+
 #: ../../mod/network.php:207
 msgid "Collection is empty"
 msgstr "Collectie is leeg"
@@ -6733,807 +6662,817 @@ msgstr "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te w
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet met elkaar overeen."
 
-#: ../../mod/register.php:117
+#: ../../mod/register.php:119
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "Registratie geslaagd. Controleer je e-mail voor instructies."
 
-#: ../../mod/register.php:123
+#: ../../mod/register.php:125
 msgid "Your registration is pending approval by the site owner."
 msgstr "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze $Projectname-hub."
 
-#: ../../mod/register.php:126
+#: ../../mod/register.php:128
 msgid "Your registration can not be processed."
 msgstr "Jouw registratie kan niet verwerkt worden."
 
-#: ../../mod/register.php:163
+#: ../../mod/register.php:165
 msgid "Registration on this site/hub is by approval only."
 msgstr "Registraties op deze $Projectname-hub moeten eerst worden goedgekeurd."
 
-#: ../../mod/register.php:164
+#: ../../mod/register.php:166
 msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
 msgstr "<a href=\"pubsites\">Registreer op een andere $Projectname-hub</a>"
 
-#: ../../mod/register.php:174
+#: ../../mod/register.php:176
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Deze $Projectname-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals."
 
-#: ../../mod/register.php:185
+#: ../../mod/register.php:187
 msgid "Terms of Service"
 msgstr "Gebruiksvoorwaarden"
 
-#: ../../mod/register.php:191
+#: ../../mod/register.php:193
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Ik accepteer de %s van deze $Projectname-hub"
 
-#: ../../mod/register.php:193
+#: ../../mod/register.php:195
 #, php-format
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr "Ik accepteer de %s van deze $Projectname-hub"
 
-#: ../../mod/register.php:207 ../../mod/admin.php:436
+#: ../../mod/register.php:209 ../../mod/admin.php:448
 msgid "Registration"
 msgstr "Registratie"
 
-#: ../../mod/register.php:212
+#: ../../mod/register.php:214
 msgid "Membership on this site is by invitation only."
 msgstr "Registreren op deze $Projectname-hub kan alleen op uitnodiging."
 
-#: ../../mod/register.php:213
+#: ../../mod/register.php:215
 msgid "Please enter your invitation code"
 msgstr "Vul jouw uitnodigingscode in"
 
-#: ../../mod/register.php:216
+#: ../../mod/register.php:218
 msgid "Your email address"
 msgstr "Jouw e-mailadres"
 
-#: ../../mod/register.php:217
+#: ../../mod/register.php:219
 msgid "Choose a password"
 msgstr "Geef een wachtwoord op"
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:220
 msgid "Please re-enter your password"
 msgstr "Geef het wachtwoord opnieuw op"
 
-#: ../../mod/admin.php:52
+#: ../../mod/admin.php:54
 msgid "Theme settings updated."
 msgstr "Thema-instellingen bijgewerkt."
 
-#: ../../mod/admin.php:160
+#: ../../mod/admin.php:162
 msgid "# Accounts"
 msgstr "# accounts"
 
-#: ../../mod/admin.php:161
+#: ../../mod/admin.php:163
 msgid "# blocked accounts"
 msgstr "# geblokkeerde accounts"
 
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:164
 msgid "# expired accounts"
 msgstr "# verlopen accounts"
 
-#: ../../mod/admin.php:163
+#: ../../mod/admin.php:165
 msgid "# expiring accounts"
 msgstr "# accounts die nog moeten verlopen"
 
-#: ../../mod/admin.php:174
+#: ../../mod/admin.php:176
 msgid "# Channels"
 msgstr "# Kanalen"
 
-#: ../../mod/admin.php:175
+#: ../../mod/admin.php:177
 msgid "# primary"
 msgstr "# primair"
 
-#: ../../mod/admin.php:176
+#: ../../mod/admin.php:178
 msgid "# clones"
 msgstr "# klonen"
 
-#: ../../mod/admin.php:182
+#: ../../mod/admin.php:184
 msgid "Message queues"
 msgstr "Berichtenwachtrij"
 
-#: ../../mod/admin.php:198 ../../mod/admin.php:433 ../../mod/admin.php:532
-#: ../../mod/admin.php:800 ../../mod/admin.php:964 ../../mod/admin.php:1061
-#: ../../mod/admin.php:1101 ../../mod/admin.php:1261 ../../mod/admin.php:1295
-#: ../../mod/admin.php:1380
+#: ../../mod/admin.php:200 ../../mod/admin.php:445 ../../mod/admin.php:545
+#: ../../mod/admin.php:812 ../../mod/admin.php:976 ../../mod/admin.php:1073
+#: ../../mod/admin.php:1113 ../../mod/admin.php:1273 ../../mod/admin.php:1307
+#: ../../mod/admin.php:1392
 msgid "Administration"
 msgstr "Beheer"
 
-#: ../../mod/admin.php:199
+#: ../../mod/admin.php:201
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: ../../mod/admin.php:202
+#: ../../mod/admin.php:204
 msgid "Registered accounts"
 msgstr "Geregistreerde accounts"
 
-#: ../../mod/admin.php:203 ../../mod/admin.php:536
+#: ../../mod/admin.php:205 ../../mod/admin.php:549
 msgid "Pending registrations"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../mod/admin.php:204
+#: ../../mod/admin.php:206
 msgid "Registered channels"
 msgstr "Geregistreerde kanalen"
 
-#: ../../mod/admin.php:205 ../../mod/admin.php:537
+#: ../../mod/admin.php:207 ../../mod/admin.php:550
 msgid "Active plugins"
 msgstr "Ingeschakelde plug-ins"
 
-#: ../../mod/admin.php:206
+#: ../../mod/admin.php:208
 msgid "Version"
 msgstr "Versie"
 
-#: ../../mod/admin.php:324
+#: ../../mod/admin.php:329
 msgid "Site settings updated."
 msgstr "Hub-instellingen bijgewerkt."
 
-#: ../../mod/admin.php:361 ../../mod/settings.php:793
+#: ../../mod/admin.php:366 ../../mod/settings.php:793
 msgid "mobile"
 msgstr "mobiel"
 
-#: ../../mod/admin.php:363
+#: ../../mod/admin.php:368
 msgid "experimental"
 msgstr "experimenteel"
 
-#: ../../mod/admin.php:365
+#: ../../mod/admin.php:370
 msgid "unsupported"
 msgstr "Niet ondersteund"
 
-#: ../../mod/admin.php:411
+#: ../../mod/admin.php:416
 msgid "Yes - with approval"
 msgstr "Ja - met goedkeuring"
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:422
 msgid "My site is not a public server"
 msgstr "Mijn $Projectname-hub is niet openbaar"
 
-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:423
 msgid "My site has paid access only"
 msgstr "Mijn $Projectname-hub kent alleen betaalde toegang"
 
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:424
 msgid "My site has free access only"
 msgstr "Mijn $Projectname-hub kent alleen gratis toegang"
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:425
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mijn $Projectname-hub biedt gratis accounts aan met betaalde uitbreidingen als optie"
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:449
 msgid "File upload"
 msgstr "Bestand uploaden"
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:450
 msgid "Policies"
 msgstr "Beleid"
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
 msgid "Site name"
 msgstr "Naam van deze $Projectname-hub"
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
 msgid "Banner/Logo"
 msgstr "Banner/logo"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid "Administrator Information"
 msgstr "Informatie over de beheerder van deze hub"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden."
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:458
 msgid "System language"
 msgstr "Standaardtaal"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
 msgid "System theme"
 msgstr "Standaardthema"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Standaardthema voor $Projectname-hub (kan door lid veranderd worden) - <a href='#' id='cnftheme'>verander thema-instellingen</a>"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:460
 msgid "Mobile system theme"
 msgstr "Standaardthema voor mobiel"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:460
 msgid "Theme for mobile devices"
 msgstr "Thema voor mobiele apparaten"
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid "Allow Feeds as Connections"
 msgstr "Sta feeds toe als connecties"
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
 msgid "(Heavy system resource usage)"
 msgstr "(sterk negatieve invloed op systeembronnen hub)"
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid "Maximum image size"
 msgstr "Maximale grootte van afbeeldingen"
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend."
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
 msgid "Does this site allow new member registration?"
 msgstr "Staat deze hub nieuwe accounts toe?"
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:465
+msgid "Invitation only"
+msgstr "Alleen op uitnodiging"
+
+#: ../../mod/admin.php:465
+msgid ""
+"Only allow new member registrations with an invitation code. Above register "
+"policy must be set to Yes."
+msgstr "Sta alleen nieuwe registraties toe van mensen die een uitnodigingscode hebben. Bovenstaand accountbeleid moet op Ja staan."
+
+#: ../../mod/admin.php:466
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Wat voor soort accounts biedt deze $Projectname-hub aan? Kies wat het meest in de buurt komt."
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:467
 msgid "Register text"
 msgstr "Tekst tijdens registratie"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:467
 msgid "Will be displayed prominently on the registration page."
 msgstr "Tekst dat op de pagina voor het registreren van nieuwe accounts wordt getoond."
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:468
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Homepagina van deze hub die aan bezoekers wordt getoond (standaard: inlogformulier)"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:468
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "voorbeeld: 'public' om de openbare stream te tonen, 'page/sys/home' om de webpagina 'home' van het systeemkanaal te tonen of 'include:home.html' om een gewoon bestand te gebruiken."
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:469
 msgid "Preserve site homepage URL"
 msgstr "Behoudt de URL van de hub (/)"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:469
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Toon de homepagina van de hub in een frame op de oorspronkelijke locatie (/), i.p.v. een doorverwijzing naar een andere locatie (bv. .../home.html)"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:470
 msgid "Accounts abandoned after x days"
 msgstr "Accounts als verlaten beschouwen na zoveel aantal dagen:"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:470
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet."
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:471
 msgid "Allowed friend domains"
 msgstr "Toegestane domeinen"
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:471
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze $Projectname-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten."
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:472
 msgid "Allowed email domains"
 msgstr "Toegestane e-maildomeinen"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:472
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te laten."
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:473
 msgid "Not allowed email domains"
 msgstr "Niet toegestane e-maildomeinen"
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:473
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen niet op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te staan, tenzij er toegestane domeinen zijn ingesteld. "
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:474
 msgid "Block public"
 msgstr "Openbare toegang blokkeren"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:474
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor ingelogde leden."
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:475
 msgid "Verify Email Addresses"
 msgstr "E-mailadres verifieren"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:475
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Inschakelen om e-mailadressen te verifiëren die tijdens de accountregistratie worden gebruikt (aanbevolen)."
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:476
 msgid "Force publish"
 msgstr "Dwing kanaalvermelding af"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:476
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld."
 
-#: ../../mod/admin.php:464
-msgid "Disable discovery tab"
-msgstr "Ontdekkingstab"
+#: ../../mod/admin.php:477
+msgid "Import Public Streams"
+msgstr "Openbare streams importeren"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:477
 msgid ""
-"Remove the tab in the network view with public content pulled from sources "
-"chosen for this site."
-msgstr "Verwijder de tab in de matrix-weergave waarin zich een selectie aan openbare berichten bevindt, die automatisch voor deze hub zijn uitgekozen."
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
+msgstr "Toegang verlenen tot openbare berichten die vanuit andere hubs worden geïmporteerd. Waarschuwing: de inhoud van deze berichten wordt niet gemodereerd."
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:478
 msgid "login on Homepage"
 msgstr "Inlogformulier op de homepagina"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:478
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Toon een inlogformulier voor bezoekers op de homepagina wanneer geen andere inhoud is geconfigureerd. "
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:480
 msgid "Directory Server URL"
 msgstr "Server-URL voor de kanalengids"
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:480
 msgid "Default directory server"
 msgstr "Standaardserver voor de kanalengids"
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:482
 msgid "Proxy user"
 msgstr "Gebruikersnaam proxy"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:483
 msgid "Proxy URL"
 msgstr "URL proxy"
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:484
 msgid "Network timeout"
 msgstr "Netwerktimeout"
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:484
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:485
 msgid "Delivery interval"
 msgstr "Afleveringsinterval"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:485
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers."
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:486
 msgid "Deliveries per process"
 msgstr "Leveringen per serverproces"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:486
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Aantal leveringen die aan één serverproces worden meegegeven. Pas dit aan wanneer het nodig is om systeemprestaties te verbeteren. Aangeraden: 1-5"
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:487
 msgid "Poll interval"
 msgstr "Poll-interval"
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:487
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken."
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:488
 msgid "Maximum Load Average"
 msgstr "Maximaal gemiddelde systeembelasting"
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:488
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50."
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:489
 msgid "Expiration period in days for imported (matrix/network) content"
 msgstr "Aantal dagen waarna geïmporteerde inhoud uit iemands matrix/netwerk-pagina wordt verwijderd."
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:489
 msgid "0 for no expiration of imported content"
 msgstr "Dit geldt alleen voor inhoud van andere kanalen, dus niet voor iemands eigen kanaal. 0 voor het niet verwijderen van geïmporteerde inhoud."
 
-#: ../../mod/admin.php:524
+#: ../../mod/admin.php:537
 msgid "No server found"
 msgstr "Geen hub gevonden"
 
-#: ../../mod/admin.php:531 ../../mod/admin.php:814
+#: ../../mod/admin.php:544 ../../mod/admin.php:826
 msgid "ID"
 msgstr "ID"
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:544
 msgid "for channel"
 msgstr "voor kanaal"
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:544
 msgid "on server"
 msgstr "op hub"
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:544
 msgid "Status"
 msgstr "Status"
 
-#: ../../mod/admin.php:533
+#: ../../mod/admin.php:546
 msgid "Server"
 msgstr "Hubbeheer"
 
-#: ../../mod/admin.php:550
+#: ../../mod/admin.php:563
 msgid "Update has been marked successful"
 msgstr "Update is als succesvol gemarkeerd"
 
-#: ../../mod/admin.php:560
+#: ../../mod/admin.php:573
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Uitvoeren van %s is mislukt. Controleer systeemlogboek."
 
-#: ../../mod/admin.php:563
+#: ../../mod/admin.php:576
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Update %s was geslaagd."
 
-#: ../../mod/admin.php:567
+#: ../../mod/admin.php:580
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is."
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:583
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Update-functie %s kon niet gevonden worden."
 
-#: ../../mod/admin.php:586
+#: ../../mod/admin.php:599
 msgid "No failed updates."
 msgstr "Geen mislukte updates."
 
-#: ../../mod/admin.php:590
+#: ../../mod/admin.php:603
 msgid "Failed Updates"
 msgstr "Mislukte updates"
 
-#: ../../mod/admin.php:592
+#: ../../mod/admin.php:605
 msgid "Mark success (if update was manually applied)"
 msgstr "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)"
 
-#: ../../mod/admin.php:593
+#: ../../mod/admin.php:606
 msgid "Attempt to execute this update step automatically"
 msgstr "Poging om deze stap van de update automatisch uit te voeren."
 
-#: ../../mod/admin.php:625
+#: ../../mod/admin.php:637
 msgid "Queue Statistics"
 msgstr "Wachtrij-statistieken"
 
-#: ../../mod/admin.php:626
+#: ../../mod/admin.php:638
 msgid "Total Entries"
 msgstr "Aantal vermeldingen"
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:639
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: ../../mod/admin.php:628
+#: ../../mod/admin.php:640
 msgid "Destination URL"
 msgstr "Doel-URL"
 
-#: ../../mod/admin.php:629
+#: ../../mod/admin.php:641
 msgid "Mark hub permanently offline"
 msgstr "Hub als permanent offline markeren"
 
-#: ../../mod/admin.php:630
+#: ../../mod/admin.php:642
 msgid "Empty queue for this hub"
 msgstr "Berichtenwachtrij voor deze hub legen"
 
-#: ../../mod/admin.php:631
+#: ../../mod/admin.php:643
 msgid "Last known contact"
 msgstr "Voor het laatst contact"
 
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:679
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s account geblokkeerd/gedeblokkeerd"
 msgstr[1] "%s accounts geblokkeerd/gedeblokkeerd"
 
-#: ../../mod/admin.php:675
+#: ../../mod/admin.php:687
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s account verwijderd"
 msgstr[1] "%s accounts verwijderd"
 
-#: ../../mod/admin.php:711
+#: ../../mod/admin.php:723
 msgid "Account not found"
 msgstr "Account niet gevonden"
 
-#: ../../mod/admin.php:723
+#: ../../mod/admin.php:735
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Account '%s' verwijderd"
 
-#: ../../mod/admin.php:731
+#: ../../mod/admin.php:743
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "Account '%s' geblokkeerd"
 
-#: ../../mod/admin.php:739
+#: ../../mod/admin.php:751
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "Account '%s' gedeblokkeerd"
 
-#: ../../mod/admin.php:801 ../../mod/admin.php:813
+#: ../../mod/admin.php:813 ../../mod/admin.php:825
 msgid "Users"
 msgstr "Accounts"
 
-#: ../../mod/admin.php:803 ../../mod/admin.php:967
+#: ../../mod/admin.php:815 ../../mod/admin.php:979
 msgid "select all"
 msgstr "alles selecteren"
 
-#: ../../mod/admin.php:804
+#: ../../mod/admin.php:816
 msgid "User registrations waiting for confirm"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../mod/admin.php:805
+#: ../../mod/admin.php:817
 msgid "Request date"
 msgstr "Tijd/datum verzoek"
 
-#: ../../mod/admin.php:806
+#: ../../mod/admin.php:818
 msgid "No registrations."
 msgstr "Geen verzoeken."
 
-#: ../../mod/admin.php:808
+#: ../../mod/admin.php:820
 msgid "Deny"
 msgstr "Afkeuren"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Register date"
 msgstr "Geregistreerd"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Last login"
 msgstr "Laatste keer ingelogd"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Expires"
 msgstr "Verloopt"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:826
 msgid "Service Class"
 msgstr "Abonnementen"
 
-#: ../../mod/admin.php:816
+#: ../../mod/admin.php:828
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?"
 
-#: ../../mod/admin.php:817
+#: ../../mod/admin.php:829
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"
 
-#: ../../mod/admin.php:853
+#: ../../mod/admin.php:865
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s kanaal gecensureerd/ongecensureerd"
 msgstr[1] "%s kanalen gecensureerd/ongecensureerd"
 
-#: ../../mod/admin.php:862
+#: ../../mod/admin.php:874
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "Scripts toegestaan/niet toegestaan voor %s kanaal"
 msgstr[1] "Scripts toegestaan/niet toegestaan voor %s kanalen"
 
-#: ../../mod/admin.php:869
+#: ../../mod/admin.php:881
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s kanaal verwijderd"
 msgstr[1] "%s kanalen verwijderd"
 
-#: ../../mod/admin.php:889
+#: ../../mod/admin.php:901
 msgid "Channel not found"
 msgstr "Kanaal niet gevonden"
 
-#: ../../mod/admin.php:900
+#: ../../mod/admin.php:912
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Kanaal '%s' verwijderd"
 
-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:924
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Kanaal '%s' gecensureerd"
 
-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:924
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Kanaal '%s' ongecensureerd"
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:935
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Scripts toegestaan voor kanaal '%s'"
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:935
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Scripts niet toegestaan voor kanaal '%s'"
 
-#: ../../mod/admin.php:969
+#: ../../mod/admin.php:981
 msgid "Censor"
 msgstr "Censureren"
 
-#: ../../mod/admin.php:970
+#: ../../mod/admin.php:982
 msgid "Uncensor"
 msgstr "Niet censureren"
 
-#: ../../mod/admin.php:971
+#: ../../mod/admin.php:983
 msgid "Allow Code"
 msgstr "Scripts toestaan"
 
-#: ../../mod/admin.php:972
+#: ../../mod/admin.php:984
 msgid "Disallow Code"
 msgstr "Scripts niet toestaan"
 
-#: ../../mod/admin.php:974
+#: ../../mod/admin.php:986
 msgid "UID"
 msgstr "UID"
 
-#: ../../mod/admin.php:976
+#: ../../mod/admin.php:988
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"
 
-#: ../../mod/admin.php:977
+#: ../../mod/admin.php:989
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"
 
-#: ../../mod/admin.php:1017
+#: ../../mod/admin.php:1029
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plug-in %s uitgeschakeld."
 
-#: ../../mod/admin.php:1021
+#: ../../mod/admin.php:1033
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plug-in %s ingeschakeld"
 
-#: ../../mod/admin.php:1031 ../../mod/admin.php:1234
+#: ../../mod/admin.php:1043 ../../mod/admin.php:1246
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: ../../mod/admin.php:1034 ../../mod/admin.php:1236
+#: ../../mod/admin.php:1046 ../../mod/admin.php:1248
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: ../../mod/admin.php:1063 ../../mod/admin.php:1263
+#: ../../mod/admin.php:1075 ../../mod/admin.php:1275
 msgid "Toggle"
 msgstr "Omschakelen"
 
-#: ../../mod/admin.php:1071 ../../mod/admin.php:1273
+#: ../../mod/admin.php:1083 ../../mod/admin.php:1285
 msgid "Author: "
 msgstr "Auteur: "
 
-#: ../../mod/admin.php:1072 ../../mod/admin.php:1274
+#: ../../mod/admin.php:1084 ../../mod/admin.php:1286
 msgid "Maintainer: "
 msgstr "Beheerder: "
 
-#: ../../mod/admin.php:1199
+#: ../../mod/admin.php:1211
 msgid "No themes found."
 msgstr "Geen thema's gevonden"
 
-#: ../../mod/admin.php:1255
+#: ../../mod/admin.php:1267
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: ../../mod/admin.php:1301
+#: ../../mod/admin.php:1313
 msgid "[Experimental]"
 msgstr "[Experimenteel]"
 
-#: ../../mod/admin.php:1302
+#: ../../mod/admin.php:1314
 msgid "[Unsupported]"
 msgstr "[Niet ondersteund]"
 
-#: ../../mod/admin.php:1326
+#: ../../mod/admin.php:1338
 msgid "Log settings updated."
 msgstr "Logboek-instellingen bijgewerkt."
 
-#: ../../mod/admin.php:1383
+#: ../../mod/admin.php:1395
 msgid "Clear"
 msgstr "Leegmaken"
 
-#: ../../mod/admin.php:1389
+#: ../../mod/admin.php:1401
 msgid "Debugging"
 msgstr "Debuggen"
 
-#: ../../mod/admin.php:1390
+#: ../../mod/admin.php:1402
 msgid "Log file"
 msgstr "Logbestand"
 
-#: ../../mod/admin.php:1390
+#: ../../mod/admin.php:1402
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je $Projectname-installatie."
 
-#: ../../mod/admin.php:1391
+#: ../../mod/admin.php:1403
 msgid "Log level"
 msgstr "Logniveau"
 
-#: ../../mod/admin.php:1437
+#: ../../mod/admin.php:1449
 msgid "New Profile Field"
 msgstr "Nieuw profielveld"
 
-#: ../../mod/admin.php:1438 ../../mod/admin.php:1458
+#: ../../mod/admin.php:1450 ../../mod/admin.php:1470
 msgid "Field nickname"
 msgstr "Bijnaam voor veld"
 
-#: ../../mod/admin.php:1438 ../../mod/admin.php:1458
+#: ../../mod/admin.php:1450 ../../mod/admin.php:1470
 msgid "System name of field"
 msgstr "Systeemnaam voor veld"
 
-#: ../../mod/admin.php:1439 ../../mod/admin.php:1459
+#: ../../mod/admin.php:1451 ../../mod/admin.php:1471
 msgid "Input type"
 msgstr "Invoertype"
 
-#: ../../mod/admin.php:1440 ../../mod/admin.php:1460
+#: ../../mod/admin.php:1452 ../../mod/admin.php:1472
 msgid "Field Name"
 msgstr "Veldnaam"
 
-#: ../../mod/admin.php:1440 ../../mod/admin.php:1460
+#: ../../mod/admin.php:1452 ../../mod/admin.php:1472
 msgid "Label on profile pages"
 msgstr "Tekstlabel voor op profielpagina's"
 
-#: ../../mod/admin.php:1441 ../../mod/admin.php:1461
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "Help text"
 msgstr "Helptekst"
 
-#: ../../mod/admin.php:1441 ../../mod/admin.php:1461
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "Additional info (optional)"
 msgstr "Extra informatie (optioneel)"
 
-#: ../../mod/admin.php:1451
+#: ../../mod/admin.php:1463
 msgid "Field definition not found"
 msgstr "Velddefinitie niet gevonden"
 
-#: ../../mod/admin.php:1457
+#: ../../mod/admin.php:1469
 msgid "Edit Profile Field"
 msgstr "Profielveld bewerken"
 
@@ -8039,7 +7978,7 @@ msgstr "Aankomende gebeurtenissen"
 
 #: ../../mod/settings.php:1091
 msgid "Events today"
-msgstr "Gebeurtissen van vandaag"
+msgstr "Gebeurtenissen van vandaag"
 
 #: ../../mod/settings.php:1092
 msgid "Upcoming birthdays"
@@ -8252,92 +8191,14 @@ msgstr "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is."
 
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr "Niet in staat om ontvanger op te zoeken."
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr "Niet in staat om met het aangevraagde kanaal te communiceren."
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr "Kan opgevraagd kanaal niet verifieren"
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."
-
-#: ../../mod/mail.php:132
-msgid "Messages"
-msgstr "Berichten"
-
-#: ../../mod/mail.php:167
-msgid "Message recalled."
-msgstr "Bericht ingetrokken."
-
-#: ../../mod/mail.php:180
-msgid "Conversation removed."
-msgstr "Conversatie verwijderd"
-
-#: ../../mod/mail.php:223
-msgid "Requested channel is not in this network"
-msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar"
-
-#: ../../mod/mail.php:231
-msgid "Send Private Message"
-msgstr "Privébericht versturen"
-
-#: ../../mod/mail.php:232 ../../mod/mail.php:361
-msgid "To:"
-msgstr "Aan:"
-
-#: ../../mod/mail.php:235 ../../mod/mail.php:363
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: ../../mod/mail.php:238 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr "Jouw bericht:"
-
-#: ../../mod/mail.php:242
-msgid "Send"
-msgstr "Verzenden"
-
-#: ../../mod/mail.php:333
-msgid "Delete message"
-msgstr "Bericht verwijderen"
-
-#: ../../mod/mail.php:334
-msgid "Delivery report"
-msgstr "Afleveringsrapport"
-
-#: ../../mod/mail.php:335
-msgid "Recall message"
-msgstr "Bericht intrekken"
-
-#: ../../mod/mail.php:337
-msgid "Message has been recalled."
-msgstr "Bericht is ingetrokken."
-
-#: ../../mod/mail.php:354
-msgid "Delete Conversation"
-msgstr "Verwijder conversatie"
-
-#: ../../mod/mail.php:356
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender."
-
-#: ../../mod/mail.php:360
-msgid "Send Reply"
-msgstr "Antwoord versturen"
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:61
+msgid "$Projectname"
+msgstr "$Projectname"
 
-#: ../../mod/mail.php:365
+#: ../../mod/home.php:75
 #, php-format
-msgid "Your message for %s (%s):"
-msgstr "Jouw privébericht aan %s (%s):"
+msgid "Welcome to %s"
+msgstr "Welkom op %s"
 
 #: ../../mod/regmod.php:11
 msgid "Please login."
@@ -8367,71 +8228,157 @@ msgstr "Onvoldoende permissies.  Doorgestuurd naar profielpagina."
 msgid "Item not available."
 msgstr "Item is niet aanwezig."
 
-#: ../../mod/invite.php:25
-msgid "Total invitation limit exceeded."
-msgstr "Limiet voor aantal uitnodigingen overschreden."
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr "Informatie over de pagina-eigenaar werd niet ontvangen."
 
-#: ../../mod/invite.php:49
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : Geen geldig e-mailadres."
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr "Album niet gevonden."
 
-#: ../../mod/invite.php:76
-msgid "Please join us on $Projectname"
-msgstr "Uitnodiging voor $Projectname"
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr "Verwijder album"
 
-#: ../../mod/invite.php:87
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder."
+#: ../../mod/photos.php:171 ../../mod/photos.php:1006
+msgid "Delete Photo"
+msgstr "Verwijder foto"
+
+#: ../../mod/photos.php:501
+msgid "No photos selected"
+msgstr "Geen foto's geselecteerd"
 
-#: ../../mod/invite.php:92
+#: ../../mod/photos.php:550
+msgid "Access to this item is restricted."
+msgstr "Toegang tot dit item is beperkt."
+
+#: ../../mod/photos.php:589
 #, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s: Aflevering bericht mislukt."
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt."
 
-#: ../../mod/invite.php:96
+#: ../../mod/photos.php:592
 #, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d bericht verzonden."
-msgstr[1] "%d berichten verzonden."
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB aan foto-opslag gebruikt."
 
-#: ../../mod/invite.php:115
-msgid "You have no more invitations available"
-msgstr "Je hebt geen uitnodigingen meer beschikbaar"
+#: ../../mod/photos.php:620
+msgid "Upload Photos"
+msgstr "Foto's uploaden"
 
-#: ../../mod/invite.php:129
-msgid "Send invitations"
-msgstr "Uitnodigingen verzenden"
+#: ../../mod/photos.php:624
+msgid "Enter an album name"
+msgstr "Vul een albumnaam in"
 
-#: ../../mod/invite.php:130
-msgid "Enter email addresses, one per line:"
-msgstr "Voer e-mailadressen in, één per regel:"
+#: ../../mod/photos.php:625
+msgid "or select an existing album (doubleclick)"
+msgstr "of kies een bestaand album (dubbelklikken)"
 
-#: ../../mod/invite.php:132
-msgid "Please join my community on $Projectname."
-msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op $Projectname te vergezellen. Lees meer over $Projectname  op https://redmatrix.me."
+#: ../../mod/photos.php:626
+msgid "Create a status post for this upload"
+msgstr "Plaats een bericht voor deze upload."
 
-#: ../../mod/invite.php:134
-msgid "You will need to supply this invitation code: "
-msgstr "Je moet deze uitnodigingscode opgeven:"
+#: ../../mod/photos.php:627
+msgid "Caption (optional):"
+msgstr "Bijschrift (optioneel):"
 
-#: ../../mod/invite.php:135
-msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Registreer je op een willekeurige $Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):"
+#: ../../mod/photos.php:628
+msgid "Description (optional):"
+msgstr "Omschrijving (optioneel):"
 
-#: ../../mod/invite.php:137
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn $Projectname-kanaaladres in het zoekveld invullen:"
+#: ../../mod/photos.php:655
+msgid "Album name could not be decoded"
+msgstr "Albumnaam kon niet gedecodeerd worden"
 
-#: ../../mod/invite.php:138
-msgid "or visit "
-msgstr "of bezoek "
+#: ../../mod/photos.php:699 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1250
+msgid "Contact Photos"
+msgstr "Connectiefoto's"
 
-#: ../../mod/invite.php:140
-msgid "3. Click [Connect]"
-msgstr "3. Klik op [+ Verbinden]"
+#: ../../mod/photos.php:722
+msgid "Show Newest First"
+msgstr "Nieuwste eerst weergeven"
+
+#: ../../mod/photos.php:724
+msgid "Show Oldest First"
+msgstr "Oudste eerst weergeven"
+
+#: ../../mod/photos.php:824
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."
+
+#: ../../mod/photos.php:826
+msgid "Photo not available"
+msgstr "Foto niet aanwezig"
+
+#: ../../mod/photos.php:884
+msgid "Use as profile photo"
+msgstr "Als profielfoto gebruiken"
+
+#: ../../mod/photos.php:891
+msgid "Private Photo"
+msgstr "Privéfoto"
+
+#: ../../mod/photos.php:902 ../../mod/events.php:652 ../../mod/events.php:659
+msgid "Previous"
+msgstr "Vorige"
+
+#: ../../mod/photos.php:906
+msgid "View Full Size"
+msgstr "Volledige grootte weergeven"
+
+#: ../../mod/photos.php:985
+msgid "Edit photo"
+msgstr "Foto bewerken"
+
+#: ../../mod/photos.php:987
+msgid "Rotate CW (right)"
+msgstr "Draai met de klok mee (naar rechts)"
+
+#: ../../mod/photos.php:988
+msgid "Rotate CCW (left)"
+msgstr "Draai tegen de klok in (naar links)"
+
+#: ../../mod/photos.php:991
+msgid "Enter a new album name"
+msgstr "Vul een nieuwe albumnaam in"
+
+#: ../../mod/photos.php:992
+msgid "or select an existing one (doubleclick)"
+msgstr "of kies een bestaand album (dubbelklikken)"
+
+#: ../../mod/photos.php:995
+msgid "Caption"
+msgstr "Bijschrift"
+
+#: ../../mod/photos.php:997
+msgid "Add a Tag"
+msgstr "Tag toevoegen"
+
+#: ../../mod/photos.php:1001
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"
+
+#: ../../mod/photos.php:1004
+msgid "Flag as adult in album view"
+msgstr "Markeer als voor volwassenen in albumweergave"
+
+#: ../../mod/photos.php:1196
+msgid "In This Photo:"
+msgstr "Op deze foto:"
+
+#: ../../mod/photos.php:1201
+msgid "Map"
+msgstr "Kaart"
+
+#: ../../mod/photos.php:1289
+msgid "View Album"
+msgstr "Album weergeven"
+
+#: ../../mod/photos.php:1300 ../../mod/photos.php:1313
+#: ../../mod/photos.php:1314
+msgid "Recent Photos"
+msgstr "Recente foto's"
 
 #: ../../mod/lockview.php:37
 msgid "Remote privacy information not available."
@@ -8582,6 +8529,16 @@ msgstr "Aantal minuten voordat chatberichten worden verwijderd"
 msgid "%1$s's Chatrooms"
 msgstr "Chatkanalen van %1$s"
 
+#: ../../mod/search.php:212
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Items getagd met %s"
+
+#: ../../mod/search.php:214
+#, php-format
+msgid "Search results for: %s"
+msgstr "Zoekresultaten voor %s"
+
 #: ../../mod/viewsrc.php:40
 msgid "Source of Item"
 msgstr "Bron van item"
@@ -8675,22 +8632,6 @@ msgstr "Doorzoek jouw connecties"
 msgid "Finding: "
 msgstr "Zoeken naar: "
 
-#: ../../mod/help.php:147
-msgid "Documentation Search"
-msgstr "Zoek documentatie"
-
-#: ../../mod/help.php:184 ../../mod/help.php:190 ../../mod/help.php:196
-msgid "Help:"
-msgstr "Hulp:"
-
-#: ../../mod/help.php:211 ../../index.php:238
-msgid "Not Found"
-msgstr "Niet gevonden"
-
-#: ../../mod/help.php:235
-msgid "$Projectname Documentation"
-msgstr "$Projectname-documentatie"
-
 #: ../../mod/manage.php:130
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
@@ -8822,72 +8763,165 @@ msgstr "Titel van menu zoals anderen dat zien."
 msgid "Allow bookmarks"
 msgstr "Bladwijzers toestaan"
 
-#: ../../mod/post.php:234
+#: ../../mod/mail.php:34
+msgid "Unable to lookup recipient."
+msgstr "Niet in staat om ontvanger op te zoeken."
+
+#: ../../mod/mail.php:42
+msgid "Unable to communicate with requested channel."
+msgstr "Niet in staat om met het aangevraagde kanaal te communiceren."
+
+#: ../../mod/mail.php:49
+msgid "Cannot verify requested channel."
+msgstr "Kan opgevraagd kanaal niet verifieren"
+
+#: ../../mod/mail.php:75
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."
+
+#: ../../mod/mail.php:140
+msgid "Messages"
+msgstr "Berichten"
+
+#: ../../mod/mail.php:175
+msgid "Message recalled."
+msgstr "Bericht ingetrokken."
+
+#: ../../mod/mail.php:188
+msgid "Conversation removed."
+msgstr "Conversatie verwijderd"
+
+#: ../../mod/mail.php:231
+msgid "Requested channel is not in this network"
+msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar"
+
+#: ../../mod/mail.php:239
+msgid "Send Private Message"
+msgstr "Privébericht versturen"
+
+#: ../../mod/mail.php:240 ../../mod/mail.php:370
+msgid "To:"
+msgstr "Aan:"
+
+#: ../../mod/mail.php:243 ../../mod/mail.php:372
+msgid "Subject:"
+msgstr "Onderwerp:"
+
+#: ../../mod/mail.php:250
+msgid "Send"
+msgstr "Verzenden"
+
+#: ../../mod/mail.php:342
+msgid "Delete message"
+msgstr "Bericht verwijderen"
+
+#: ../../mod/mail.php:343
+msgid "Delivery report"
+msgstr "Afleveringsrapport"
+
+#: ../../mod/mail.php:344
+msgid "Recall message"
+msgstr "Bericht intrekken"
+
+#: ../../mod/mail.php:346
+msgid "Message has been recalled."
+msgstr "Bericht is ingetrokken."
+
+#: ../../mod/mail.php:363
+msgid "Delete Conversation"
+msgstr "Verwijder conversatie"
+
+#: ../../mod/mail.php:365
 msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen."
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender."
+
+#: ../../mod/mail.php:369
+msgid "Send Reply"
+msgstr "Antwoord versturen"
+
+#: ../../mod/mail.php:374
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Jouw privébericht aan %s (%s):"
+
+#: ../../mod/help.php:148
+msgid "Documentation Search"
+msgstr "Zoek documentatie"
+
+#: ../../mod/help.php:186 ../../mod/help.php:192 ../../mod/help.php:198
+msgid "Help:"
+msgstr "Hulp:"
+
+#: ../../mod/help.php:213 ../../index.php:238
+msgid "Not Found"
+msgstr "Niet gevonden"
+
+#: ../../mod/help.php:237
+msgid "$Projectname Documentation"
+msgstr "$Projectname-documentatie"
 
 #: ../../mod/service_limits.php:19
 msgid "No service class restrictions found."
 msgstr "Geen abonnementsbeperkingen gevonden."
 
-#: ../../mod/siteinfo.php:111
+#: ../../mod/siteinfo.php:15
 #, php-format
 msgid "Version %s"
 msgstr "Versie %s"
 
-#: ../../mod/siteinfo.php:132
+#: ../../mod/siteinfo.php:36
 msgid "Installed plugins/addons/apps:"
 msgstr "Ingeschakelde plug-ins/add-ons/apps:"
 
-#: ../../mod/siteinfo.php:145
+#: ../../mod/siteinfo.php:49
 msgid "No installed plugins/addons/apps"
 msgstr "Geen ingeschakelde plug-ins/add-ons/apps"
 
-#: ../../mod/siteinfo.php:158
+#: ../../mod/siteinfo.php:62
 msgid ""
 "This is a hub of $Projectname - a global cooperative network of "
 "decentralized privacy enhanced websites."
 msgstr "Dit is een $Projectname-hub - $Projectname is een wereldwijd coöperatief netwerk van gedecentraliseerde websites (hubs) met verbeterde privacy."
 
-#: ../../mod/siteinfo.php:160
+#: ../../mod/siteinfo.php:64
 msgid "Tag: "
 msgstr "Tag: "
 
-#: ../../mod/siteinfo.php:162
+#: ../../mod/siteinfo.php:66
 msgid "Last background fetch: "
 msgstr "Meest recente achtergrond-fetch:"
 
-#: ../../mod/siteinfo.php:164
+#: ../../mod/siteinfo.php:68
 msgid "Current load average: "
 msgstr "Gemiddelde systeembelasting is nu:"
 
-#: ../../mod/siteinfo.php:167
+#: ../../mod/siteinfo.php:71
 msgid "Running at web location"
 msgstr "Draaiend op weblocatie"
 
-#: ../../mod/siteinfo.php:168
+#: ../../mod/siteinfo.php:72
 msgid ""
 "Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
 "about $Projectname."
 msgstr "Bezoek <a href=\"http://hubzilla.org\">hubzilla.org</a> "
 
-#: ../../mod/siteinfo.php:169
+#: ../../mod/siteinfo.php:73
 msgid "Bug reports and issues: please visit"
 msgstr "Bugrapporten en andere kwesties: bezoek"
 
-#: ../../mod/siteinfo.php:171
+#: ../../mod/siteinfo.php:75
 msgid "$projectname issues"
 msgstr "$projectname-issues"
 
-#: ../../mod/siteinfo.php:172
+#: ../../mod/siteinfo.php:76
 msgid ""
 "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
 "com"
 msgstr "Voorstellen, lofbetuigingen, enz. - e-mail  \"redmatrix\" at librelist - dot com"
 
-#: ../../mod/siteinfo.php:174
+#: ../../mod/siteinfo.php:78
 msgid "Site Administrators"
 msgstr "Hubbeheerders: "
 
@@ -8921,77 +8955,105 @@ msgstr "Titel en begintijd van gebeurtenis zijn vereist."
 msgid "Event not found."
 msgstr "Gebeurtenis niet gevonden"
 
-#: ../../mod/events.php:452
-msgid "Event Title"
+#: ../../mod/events.php:437
+msgid "Edit event titel"
+msgstr "Titel bewerken"
+
+#: ../../mod/events.php:437
+msgid "Event titel"
 msgstr "Titel"
 
-#: ../../mod/events.php:454
+#: ../../mod/events.php:439
 msgid "Categories (comma-separated list)"
 msgstr "Categorieën (door komma's gescheiden lijst)"
 
-#: ../../mod/events.php:455
+#: ../../mod/events.php:440
+msgid "Edit Category"
+msgstr "Categorie"
+
+#: ../../mod/events.php:440
 msgid "Category"
 msgstr "Categorie"
 
-#: ../../mod/events.php:458
+#: ../../mod/events.php:443
+msgid "Edit start date and time"
+msgstr "Begindatum en -tijd bewerken"
+
+#: ../../mod/events.php:443
 msgid "Start date and time"
 msgstr "Begindatum en -tijd"
 
-#: ../../mod/events.php:459 ../../mod/events.php:462
+#: ../../mod/events.php:444 ../../mod/events.php:447
 msgid "Finish date and time are not known or not relevant"
 msgstr "Einddatum en -tijd zijn niet bekend of niet van toepassing"
 
-#: ../../mod/events.php:461
+#: ../../mod/events.php:446
+msgid "Edit finish date and time"
+msgstr "Einddatum en -tijd bewerken"
+
+#: ../../mod/events.php:446
 msgid "Finish date and time"
 msgstr "Einddatum en -tijd"
 
-#: ../../mod/events.php:463 ../../mod/events.php:464
+#: ../../mod/events.php:448 ../../mod/events.php:449
 msgid "Adjust for viewer timezone"
 msgstr "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt"
 
-#: ../../mod/events.php:463
+#: ../../mod/events.php:448
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen."
 
-#: ../../mod/events.php:470 ../../mod/events.php:472
+#: ../../mod/events.php:450
+msgid "Edit Description"
+msgstr "Omschrijving bewerken"
+
+#: ../../mod/events.php:452
+msgid "Edit Location"
+msgstr "Locatie bewerken"
+
+#: ../../mod/events.php:455 ../../mod/events.php:457
 msgid "Share this event"
 msgstr "Deel deze gebeurtenis"
 
-#: ../../mod/events.php:477
+#: ../../mod/events.php:462
 msgid "Advanced Options"
-msgstr "Geavenceerde opties"
+msgstr "Geavanceerde opties"
 
-#: ../../mod/events.php:589
+#: ../../mod/events.php:574
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../mod/events.php:611
+#: ../../mod/events.php:596
 msgid "Edit event"
 msgstr "Gebeurtenis bewerken"
 
-#: ../../mod/events.php:613
+#: ../../mod/events.php:598
 msgid "Delete event"
 msgstr "Gebeurtenis verwijderen"
 
-#: ../../mod/events.php:647
+#: ../../mod/events.php:632
 msgid "calendar"
 msgstr "agenda"
 
-#: ../../mod/events.php:666
-msgid "New Event"
-msgstr "Nieuwe gebeurtenis"
+#: ../../mod/events.php:651
+msgid "Edit Event"
+msgstr "Gebeurtenis bewerken"
+
+#: ../../mod/events.php:651
+msgid "Create Event"
+msgstr "Gebeurtenis aanmaken"
 
-#: ../../mod/events.php:676
+#: ../../mod/events.php:661
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../../mod/events.php:707
+#: ../../mod/events.php:692
 msgid "Event removed"
 msgstr "Gebeurtenis verwijderd"
 
-#: ../../mod/events.php:710
+#: ../../mod/events.php:695
 msgid "Failed to remove event"
 msgstr "Verwijderen gebeurtenis mislukt"
 
@@ -9123,10 +9185,6 @@ msgstr "Menu-element bewerken"
 msgid "Link text"
 msgstr "Linktekst"
 
-#: ../../mod/wholikesme.php:13
-msgid "Who likes me?"
-msgstr "Wie vindt mij leuk?"
-
 #: ../../mod/sharedwithme.php:94
 msgid "Files: shared with me"
 msgstr "Bestanden: met mij gedeeld"
@@ -9288,51 +9346,57 @@ msgstr "Grootte profielfoto's van berichten instellen"
 msgid "Set size of followup author photos"
 msgstr "Grootte profielfoto's van reacties instellen"
 
-#: ../../boot.php:1291
+#: ../../Zotlabs/Zot/Auth.php:140
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen."
+
+#: ../../boot.php:1299
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s mislukt. Zie foutenlogboek."
 
-#: ../../boot.php:1294
+#: ../../boot.php:1302
 #, php-format
 msgid "Update Error at %s"
 msgstr "Update-fout op %s"
 
-#: ../../boot.php:1461
+#: ../../boot.php:1469
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla"
 
-#: ../../boot.php:1489
+#: ../../boot.php:1491
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../../boot.php:1490
+#: ../../boot.php:1492
 msgid "Remember me"
 msgstr "Aangemeld blijven"
 
-#: ../../boot.php:1493
+#: ../../boot.php:1495
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../boot.php:2113
+#: ../../boot.php:2115
 msgid "toggle mobile"
 msgstr "mobiele weergave omschakelen"
 
-#: ../../boot.php:2248
+#: ../../boot.php:2250
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b."
 
-#: ../../boot.php:2251
+#: ../../boot.php:2253
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Probleem met SSL-certificaat voor %s"
 
-#: ../../boot.php:2288
+#: ../../boot.php:2290
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron is niet actief"
 
-#: ../../boot.php:2292
+#: ../../boot.php:2294
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron-taken zijn niet actief op %s"
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index 685862895..871af0711 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -19,8 +19,100 @@ $a->strings["Cannot create a duplicate channel identifier on this system. Import
 $a->strings["Unable to create a unique channel address. Import failed."] = "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt.";
 $a->strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
 $a->strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt.";
-$a->strings["parent"] = "omhoog";
+$a->strings["prev"] = "vorige";
+$a->strings["first"] = "eerste";
+$a->strings["last"] = "laatste";
+$a->strings["next"] = "volgende";
+$a->strings["older"] = "ouder";
+$a->strings["newer"] = "nieuwer";
+$a->strings["No connections"] = "Geen connecties";
+$a->strings["%d Connection"] = array(
+	0 => "%d connectie",
+	1 => "%d connecties",
+);
+$a->strings["View Connections"] = "Connecties weergeven";
+$a->strings["Search"] = "Zoeken";
+$a->strings["Save"] = "Opslaan";
+$a->strings["poke"] = "aanstoten";
+$a->strings["poked"] = "aangestoten";
+$a->strings["ping"] = "ping";
+$a->strings["pinged"] = "gepingd";
+$a->strings["prod"] = "por";
+$a->strings["prodded"] = "gepord";
+$a->strings["slap"] = "slaan";
+$a->strings["slapped"] = "sloeg";
+$a->strings["finger"] = "finger";
+$a->strings["fingered"] = "gefingerd";
+$a->strings["rebuff"] = "afpoeieren";
+$a->strings["rebuffed"] = "afgepoeierd";
+$a->strings["happy"] = "gelukkig";
+$a->strings["sad"] = "bedroefd";
+$a->strings["mellow"] = "mellow";
+$a->strings["tired"] = "moe";
+$a->strings["perky"] = "parmantig";
+$a->strings["angry"] = "boos";
+$a->strings["stupefied"] = "verbijsterd";
+$a->strings["puzzled"] = "verward";
+$a->strings["interested"] = "geïnteresseerd";
+$a->strings["bitter"] = "verbitterd";
+$a->strings["cheerful"] = "vrolijk";
+$a->strings["alive"] = "levendig";
+$a->strings["annoyed"] = "geërgerd";
+$a->strings["anxious"] = "bezorgd";
+$a->strings["cranky"] = "humeurig";
+$a->strings["disturbed"] = "verontrust";
+$a->strings["frustrated"] = "gefrustreerd ";
+$a->strings["depressed"] = "gedeprimeerd";
+$a->strings["motivated"] = "gemotiveerd";
+$a->strings["relaxed"] = "ontspannen";
+$a->strings["surprised"] = "verrast";
+$a->strings["Monday"] = "maandag";
+$a->strings["Tuesday"] = "dinsdag";
+$a->strings["Wednesday"] = "woensdag";
+$a->strings["Thursday"] = "donderdag";
+$a->strings["Friday"] = "vrijdag";
+$a->strings["Saturday"] = "zaterdag";
+$a->strings["Sunday"] = "zondag";
+$a->strings["January"] = "januari";
+$a->strings["February"] = "februari";
+$a->strings["March"] = "maart";
+$a->strings["April"] = "april";
+$a->strings["May"] = "mei";
+$a->strings["June"] = "juni";
+$a->strings["July"] = "juli";
+$a->strings["August"] = "augustus";
+$a->strings["September"] = "september";
+$a->strings["October"] = "oktober";
+$a->strings["November"] = "november";
+$a->strings["December"] = "december";
+$a->strings["Unknown Attachment"] = "Onbekende bijlage";
+$a->strings["Size"] = "Grootte";
+$a->strings["unknown"] = "onbekend";
+$a->strings["remove category"] = "categorie verwijderen";
+$a->strings["remove from file"] = "uit map verwijderen";
+$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
+$a->strings["Starts:"] = "Start:";
+$a->strings["Finishes:"] = "Einde:";
+$a->strings["Location:"] = "Plaats:";
+$a->strings["Click to open/close"] = "Klik om te openen of te sluiten";
+$a->strings["Link to Source"] = "Originele locatie";
+$a->strings["default"] = "standaard";
+$a->strings["Page layout"] = "Pagina-lay-out";
+$a->strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs";
+$a->strings["Page content type"] = "Opmaaktype pagina";
+$a->strings["Select an alternate language"] = "Kies een andere taal";
+$a->strings["photo"] = "foto";
+$a->strings["event"] = "gebeurtenis";
+$a->strings["status"] = "bericht";
+$a->strings["comment"] = "reactie";
+$a->strings["activity"] = "activiteit";
+$a->strings["Design Tools"] = "Ontwerp-hulpmiddelen";
+$a->strings["Blocks"] = "Blokken";
+$a->strings["Menus"] = "Menu's";
+$a->strings["Layouts"] = "Lay-outs";
+$a->strings["Pages"] = "Pagina's";
 $a->strings["Collection"] = "map";
+$a->strings["parent"] = "omhoog";
 $a->strings["Principal"] = "principal";
 $a->strings["Addressbook"] = "Adresboek";
 $a->strings["Calendar"] = "Agenda";
@@ -34,7 +126,6 @@ $a->strings["Create"] = "Aanmaken";
 $a->strings["Upload"] = "Uploaden";
 $a->strings["Name"] = "Naam";
 $a->strings["Type"] = "Type";
-$a->strings["Size"] = "Grootte";
 $a->strings["Last Modified"] = "Laatst gewijzigd";
 $a->strings["Edit"] = "Bewerken";
 $a->strings["Delete"] = "Verwijderen";
@@ -81,18 +172,7 @@ $a->strings["about a year"] = "ongeveer een jaar";
 $a->strings["%d years"] = "%d jaren";
 $a->strings[" "] = " ";
 $a->strings["timeago.numbers"] = "timeago.numbers";
-$a->strings["January"] = "januari";
-$a->strings["February"] = "februari";
-$a->strings["March"] = "maart";
-$a->strings["April"] = "april";
 $a->strings["__ctx:long__ May"] = "mei";
-$a->strings["June"] = "juni";
-$a->strings["July"] = "juli";
-$a->strings["August"] = "augustus";
-$a->strings["September"] = "september";
-$a->strings["October"] = "oktober";
-$a->strings["November"] = "november";
-$a->strings["December"] = "december";
 $a->strings["Jan"] = "jan";
 $a->strings["Feb"] = "feb";
 $a->strings["Mar"] = "mrt";
@@ -105,13 +185,6 @@ $a->strings["Sep"] = "sep";
 $a->strings["Oct"] = "okt";
 $a->strings["Nov"] = "nov";
 $a->strings["Dec"] = "dec";
-$a->strings["Sunday"] = "zondag";
-$a->strings["Monday"] = "maandag";
-$a->strings["Tuesday"] = "dinsdag";
-$a->strings["Wednesday"] = "woensdag";
-$a->strings["Thursday"] = "donderdag";
-$a->strings["Friday"] = "vrijdag";
-$a->strings["Saturday"] = "zaterdag";
 $a->strings["Sun"] = "zo";
 $a->strings["Mon"] = "ma";
 $a->strings["Tue"] = "di";
@@ -143,23 +216,7 @@ $a->strings["Collection is empty."] = "Collectie is leeg";
 $a->strings["Collection: %s"] = "Collectie: %s";
 $a->strings["Connection: %s"] = "Connectie: %s";
 $a->strings["Connection not found."] = "Connectie niet gevonden.";
-$a->strings["No recipient provided."] = "Geen ontvanger opgegeven.";
-$a->strings["[no subject]"] = "[geen onderwerp]";
-$a->strings["Unable to determine sender."] = "Afzender kan niet bepaald worden.";
-$a->strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd.";
-$a->strings["view full size"] = "volledige grootte tonen";
-$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
-$a->strings["\$projectname"] = "\$projectname";
-$a->strings["Thank You,"] = "Bedankt,";
-$a->strings["%s Administrator"] = "Beheerder %s";
-$a->strings["Administrator"] = "Beheerder";
-$a->strings["No Subject"] = "Geen onderwerp";
-$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
-$a->strings["Starts:"] = "Start:";
-$a->strings["Finishes:"] = "Einde:";
-$a->strings["Location:"] = "Plaats:";
 $a->strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd.";
-$a->strings["event"] = "gebeurtenis";
 $a->strings["Not specified"] = "Niet aangegeven";
 $a->strings["Needs Action"] = "Actie vereist";
 $a->strings["Completed"] = "Voltooid";
@@ -239,6 +296,14 @@ $a->strings["like"] = "vind dit leuk";
 $a->strings["likes"] = "vindt dit leuk";
 $a->strings["dislike"] = "vind dit niet leuk";
 $a->strings["dislikes"] = "vindt dit niet leuk";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes";
+$a->strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
+$a->strings["Unable to process image"] = "Afbeelding kan niet verwerkt worden";
+$a->strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
+$a->strings["a new photo"] = "een nieuwe foto";
+$a->strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s plaatste %2\$s op %3\$s";
+$a->strings["Photo Albums"] = "Fotoalbums";
+$a->strings["Upload New Photos"] = "Nieuwe foto's uploaden";
 $a->strings["Visible to your default audience"] = "Voor iedereen zichtbaar, mits niet anders ingesteld";
 $a->strings["Show"] = "Tonen";
 $a->strings["Don't show"] = "Niet tonen";
@@ -265,8 +330,6 @@ $a->strings["Path not found."] = "Pad niet gevonden";
 $a->strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt.";
 $a->strings["database storage failed."] = "opslag in database mislukt.";
 $a->strings["Empty path"] = "Ontbrekend bestandspad";
-$a->strings["Attachments:"] = "Bijlagen:";
-$a->strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:";
 $a->strings["created a new post"] = "maakte een nieuw bericht aan";
 $a->strings["commented on %s's post"] = "gaf een reactie op een bericht van %s";
 $a->strings["Apps"] = "Apps";
@@ -282,7 +345,6 @@ $a->strings["Add New Connection"] = "Nieuwe connectie toevoegen";
 $a->strings["Enter the channel address"] = "Vul het adres van het nieuwe kanaal in";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Voorbeeld: bob@example.com, http://example.com/barbara";
 $a->strings["Notes"] = "Aantekeningen";
-$a->strings["Save"] = "Opslaan";
 $a->strings["Remove term"] = "Verwijder zoekterm";
 $a->strings["Saved Searches"] = "Opgeslagen zoekopdrachten";
 $a->strings["add"] = "toevoegen";
@@ -321,6 +383,9 @@ $a->strings["Week View"] = "Week tonen";
 $a->strings["Month View"] = "Maand tonen";
 $a->strings["Export"] = "Exporteren";
 $a->strings["Import"] = "Importeren";
+$a->strings["Events Tools"] = "Agenda-hulpmiddelen";
+$a->strings["Export Calendar"] = "Exporteren";
+$a->strings["Import Calendar"] = "Importeren";
 $a->strings["Chat Rooms"] = "Chatkanalen";
 $a->strings["Bookmarked Chatrooms"] = "Bladwijzers van chatkanalen";
 $a->strings["Suggested Chatrooms"] = "Voorgestelde chatkanalen";
@@ -349,6 +414,8 @@ $a->strings["Plugin Features"] = "Plug-in-opties";
 $a->strings["User registrations waiting for confirmation"] = "Accounts die op goedkeuring wachten";
 $a->strings["View Photo"] = "Foto weergeven";
 $a->strings["Edit Album"] = "Album bewerken";
+$a->strings["Attachments:"] = "Bijlagen:";
+$a->strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:";
 $a->strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s";
 $a->strings["General Features"] = "Algemene functies";
 $a->strings["Content Expiration"] = "Inhoud laten verlopen";
@@ -493,15 +560,11 @@ $a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d
 $a->strings["%1\$s's birthday"] = "Verjaardag van %1\$s";
 $a->strings["Happy Birthday %1\$s"] = "Gefeliciteerd met je verjaardag %1\$s";
 $a->strings["Public Timeline"] = "Openbare tijdlijn";
-$a->strings["photo"] = "foto";
 $a->strings["channel"] = "kanaal";
-$a->strings["status"] = "bericht";
-$a->strings["comment"] = "reactie";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s niet leuk";
 $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s is nu met %2\$s verbonden";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s heeft %2\$s aangestoten";
-$a->strings["poked"] = "aangestoten";
 $a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s is %2\$s";
 $a->strings["__ctx:title__ Likes"] = "vinden dit leuk";
 $a->strings["__ctx:title__ Dislikes"] = "vinden dit niet leuk";
@@ -512,7 +575,7 @@ $a->strings["__ctx:title__ Attending"] = "aanwezig";
 $a->strings["__ctx:title__ Not attending"] = "niet aanwezig";
 $a->strings["__ctx:title__ Might attend"] = "mogelijk aanwezig";
 $a->strings["Select"] = "Kies";
-$a->strings["Private Message"] = "Privébericht";
+$a->strings["Private Message"] = "Niet voor iedereen zichtbaar";
 $a->strings["Message signature validated"] = "Berichtkenmerk gevalideerd";
 $a->strings["Message signature incorrect"] = "Berichtkenmerk onjuist";
 $a->strings["View %s's profile @ %s"] = "Bekijk het profiel van %s @ %s";
@@ -614,7 +677,6 @@ $a->strings["Status Messages and Posts"] = "Berichten in dit kanaal";
 $a->strings["About"] = "Over";
 $a->strings["Profile Details"] = "Profiel";
 $a->strings["Photos"] = "Foto's";
-$a->strings["Photo Albums"] = "Fotoalbums";
 $a->strings["Files and Storage"] = "Bestanden en opslagruimte";
 $a->strings["Chatrooms"] = "Chatkanalen";
 $a->strings["Bookmarks"] = "Bladwijzers";
@@ -669,10 +731,6 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
-$a->strings["Invalid data packet"] = "Datapakket ongeldig";
-$a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd.  ";
-$a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
-$a->strings["invalid target signature"] = "ongeldig doelkenmerk";
 $a->strings["Image/photo"] = "Afbeelding/foto";
 $a->strings["Encrypted content"] = "Versleutelde inhoud";
 $a->strings["Install %s element: "] = "Installeer %s-element: ";
@@ -705,12 +763,10 @@ $a->strings["%d connection in common"] = array(
 	1 => "%d gemeenschappelijke connecties",
 );
 $a->strings["show more"] = "meer connecties weergeven";
-$a->strings["Directory Options"] = "Opties kanalengids";
-$a->strings["Safe Mode"] = "Veilig zoeken";
-$a->strings["No"] = "Nee";
-$a->strings["Yes"] = "Ja";
-$a->strings["Public Forums Only"] = "Alleen openbare forums";
-$a->strings["This Website Only"] = "Alleen deze hub";
+$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
+$a->strings["\$projectname"] = "\$projectname";
+$a->strings["Thank You,"] = "Bedankt,";
+$a->strings["%s Administrator"] = "Beheerder %s";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s";
 $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
@@ -757,10 +813,14 @@ $a->strings["local account not found."] = "lokale account niet gevonden.";
 $a->strings["Cannot connect to yourself."] = "Kan niet met jezelf verbinden";
 $a->strings["Embedded content"] = "Ingesloten inhoud";
 $a->strings["Embedding disabled"] = "Insluiten uitgeschakeld";
+$a->strings["No recipient provided."] = "Geen ontvanger opgegeven.";
+$a->strings["[no subject]"] = "[geen onderwerp]";
+$a->strings["Unable to determine sender."] = "Afzender kan niet bepaald worden.";
+$a->strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd.";
 $a->strings["Logout"] = "Uitloggen";
 $a->strings["End this session"] = "Beëindig deze sessie";
 $a->strings["Home"] = "Home";
-$a->strings["Your posts and conversations"] = "Jouw berichten en conversaties";
+$a->strings["Your posts and conversations"] = "Jouw kanaal";
 $a->strings["Your profile page"] = "Jouw profielpagina";
 $a->strings["Edit Profiles"] = "Bewerk profielen";
 $a->strings["Manage/Edit profiles"] = "Beheer/wijzig profielen";
@@ -782,15 +842,14 @@ $a->strings["Create an account"] = "Maak een account aan";
 $a->strings["Help"] = "Hulp";
 $a->strings["Help and documentation"] = "Hulp en documentatie";
 $a->strings["Applications, utilities, links, games"] = "Apps";
-$a->strings["Search"] = "Zoeken";
 $a->strings["Search site @name, #tag, ?docs, content"] = "Zoek een @kanaal, doorzoek inhoud hub met tekst en #tags, of doorzoek ?documentatie ";
 $a->strings["Directory"] = "Kanalengids";
 $a->strings["Channel Directory"] = "Kanalengids";
 $a->strings["Grid"] = "Grid";
 $a->strings["Your grid"] = "Jouw grid";
 $a->strings["Mark all grid notifications seen"] = "Markeer alle gridnotificaties als bekeken";
-$a->strings["Channel Home"] = "Tijdlijn kanaal";
-$a->strings["Channel home"] = "Tijdlijn kanaal";
+$a->strings["Channel Home"] = "Jouw kanaal";
+$a->strings["Channel home"] = "Jouw kanaal";
 $a->strings["Mark all channel notifications seen"] = "Alle kanaalnotificaties als gelezen markeren";
 $a->strings["Connections"] = "Connecties";
 $a->strings["Notices"] = "Notificaties";
@@ -812,68 +871,12 @@ $a->strings["Site Setup and Configuration"] = "Hub instellen en beheren";
 $a->strings["@name, #tag, ?doc, content"] = "@kanaal, #tag, inhoud, ?hulp";
 $a->strings["Please wait..."] = "Wachten aub...";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. ";
-$a->strings["prev"] = "vorige";
-$a->strings["first"] = "eerste";
-$a->strings["last"] = "laatste";
-$a->strings["next"] = "volgende";
-$a->strings["older"] = "ouder";
-$a->strings["newer"] = "nieuwer";
-$a->strings["No connections"] = "Geen connecties";
-$a->strings["%d Connection"] = array(
-	0 => "%d connectie",
-	1 => "%d connecties",
-);
-$a->strings["View Connections"] = "Connecties weergeven";
-$a->strings["poke"] = "aanstoten";
-$a->strings["ping"] = "ping";
-$a->strings["pinged"] = "gepingd";
-$a->strings["prod"] = "por";
-$a->strings["prodded"] = "gepord";
-$a->strings["slap"] = "slaan";
-$a->strings["slapped"] = "sloeg";
-$a->strings["finger"] = "finger";
-$a->strings["fingered"] = "gefingerd";
-$a->strings["rebuff"] = "afpoeieren";
-$a->strings["rebuffed"] = "afgepoeierd";
-$a->strings["happy"] = "gelukkig";
-$a->strings["sad"] = "bedroefd";
-$a->strings["mellow"] = "mellow";
-$a->strings["tired"] = "moe";
-$a->strings["perky"] = "parmantig";
-$a->strings["angry"] = "boos";
-$a->strings["stupified"] = "beteuterd";
-$a->strings["puzzled"] = "verward";
-$a->strings["interested"] = "geïnteresseerd";
-$a->strings["bitter"] = "verbitterd";
-$a->strings["cheerful"] = "vrolijk";
-$a->strings["alive"] = "levendig";
-$a->strings["annoyed"] = "geërgerd";
-$a->strings["anxious"] = "bezorgd";
-$a->strings["cranky"] = "humeurig";
-$a->strings["disturbed"] = "verontrust";
-$a->strings["frustrated"] = "gefrustreerd ";
-$a->strings["depressed"] = "gedeprimeerd";
-$a->strings["motivated"] = "gemotiveerd";
-$a->strings["relaxed"] = "ontspannen";
-$a->strings["surprised"] = "verrast";
-$a->strings["May"] = "mei";
-$a->strings["Unknown Attachment"] = "Onbekende bijlage";
-$a->strings["unknown"] = "onbekend";
-$a->strings["remove category"] = "categorie verwijderen";
-$a->strings["remove from file"] = "uit map verwijderen";
-$a->strings["Click to open/close"] = "Klik om te openen of te sluiten";
-$a->strings["Link to Source"] = "Originele locatie";
-$a->strings["default"] = "standaard";
-$a->strings["Page layout"] = "Pagina-lay-out";
-$a->strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs";
-$a->strings["Page content type"] = "Opmaaktype pagina";
-$a->strings["Select an alternate language"] = "Kies een andere taal";
-$a->strings["activity"] = "activiteit";
-$a->strings["Design Tools"] = "Ontwerp-hulpmiddelen";
-$a->strings["Blocks"] = "Blokken";
-$a->strings["Menus"] = "Menu's";
-$a->strings["Layouts"] = "Lay-outs";
-$a->strings["Pages"] = "Pagina's";
+$a->strings["Directory Options"] = "Opties kanalengids";
+$a->strings["Safe Mode"] = "Veilig zoeken";
+$a->strings["No"] = "Nee";
+$a->strings["Yes"] = "Ja";
+$a->strings["Public Forums Only"] = "Alleen openbare forums";
+$a->strings["This Website Only"] = "Alleen deze hub";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten  <strong>kunnen</strong> van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken.";
 $a->strings["Add new connections to this collection (privacy group)"] = "Voeg nieuwe connecties aan deze collectie toe (privacy-groep)";
 $a->strings["All Channels"] = "Alle kanalen";
@@ -882,6 +885,10 @@ $a->strings["Collections"] = "Collecties";
 $a->strings["Edit collection"] = "Collectie bewerken";
 $a->strings["Add new collection"] = "Nieuwe collectie toevoegen";
 $a->strings["Channels not in any collection"] = "Kanalen die zich in geen enkele collectie bevinden";
+$a->strings["Invalid data packet"] = "Datapakket ongeldig";
+$a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd.  ";
+$a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
+$a->strings["invalid target signature"] = "ongeldig doelkenmerk";
 $a->strings["New Page"] = "Nieuwe pagina";
 $a->strings["View"] = "Weergeven";
 $a->strings["Actions"] = "Acties";
@@ -889,12 +896,10 @@ $a->strings["Page Link"] = "Paginalink";
 $a->strings["Title"] = "Titel";
 $a->strings["Created"] = "Aangemaakt";
 $a->strings["Edited"] = "Bewerkt";
+$a->strings["view full size"] = "volledige grootte tonen";
+$a->strings["Administrator"] = "Beheerder";
+$a->strings["No Subject"] = "Geen onderwerp";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Kan DNS-informatie voor databaseserver '%s' niet vinden";
-$a->strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes";
-$a->strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
-$a->strings["Unable to process image"] = "Afbeelding kan niet verwerkt worden";
-$a->strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
-$a->strings["Upload New Photos"] = "Nieuwe foto's uploaden";
 $a->strings["Save to Folder"] = "In map opslaan";
 $a->strings["I will attend"] = "Aanwezig";
 $a->strings["I will not attend"] = "Niet aanwezig";
@@ -930,23 +935,6 @@ $a->strings["This is you"] = "Dit ben jij";
 $a->strings["Image"] = "Afbeelding";
 $a->strings["Insert Link"] = "Link invoegen";
 $a->strings["Video"] = "Video";
-$a->strings["Not a valid email address"] = "Geen geldig e-mailadres";
-$a->strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze hub niet toegestaan";
-$a->strings["Your email address is already registered at this site."] = "Jouw e-mailadres is al op deze hub geregistreerd.";
-$a->strings["An invitation is required."] = "Een uitnodiging is vereist";
-$a->strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden";
-$a->strings["Please enter the required information."] = "Vul de vereiste informatie in.";
-$a->strings["Failed to store account information."] = "Account-informatie kon niet opgeslagen worden.";
-$a->strings["Registration confirmation for %s"] = "Registratiebevestiging voor %s";
-$a->strings["Registration request at %s"] = "Registratiebevestiging voor %s";
-$a->strings["your registration password"] = "jouw registratiewachtwoord";
-$a->strings["Registration details for %s"] = "Registratiegegevens voor %s";
-$a->strings["Account approved."] = "Account goedgekeurd";
-$a->strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s";
-$a->strings["Account verified. Please login."] = "Account is geverifieerd. Je kan inloggen.";
-$a->strings["Click here to upgrade."] = "Klik hier om te upgraden.";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden.";
-$a->strings["This action is not available under your subscription plan."] = "Deze handeling is niet mogelijk met jouw abonnement.";
 $a->strings["Site Admin"] = "Hubbeheerder";
 $a->strings["Address Book"] = "Connecties";
 $a->strings["Mood"] = "Stemming";
@@ -992,6 +980,23 @@ $a->strings["Celebrity/Soapbox"] = "Beroemdheid/alleen volgen";
 $a->strings["Group Repository"] = "Groepsopslag";
 $a->strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen";
 $a->strings["Profile Photos"] = "Profielfoto's";
+$a->strings["Not a valid email address"] = "Geen geldig e-mailadres";
+$a->strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze hub niet toegestaan";
+$a->strings["Your email address is already registered at this site."] = "Jouw e-mailadres is al op deze hub geregistreerd.";
+$a->strings["An invitation is required."] = "Een uitnodiging is vereist";
+$a->strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden";
+$a->strings["Please enter the required information."] = "Vul de vereiste informatie in.";
+$a->strings["Failed to store account information."] = "Account-informatie kon niet opgeslagen worden.";
+$a->strings["Registration confirmation for %s"] = "Registratiebevestiging voor %s";
+$a->strings["Registration request at %s"] = "Registratiebevestiging voor %s";
+$a->strings["your registration password"] = "jouw registratiewachtwoord";
+$a->strings["Registration details for %s"] = "Registratiegegevens voor %s";
+$a->strings["Account approved."] = "Account goedgekeurd";
+$a->strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s";
+$a->strings["Account verified. Please login."] = "Account is geverifieerd. Je kan inloggen.";
+$a->strings["Click here to upgrade."] = "Klik hier om te upgraden.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden.";
+$a->strings["This action is not available under your subscription plan."] = "Deze handeling is niet mogelijk met jouw abonnement.";
 $a->strings["Permission Denied."] = "Toegang geweigerd";
 $a->strings["File not found."] = "Bestand niet gevonden.";
 $a->strings["Edit file permissions"] = "Bestandsrechten bewerken";
@@ -1211,8 +1216,6 @@ $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for t
 $a->strings["Bookmark added"] = "Bladwijzer toegevoegd";
 $a->strings["My Bookmarks"] = "Mijn bladwijzers";
 $a->strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties";
-$a->strings["\$Projectname"] = "\$Projectname";
-$a->strings["Welcome to %s"] = "Welkom op %s";
 $a->strings["This setting requires special processing and editing has been blocked."] = "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd.";
 $a->strings["Configuration Editor"] = "Configuratiebewerker";
 $a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. ";
@@ -1284,8 +1287,6 @@ $a->strings["Age: "] = "Leeftijd:";
 $a->strings["Edit/Manage Profiles"] = "Profielen bewerken/beheren";
 $a->strings["Add profile things"] = "Dingen aan je profiel toevoegen";
 $a->strings["Include desirable objects in your profile"] = "Voeg door jou gewenste dingen aan jouw profiel toe";
-$a->strings["Items tagged with: %s"] = "Items getagd met %s";
-$a->strings["Search results for: %s"] = "Zoekresultaten voor %s";
 $a->strings["Could not access contact record."] = "Kon geen toegang krijgen tot de connectie-gegevens.";
 $a->strings["Could not locate selected profile."] = "Kon het gekozen profiel niet vinden.";
 $a->strings["Connection updated."] = "Connectie bijgewerkt.";
@@ -1474,43 +1475,25 @@ $a->strings["For either option, please choose whether to make this hub your new
 $a->strings["Make this hub my primary location"] = "Stel deze hub als mijn primaire locatie in";
 $a->strings["Import existing posts if possible (experimental - limited by available memory"] = "Importeer bestaande berichten wanneer mogelijk (experimenteel - afhankelijk van beschikbaar servergeheugen)";
 $a->strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid.";
-$a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen.";
-$a->strings["Album not found."] = "Album niet gevonden.";
-$a->strings["Delete Album"] = "Verwijder album";
-$a->strings["Delete Photo"] = "Verwijder foto";
-$a->strings["No photos selected"] = "Geen foto's geselecteerd";
-$a->strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt.";
-$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB aan foto-opslag gebruikt.";
-$a->strings["Upload Photos"] = "Foto's uploaden";
-$a->strings["Enter an album name"] = "Vul een albumnaam in";
-$a->strings["or select an existing album (doubleclick)"] = "of kies een bestaand album (dubbelklikken)";
-$a->strings["Create a status post for this upload"] = "Plaats een bericht voor deze upload.";
-$a->strings["Caption (optional):"] = "Bijschrift (optioneel):";
-$a->strings["Description (optional):"] = "Omschrijving (optioneel):";
-$a->strings["Album name could not be decoded"] = "Albumnaam kon niet gedecodeerd worden";
-$a->strings["Contact Photos"] = "Connectiefoto's";
-$a->strings["Show Newest First"] = "Nieuwste eerst weergeven";
-$a->strings["Show Oldest First"] = "Oudste eerst weergeven";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Toegang geweigerd. Toegang tot dit item kan zijn beperkt.";
-$a->strings["Photo not available"] = "Foto niet aanwezig";
-$a->strings["Use as profile photo"] = "Als profielfoto gebruiken";
-$a->strings["Private Photo"] = "Privéfoto";
-$a->strings["Previous"] = "Vorige";
-$a->strings["View Full Size"] = "Volledige grootte weergeven";
-$a->strings["Edit photo"] = "Foto bewerken";
-$a->strings["Rotate CW (right)"] = "Draai met de klok mee (naar rechts)";
-$a->strings["Rotate CCW (left)"] = "Draai tegen de klok in (naar links)";
-$a->strings["Enter a new album name"] = "Vul een nieuwe albumnaam in";
-$a->strings["or select an existing one (doubleclick)"] = "of kies een bestaand album (dubbelklikken)";
-$a->strings["Caption"] = "Bijschrift";
-$a->strings["Add a Tag"] = "Tag toevoegen";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl";
-$a->strings["Flag as adult in album view"] = "Markeer als voor volwassenen in albumweergave";
-$a->strings["In This Photo:"] = "Op deze foto:";
-$a->strings["Map"] = "Kaart";
-$a->strings["View Album"] = "Album weergeven";
-$a->strings["Recent Photos"] = "Recente foto's";
+$a->strings["Total invitation limit exceeded."] = "Limiet voor aantal uitnodigingen overschreden.";
+$a->strings["%s : Not a valid email address."] = "%s : Geen geldig e-mailadres.";
+$a->strings["Please join us on \$Projectname"] = "Uitnodiging voor \$Projectname";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder.";
+$a->strings["%s : Message delivery failed."] = "%s: Aflevering bericht mislukt.";
+$a->strings["%d message sent."] = array(
+	0 => "%d bericht verzonden.",
+	1 => "%d berichten verzonden.",
+);
+$a->strings["You have no more invitations available"] = "Je hebt geen uitnodigingen meer beschikbaar";
+$a->strings["Send invitations"] = "Uitnodigingen verzenden";
+$a->strings["Enter email addresses, one per line:"] = "Voer e-mailadressen in, één per regel:";
+$a->strings["Your message:"] = "Jouw bericht:";
+$a->strings["Please join my community on \$Projectname."] = "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op \$Projectname te vergezellen. Lees meer over \$Projectname  op https://redmatrix.me.";
+$a->strings["You will need to supply this invitation code: "] = "Je moet deze uitnodigingscode opgeven: ";
+$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registreer je op een willekeurige \$Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):";
+$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn \$Projectname-kanaaladres in het zoekveld invullen:";
+$a->strings["or visit "] = "of bezoek ";
+$a->strings["3. Click [Connect]"] = "3. Klik op [+ Verbinden]";
 $a->strings["Fetching URL returns error: %1\$s"] = "Ophalen URL gaf een foutmelding terug: %1\$s";
 $a->strings["Image uploaded but image cropping failed."] = "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. ";
 $a->strings["Image resize failed."] = "Afbeelding kon niet van grootte veranderd worden.";
@@ -1563,6 +1546,7 @@ $a->strings["No such group"] = "Collectie niet gevonden";
 $a->strings["No such channel"] = "Niet zo'n kanaal";
 $a->strings["forum"] = "forum";
 $a->strings["Search Results For:"] = "Zoekresultaten voor:";
+$a->strings["Public"] = "Openbaar";
 $a->strings["Collection is empty"] = "Collectie is leeg";
 $a->strings["Collection: "] = "Collectie: ";
 $a->strings["Invalid connection."] = "Ongeldige connectie.";
@@ -1630,6 +1614,8 @@ $a->strings["(Heavy system resource usage)"] = "(sterk negatieve invloed op syst
 $a->strings["Maximum image size"] = "Maximale grootte van afbeeldingen";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend.";
 $a->strings["Does this site allow new member registration?"] = "Staat deze hub nieuwe accounts toe?";
+$a->strings["Invitation only"] = "Alleen op uitnodiging";
+$a->strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Sta alleen nieuwe registraties toe van mensen die een uitnodigingscode hebben. Bovenstaand accountbeleid moet op Ja staan.";
 $a->strings["Which best describes the types of account offered by this hub?"] = "Wat voor soort accounts biedt deze \$Projectname-hub aan? Kies wat het meest in de buurt komt.";
 $a->strings["Register text"] = "Tekst tijdens registratie";
 $a->strings["Will be displayed prominently on the registration page."] = "Tekst dat op de pagina voor het registreren van nieuwe accounts wordt getoond.";
@@ -1651,8 +1637,8 @@ $a->strings["Verify Email Addresses"] = "E-mailadres verifieren";
 $a->strings["Check to verify email addresses used in account registration (recommended)."] = "Inschakelen om e-mailadressen te verifiëren die tijdens de accountregistratie worden gebruikt (aanbevolen).";
 $a->strings["Force publish"] = "Dwing kanaalvermelding af";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld.";
-$a->strings["Disable discovery tab"] = "Ontdekkingstab";
-$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Verwijder de tab in de matrix-weergave waarin zich een selectie aan openbare berichten bevindt, die automatisch voor deze hub zijn uitgekozen.";
+$a->strings["Import Public Streams"] = "Openbare streams importeren";
+$a->strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Toegang verlenen tot openbare berichten die vanuit andere hubs worden geïmporteerd. Waarschuwing: de inhoud van deze berichten wordt niet gemodereerd.";
 $a->strings["login on Homepage"] = "Inlogformulier op de homepagina";
 $a->strings["Present a login box to visitors on the home page if no other content has been configured."] = "Toon een inlogformulier voor bezoekers op de homepagina wanneer geen andere inhoud is geconfigureerd. ";
 $a->strings["Directory Server URL"] = "Server-URL voor de kanalengids";
@@ -1891,7 +1877,7 @@ $a->strings["Unseen channel activity"] = "Niet bekeken kanaal-activiteit";
 $a->strings["Unseen private messages"] = "Niet bekeken privéberichten";
 $a->strings["Recommended"] = "Aanbevolen";
 $a->strings["Upcoming events"] = "Aankomende gebeurtenissen";
-$a->strings["Events today"] = "Gebeurtissen van vandaag";
+$a->strings["Events today"] = "Gebeurtenissen van vandaag";
 $a->strings["Upcoming birthdays"] = "Aankomende verjaardagen";
 $a->strings["Not available in all themes"] = "Niet in alle thema's beschikbaar";
 $a->strings["System (personal) notifications"] = "(Persoonlijke) systeemnotificaties";
@@ -1943,27 +1929,8 @@ $a->strings["Sync now"] = "Nu synchroniseren";
 $a->strings["Please wait several minutes between consecutive operations."] = "Wacht enkele minuten tussen opeenvolgende handelingen.";
 $a->strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen door op de hub van de kloon in te loggen en het kanaal daar te verwijderen.";
 $a->strings["Use this form to drop the location if the hub is no longer operating."] = "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is.";
-$a->strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken.";
-$a->strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren.";
-$a->strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren";
-$a->strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt.";
-$a->strings["Messages"] = "Berichten";
-$a->strings["Message recalled."] = "Bericht ingetrokken.";
-$a->strings["Conversation removed."] = "Conversatie verwijderd";
-$a->strings["Requested channel is not in this network"] = "Opgevraagd kanaal is niet in dit netwerk beschikbaar";
-$a->strings["Send Private Message"] = "Privébericht versturen";
-$a->strings["To:"] = "Aan:";
-$a->strings["Subject:"] = "Onderwerp:";
-$a->strings["Your message:"] = "Jouw bericht:";
-$a->strings["Send"] = "Verzenden";
-$a->strings["Delete message"] = "Bericht verwijderen";
-$a->strings["Delivery report"] = "Afleveringsrapport";
-$a->strings["Recall message"] = "Bericht intrekken";
-$a->strings["Message has been recalled."] = "Bericht is ingetrokken.";
-$a->strings["Delete Conversation"] = "Verwijder conversatie";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender.";
-$a->strings["Send Reply"] = "Antwoord versturen";
-$a->strings["Your message for %s (%s):"] = "Jouw privébericht aan %s (%s):";
+$a->strings["\$Projectname"] = "\$Projectname";
+$a->strings["Welcome to %s"] = "Welkom op %s";
 $a->strings["Please login."] = "Inloggen.";
 $a->strings["Xchan Lookup"] = "Xchan opzoeken";
 $a->strings["Lookup xchan beginning with (or webbie): "] = "Zoek een xchan (of webbie) die begint met:";
@@ -1971,24 +1938,43 @@ $a->strings["Not found."] = "Niet gevonden.";
 $a->strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken.";
 $a->strings["Insufficient permissions.  Request redirected to profile page."] = "Onvoldoende permissies.  Doorgestuurd naar profielpagina.";
 $a->strings["Item not available."] = "Item is niet aanwezig.";
-$a->strings["Total invitation limit exceeded."] = "Limiet voor aantal uitnodigingen overschreden.";
-$a->strings["%s : Not a valid email address."] = "%s : Geen geldig e-mailadres.";
-$a->strings["Please join us on \$Projectname"] = "Uitnodiging voor \$Projectname";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder.";
-$a->strings["%s : Message delivery failed."] = "%s: Aflevering bericht mislukt.";
-$a->strings["%d message sent."] = array(
-	0 => "%d bericht verzonden.",
-	1 => "%d berichten verzonden.",
-);
-$a->strings["You have no more invitations available"] = "Je hebt geen uitnodigingen meer beschikbaar";
-$a->strings["Send invitations"] = "Uitnodigingen verzenden";
-$a->strings["Enter email addresses, one per line:"] = "Voer e-mailadressen in, één per regel:";
-$a->strings["Please join my community on \$Projectname."] = "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op \$Projectname te vergezellen. Lees meer over \$Projectname  op https://redmatrix.me.";
-$a->strings["You will need to supply this invitation code: "] = "Je moet deze uitnodigingscode opgeven:";
-$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registreer je op een willekeurige \$Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):";
-$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn \$Projectname-kanaaladres in het zoekveld invullen:";
-$a->strings["or visit "] = "of bezoek ";
-$a->strings["3. Click [Connect]"] = "3. Klik op [+ Verbinden]";
+$a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen.";
+$a->strings["Album not found."] = "Album niet gevonden.";
+$a->strings["Delete Album"] = "Verwijder album";
+$a->strings["Delete Photo"] = "Verwijder foto";
+$a->strings["No photos selected"] = "Geen foto's geselecteerd";
+$a->strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt.";
+$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB aan foto-opslag gebruikt.";
+$a->strings["Upload Photos"] = "Foto's uploaden";
+$a->strings["Enter an album name"] = "Vul een albumnaam in";
+$a->strings["or select an existing album (doubleclick)"] = "of kies een bestaand album (dubbelklikken)";
+$a->strings["Create a status post for this upload"] = "Plaats een bericht voor deze upload.";
+$a->strings["Caption (optional):"] = "Bijschrift (optioneel):";
+$a->strings["Description (optional):"] = "Omschrijving (optioneel):";
+$a->strings["Album name could not be decoded"] = "Albumnaam kon niet gedecodeerd worden";
+$a->strings["Contact Photos"] = "Connectiefoto's";
+$a->strings["Show Newest First"] = "Nieuwste eerst weergeven";
+$a->strings["Show Oldest First"] = "Oudste eerst weergeven";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Toegang geweigerd. Toegang tot dit item kan zijn beperkt.";
+$a->strings["Photo not available"] = "Foto niet aanwezig";
+$a->strings["Use as profile photo"] = "Als profielfoto gebruiken";
+$a->strings["Private Photo"] = "Privéfoto";
+$a->strings["Previous"] = "Vorige";
+$a->strings["View Full Size"] = "Volledige grootte weergeven";
+$a->strings["Edit photo"] = "Foto bewerken";
+$a->strings["Rotate CW (right)"] = "Draai met de klok mee (naar rechts)";
+$a->strings["Rotate CCW (left)"] = "Draai tegen de klok in (naar links)";
+$a->strings["Enter a new album name"] = "Vul een nieuwe albumnaam in";
+$a->strings["or select an existing one (doubleclick)"] = "of kies een bestaand album (dubbelklikken)";
+$a->strings["Caption"] = "Bijschrift";
+$a->strings["Add a Tag"] = "Tag toevoegen";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl";
+$a->strings["Flag as adult in album view"] = "Markeer als voor volwassenen in albumweergave";
+$a->strings["In This Photo:"] = "Op deze foto:";
+$a->strings["Map"] = "Kaart";
+$a->strings["View Album"] = "Album weergeven";
+$a->strings["Recent Photos"] = "Recente foto's";
 $a->strings["Remote privacy information not available."] = "Privacy-informatie op afstand niet beschikbaar.";
 $a->strings["Visible to:"] = "Zichtbaar voor:";
 $a->strings["Export Channel"] = "Kanaal exporteren";
@@ -2020,6 +2006,8 @@ $a->strings["New Chatroom"] = "Nieuw chatkanaal";
 $a->strings["Chatroom Name"] = "Naam chatkanaal";
 $a->strings["Expiration of chats (minutes)"] = "Aantal minuten voordat chatberichten worden verwijderd";
 $a->strings["%1\$s's Chatrooms"] = "Chatkanalen van %1\$s";
+$a->strings["Items tagged with: %s"] = "Items getagd met %s";
+$a->strings["Search results for: %s"] = "Zoekresultaten voor %s";
 $a->strings["Source of Item"] = "Bron van item";
 $a->strings["Share content from Firefox to \$Projectname"] = "Deel webpagina's vanuit Firefox met ";
 $a->strings["Activate the Firefox \$Projectname provider"] = "Activeer de \$Projectname-service in Firefox";
@@ -2043,10 +2031,6 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
 $a->strings["Edit connection"] = "Connectie bewerken";
 $a->strings["Search your connections"] = "Doorzoek jouw connecties";
 $a->strings["Finding: "] = "Zoeken naar: ";
-$a->strings["Documentation Search"] = "Zoek documentatie";
-$a->strings["Help:"] = "Hulp:";
-$a->strings["Not Found"] = "Niet gevonden";
-$a->strings["\$Projectname Documentation"] = "\$Projectname-documentatie";
 $a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt.";
 $a->strings["Create a new channel"] = "Nieuw kanaal aanmaken";
 $a->strings["Current Channel"] = "Huidig kanaal";
@@ -2079,7 +2063,30 @@ $a->strings["Must be unique, only seen by you"] = "Moet uniek zijn en is alleen
 $a->strings["Menu title"] = "Titel van menu";
 $a->strings["Menu title as seen by others"] = "Titel van menu zoals anderen dat zien.";
 $a->strings["Allow bookmarks"] = "Bladwijzers toestaan";
-$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen.";
+$a->strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken.";
+$a->strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren.";
+$a->strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt.";
+$a->strings["Messages"] = "Berichten";
+$a->strings["Message recalled."] = "Bericht ingetrokken.";
+$a->strings["Conversation removed."] = "Conversatie verwijderd";
+$a->strings["Requested channel is not in this network"] = "Opgevraagd kanaal is niet in dit netwerk beschikbaar";
+$a->strings["Send Private Message"] = "Privébericht versturen";
+$a->strings["To:"] = "Aan:";
+$a->strings["Subject:"] = "Onderwerp:";
+$a->strings["Send"] = "Verzenden";
+$a->strings["Delete message"] = "Bericht verwijderen";
+$a->strings["Delivery report"] = "Afleveringsrapport";
+$a->strings["Recall message"] = "Bericht intrekken";
+$a->strings["Message has been recalled."] = "Bericht is ingetrokken.";
+$a->strings["Delete Conversation"] = "Verwijder conversatie";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender.";
+$a->strings["Send Reply"] = "Antwoord versturen";
+$a->strings["Your message for %s (%s):"] = "Jouw privébericht aan %s (%s):";
+$a->strings["Documentation Search"] = "Zoek documentatie";
+$a->strings["Help:"] = "Hulp:";
+$a->strings["Not Found"] = "Niet gevonden";
+$a->strings["\$Projectname Documentation"] = "\$Projectname-documentatie";
 $a->strings["No service class restrictions found."] = "Geen abonnementsbeperkingen gevonden.";
 $a->strings["Version %s"] = "Versie %s";
 $a->strings["Installed plugins/addons/apps:"] = "Ingeschakelde plug-ins/add-ons/apps:";
@@ -2101,21 +2108,28 @@ $a->strings["Event can not end before it has started."] = "Gebeurtenis kan niet
 $a->strings["Unable to generate preview."] = "Niet in staat om voorvertoning te genereren";
 $a->strings["Event title and start time are required."] = "Titel en begintijd van gebeurtenis zijn vereist.";
 $a->strings["Event not found."] = "Gebeurtenis niet gevonden";
-$a->strings["Event Title"] = "Titel";
+$a->strings["Edit event titel"] = "Titel bewerken";
+$a->strings["Event titel"] = "Titel";
 $a->strings["Categories (comma-separated list)"] = "Categorieën (door komma's gescheiden lijst)";
+$a->strings["Edit Category"] = "Categorie";
 $a->strings["Category"] = "Categorie";
+$a->strings["Edit start date and time"] = "Begindatum en -tijd bewerken";
 $a->strings["Start date and time"] = "Begindatum en -tijd";
 $a->strings["Finish date and time are not known or not relevant"] = "Einddatum en -tijd zijn niet bekend of niet van toepassing";
+$a->strings["Edit finish date and time"] = "Einddatum en -tijd bewerken";
 $a->strings["Finish date and time"] = "Einddatum en -tijd";
 $a->strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt";
 $a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen.";
+$a->strings["Edit Description"] = "Omschrijving bewerken";
+$a->strings["Edit Location"] = "Locatie bewerken";
 $a->strings["Share this event"] = "Deel deze gebeurtenis";
-$a->strings["Advanced Options"] = "Geavenceerde opties";
+$a->strings["Advanced Options"] = "Geavanceerde opties";
 $a->strings["l, F j"] = "l j F";
 $a->strings["Edit event"] = "Gebeurtenis bewerken";
 $a->strings["Delete event"] = "Gebeurtenis verwijderen";
 $a->strings["calendar"] = "agenda";
-$a->strings["New Event"] = "Nieuwe gebeurtenis";
+$a->strings["Edit Event"] = "Gebeurtenis bewerken";
+$a->strings["Create Event"] = "Gebeurtenis aanmaken";
 $a->strings["Today"] = "Vandaag";
 $a->strings["Event removed"] = "Gebeurtenis verwijderd";
 $a->strings["Failed to remove event"] = "Verwijderen gebeurtenis mislukt";
@@ -2151,7 +2165,6 @@ $a->strings["Menu item deleted."] = "Menu-item verwijderd.";
 $a->strings["Menu item could not be deleted."] = "Menu-item kon niet worden verwijderd.";
 $a->strings["Edit Menu Element"] = "Menu-element bewerken";
 $a->strings["Link text"] = "Linktekst";
-$a->strings["Who likes me?"] = "Wie vindt mij leuk?";
 $a->strings["Files: shared with me"] = "Bestanden: met mij gedeeld";
 $a->strings["NEW"] = "NIEUW";
 $a->strings["Remove all files"] = "Verwijder alle bestanden";
@@ -2192,6 +2205,7 @@ $a->strings["Left align page content"] = "Inhoud links uitlijnen";
 $a->strings["Set minimum opacity of nav bar - to hide it"] = "Minimale ondoorzichtigheid navigatiebalk (- om te verbergen)";
 $a->strings["Set size of conversation author photo"] = "Grootte profielfoto's van berichten instellen";
 $a->strings["Set size of followup author photos"] = "Grootte profielfoto's van reacties instellen";
+$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen.";
 $a->strings["Update %s failed. See error logs."] = "Update %s mislukt. Zie foutenlogboek.";
 $a->strings["Update Error at %s"] = "Update-fout op %s";
 $a->strings["Create an account to access services and applications within the Hubzilla"] = "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla";
diff --git a/view/nl/register_open_eml.tpl b/view/nl/register_open_eml.tpl
index e634664a6..411bd00be 100644
--- a/view/nl/register_open_eml.tpl
+++ b/view/nl/register_open_eml.tpl
@@ -11,7 +11,7 @@ bezoeken en een nieuwe wachtwoord aanvragen. Je kan daarna inloggen, een kanaal
 meteen via 'instellingen > account' (linksboven)  het account verwijderen (onderaan).  
 Excuses voor het eventuele ongemak. 
 
-Wanneer dit account wel door jou is aangemaakt: Dank je en welkom op de {{$sitename}}.
+Wanneer dit account wel door jou is aangemaakt: Dank je en welkom op {{$sitename}}.
 
 Vriendelijke groet,
 	Beheerder {{$sitename}} ({{$siteurl}})
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d76992b2f..5fcf901fb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -57,26 +57,11 @@ abbr {
 }
 
 /* icons */
-.tool-icons {
+.tool-icons,
+.cat-icons {
 	color: $toolicon_colour;
 }
 
-.icon {
-  background-color: transparent ;
-  background-repeat: no-repeat;
-  display: block;
-  overflow: hidden;
-  text-indent: -9999px;
-}
-
-.icon.text {
-  text-indent: 0px;
-}
-
-.connect-icon {
-	margin-right: 5px;
-}
-
 a,
 .fakelink {
   color: $link_colour;
@@ -129,7 +114,7 @@ pre code {
 
 code {
 	font-size: 1em;
-	padding: 1em;
+	padding: 1em 1.5em;
 	border: 1px solid #ccc;
 	background: #ccc;
 	color: #000;
@@ -141,27 +126,12 @@ pre {
 	border:1px solid #ccc;
 }
 
-.ccollapse-wrapper {
-	border: 1px solid #CCC;
-	padding: 5px;
-}
-
 .heart {
 	color: #FF0000;
 	font-size: 100%;
 	margin-right: 5px;
 }
 
-.subdued {
-	opacity: 0.3;
-	filter:alpha(opacity=30);
-}
-
-.subdued:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
-}
-
 nav,
 header {
 	opacity: $nav_float_min_opacity;
@@ -264,11 +234,6 @@ footer {
 	margin: 15px 0px;
 }
 
-.fakebutton {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
 /*TODO: we should use one class for all this. */
 
 .group-selected,
@@ -284,24 +249,6 @@ footer {
 	color: $font_colour;
 }
 
-
-.fileas-all {
-	text-decoration: none !important;
-}
-
-.fileas-all:hover {
-	text-decoration: underline !important;
-}
-
-#sysmsg {
-	margin-bottom: 10px;
-}
-
-#login-main {
-	max-width: 300px;
-	margin-top: 50px;
-}
-
 #cropimage-wrapper, #cropimage-preview-wrapper {
 	float: left;
 	padding: 30px;
@@ -312,10 +259,6 @@ footer {
 	clear: both;
 }
 
-#page-profile .title {
-	font-weight: bold;
-}
-
 #profile-edit-links {
 	padding-top: 15px;
 	padding-bottom: 15px;
@@ -367,22 +310,6 @@ footer {
 	margin-bottom: 0px;
 }
 
-#profile-extra-links {
-	clear: both;
-	margin-top: 10px;
-}
-
-#profile-extra-links ul {
-	list-style-type: none;
-	padding: 0px;
-}
-
-
-#profile-extra-links li {
-	margin-top: 10px;
-}
-
-
 .profile-edit-side-link {
 	padding: 3px 0px;
 	opacity: 0;
@@ -395,31 +322,10 @@ footer {
 	filter:alpha(opacity=100);
 }
 
-
-.view-contact-wrapper {
-	margin-top: 20px;
-	float: left;
-	margin-left: 20px;
-	width: 180px;
-}
-
-.contact-wrapper {
-	float: left;
-	width: 150px;
-	height: 150px;
-	overflow: auto;
-}
-
 #view-contact-end {
 	clear: both;
 }
 
-
-#viewconnections {
-	margin-top: 15px;
-}
-
-
 #profile-photo-wrapper img {
 	width: 100%;
 	height: 100%;
@@ -436,13 +342,6 @@ footer {
 	border-radius: $radiuspx;
 }
 
-
-#profile-in-dir-yes-label,
-#profile-in-dir-no-label,
-#profile-in-netdir-yes-label,
-#profile-in-netdir-no-label,
-#hide-wall-yes-label,
-#hide-wall-no-label,
 #hide-friends-yes-label,
 #hide-friends-no-label {
 	margin-left: 125px;
@@ -450,34 +349,11 @@ footer {
 	width: 50px;
 }
 
-
-#profile-publish-yes-reg,
-#profile-publish-no-reg {
-	float: left;
-	margin-bottom: 10px;
-}
-
-#profile-publish-yes-label-reg,
-#profile-publish-no-label-reg {
-	margin-left: 350px;
-	float: left;
-	width: 50px;
-}
-
-#profile-publish-break-reg,
-#profile-publish-end-reg {
-	clear: both;
-}
-
-
 #fsuggest-desc, #fsuggest-submit-wrapper {
 	margin-top: 15px;
 	margin-bottom: 15px;
 }
 
-.thread-end-wrapper {
-    margin-left: 50px;
-}
 .profile-listing-photo-wrapper {
 	float: left;
 }
@@ -509,10 +385,6 @@ footer {
 
 }
 
-.directory-details {
-	font-size: 0.7em;
-}
-
 .app-name {
 	overflow: none;
 }
@@ -544,27 +416,17 @@ footer {
 	padding: 4px;
 }
 
-.pager_first a,
-.pager_last a,
-.pager_prev a,
-.pager_next a,
-.pager_n a {
-}
-
 .pager_current {
-  border: 1px solid transparent;
-  background: transparent;
-  padding: 4px;
-}
-
-#block-message, #ignore-message, #archive-message, #lost-contact-message {
-	color: #FF0000;
+	border: 1px solid transparent;
+	background: transparent;
+	padding: 4px;
 }
 
-.photo, .contact-block-img {
-    border-radius: $radiuspx;
-    -moz-border-radius: $radiuspx;
-    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
+.photo,
+.contact-block-img {
+	border-radius: $radiuspx;
+	-moz-border-radius: $radiuspx;
+	box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
 #side-bar-photos-albums {
@@ -575,10 +437,11 @@ footer {
 	list-style: none;
 }
 
-.profile-match-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
-    border-radius: $radiuspx;
-    -moz-border-radius: $radiuspx;
-    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
+.profile-match-photo img,
+.directory-photo-img {
+	border-radius: $radiuspx;
+	-moz-border-radius: $radiuspx;
+	box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
 .profile-match-photo img {
@@ -586,57 +449,10 @@ footer {
 	height: $top_photo !important;
 }
 
-#sidebar-page-list .label {
-    margin-left: 5px;
-}
-
-.photo-top-photo, .photo-album-photo {
- /*   padding: 10px;
-    max-width: 300px;
-    border: 1px solid #888888;
-*/
-  position: absolute;
-  display: block;
-/*  max-width: 100%;
-  max-height: 100%; */
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  margin: auto;
-}
-
-.photo-top-photo-link, .photo-album-photo-link {
-  display: block;
-  width: 100%;
-  position: relative;
-  height: 0;
-  padding: 75% 0 0 0;
-  overflow: hidden;
-}
-
 #photo-view-wrapper {
 	background-color: $item_colour;
 }
 
-#side-follow-wrapper {
-	margin-top: 20px;
-}
-
-#side-peoplefind-url::-webkit-input-placeholder, #side-advanced-peoplefind-url::-webkit-input-placeholder {
-	font-family: FontAwesome;
-}
-
-#side-peoplefind-url::-moz-placeholder, #side-advanced-peoplefind-url::-moz-placeholder {
-	font-family: FontAwesome;
-}
-
-
-#side-match-link {
-	margin-top: 10px;
-}
-
-
 .pmenu.horizontal {
 	padding: 0 0 0 0;
 	border-bottom: none;
@@ -655,11 +471,6 @@ footer {
 	padding-right: 15px;
 }
 
-#settings-default-perms-menu {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
 .group-delete-wrapper {
 	float: right;
 }
@@ -692,9 +503,9 @@ a.rateme, div.rateme {
 }
 
 #pause {
-  position: fixed;
-  bottom: 5px;
-  right: 5px;
+	position: fixed;
+	bottom: 5px;
+	right: 5px;
 }
 
 #vcard-end {
@@ -810,11 +621,6 @@ nav .acpopup {
 	width: 290px;
 }
 
-.profile-clear {
-	clear: both;
-}
-
-
 .clear {
 	clear: both;
 }
@@ -831,24 +637,11 @@ nav .acpopup {
 	margin-bottom: 20px;
 }
 
-/* end from default */
-	
-
 #network-new-link {
 	margin-top: 15px;
 	margin-bottom: 15px;
 }
 
-
-.tool-wrapper {
-  float: left;
-  margin-left: 15px;
-}
-
-.tool-link {
-  cursor: pointer;
-}
-
 #cboxOverlay {
 	z-index: 1050;
 }
@@ -865,29 +658,10 @@ nav .acpopup {
 	z-index: 1052;
 }
 
-.settings-block {
-	border: 1px solid #AAA;
-	margin: 10px;
-	padding: 10px;
-}
-
 .app-title {
 	margin: 10px;
 }
 
-#identity-manage-desc {
-	margin-top:15px;
-	margin-bottom: 15px;
-}
-
-#identity-manage-choose {
-	margin-bottom: 15px;
-}
-
-#identity-submit {
-	margin-top: 20px;
-}
-
 .profile-match-photo {
 	float: left;
 }
@@ -999,26 +773,10 @@ nav .acpopup {
 	margin-top: 15px;
 }
 
-
 .required {
 	color: #ff0000;
 }
 
-#item-delete-selected {
-	margin-top: 30px;
-}
-
-#item-delete-selected-end {
-	clear: both;
-}
-#item-delete-selected-icon, #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
-}
-#item-delete-selected-desc:hover {
-	text-decoration: underline;
-}
-
 .notif-image {
 	height: 80px;
 	width: 80px;
@@ -1030,18 +788,6 @@ nav .acpopup {
 }
 
 /**
- * Plugins settings
- */
-
-.settings-block > h3,
-.settings-heading {
-	border-bottom: 1px solid #babdb6;
-}
- 
-
-
-
-/**
  * OAuth
  */
 .oauthapp {
@@ -1145,7 +891,7 @@ div.jGrowl div.jGrowl-notification {
 }
 
 .jslider .jslider-scale ins {
-    color: #333;
+	color: #333;
 	font-size: $body_font_size;
 	width: 100px;
 	text-align: center;
@@ -1352,11 +1098,6 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
     font-size : 1.8em !important;
   }
 
-
-div.page-list-item {
-margin: 20px;
-}
-
 div#write-pages {
 display: block;
 background: silver;
@@ -1635,10 +1376,7 @@ img.mail-conv-sender-photo {
 
 .divgrow-showmore {
 	display: block;
-	width: 100%;
 	border-top: 1px dashed #ccc;
-	border-bottom-right-radius: $radiuspx;
-	border-bottom-left-radius: $radiuspx;
 	text-align: center;
 	font-size: $body_font_size;
 	color: $link_colour;
@@ -1649,6 +1387,9 @@ img.mail-conv-sender-photo {
 	border-top: 1px dashed #adadad;
 }
 
+.directory-item .divgrow-showmore {
+	background-color: $comment_item_colour;
+}
 
 /* widgets */
 
@@ -1887,9 +1628,8 @@ blockquote {
 	font-size: $font_size;
 	font-style: italic;
 	border-left: 3px solid #ccc;
-	padding: 0.4em;
-	color: #4d4d4d;
-	margin: 0px 0px 0px 20px;
+	padding: 1em 0px 1em 1.5em;
+	margin: 0px;
 }
 
 .badge {
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 0eb3dab1f..820e84baa 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -284,8 +284,12 @@ input {
 	border-radius: 0px;	
 }
 
+.home-welcome {
+	color: #FFF;
+	margin-bottom: 30px;
+} 
+
 #login-main {
-    max-width: 100%;
     margin-top: 0;
 }
 
@@ -341,7 +345,7 @@ input {
     background-color: #FFF;
 }
 
-.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit, input#newchannel-submit-button, input#contacts-search-submit {
+.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit, input#newchannel-submit-button, input#contacts-search-submit, input#register-submit-button {
     background-color: #FFF;
     color: #43488A;
 	border-radius: 0px;
@@ -350,7 +354,7 @@ input {
     transition: all .3s ease-in-out;
 }
 
-.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus, input#newchannel-submit-button:hover, input#newchannel-submit-button:focus, input#contacts-search-submit:hover, input#contacts-search-submit:focus {
+.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus, input#newchannel-submit-button:hover, input#newchannel-submit-button:focus, input#contacts-search-submit:hover, input#contacts-search-submit:focus, input#register-submit-button:hover, input#register-submit-button:focus {
     border-color: #FFF;
     background-color: #43488A;
     color: #FFF;
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
index 58d645dbf..57ac7f3e1 100755
--- a/view/tpl/admin_aside.tpl
+++ b/view/tpl/admin_aside.tpl
@@ -26,7 +26,7 @@
 {{if $admin.update}}
 <ul class="nav nav-pills nav-stacked">
 	<li><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
-	<li><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+	<li><a href=''>Important Changes</a></li>
 </ul>
 {{/if}}
 
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
index bdcc82c08..6225ae7bf 100755
--- a/view/tpl/admin_plugins_details.tpl
+++ b/view/tpl/admin_plugins_details.tpl
@@ -4,17 +4,18 @@
 	<p><i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
 	<p>{{$info.description}}</p>
 	
-	<p class="author">{{$str_author}}
 	{{foreach $info.author as $a}}
-		{{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}},
-	{{/foreach}}
+	<p class="author">{{$str_author}}
+		{{$a.name}}{{if $a.link}} {{$a.link}}{{/if}}
 	</p>
+	{{/foreach}}
+
 
-	<p class="maintainer">{{$str_maintainer}}
 	{{foreach $info.maintainer as $a}}
-		{{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}},
-	{{/foreach}}
+	<p class="maintainer">{{$str_maintainer}}
+		{{$a.name}}{{if $a.link}} {{$a.link}}{{/if}}
 	</p>
+	{{/foreach}}
 	
 	{{if $screenshot}}
 	<a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 4add59a0d..0e65dfa69 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -58,6 +58,7 @@
 	<h3>{{$registration}}</h3>
 	{{include file="field_input.tpl" field=$register_text}}
 	{{include file="field_select.tpl" field=$register_policy}}
+	{{include file="field_checkbox.tpl" field=$invite_only}}
 	{{include file="field_select.tpl" field=$access_policy}}
 	{{include file="field_textarea.tpl" field=$allowed_email}}
 	{{include file="field_textarea.tpl" field=$not_allowed_email}}	
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 08f0d4fbe..553bc3146 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -26,7 +26,7 @@
 						<div class="wall-item-photo-end" style="clear:both"></div>
 					</div>
 					{{if $item.title}}
-					<div class="wall-item-title" id="wall-item-title-{{$item.id}}">
+					<div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}">
 					<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
 					</div>
 					{{/if}}
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index cf1310ea6..e7ce22043 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -26,7 +26,7 @@
 						<div class="wall-item-photo-end" style="clear:both"></div>
 					</div>
 					{{if $item.title}}
-					<div class="wall-item-title" id="wall-item-title-{{$item.id}}">
+					<div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}">
 					<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
 					</div>
 					{{/if}}
diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl
deleted file mode 100644
index 27ec3dffc..000000000
--- a/view/tpl/diaspora_comment.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<XML>
-  <post>
-    <comment>
-      <guid>{{$guid}}</guid>
-      <parent_guid>{{$parent_guid}}</parent_guid>
-      <author_signature>{{$authorsig}}</author_signature>
-      <text>{{$body}}</text>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </comment>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/tpl/diaspora_comment_relay.tpl b/view/tpl/diaspora_comment_relay.tpl
deleted file mode 100644
index 37a9e88b3..000000000
--- a/view/tpl/diaspora_comment_relay.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<XML>
-  <post>
-    <comment>
-      <guid>{{$guid}}</guid>
-      <parent_guid>{{$parent_guid}}</parent_guid>
-      <parent_author_signature>{{$parentsig}}</parent_author_signature>
-      <author_signature>{{$authorsig}}</author_signature>
-      <text>{{$body}}</text>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </comment>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/tpl/diaspora_consensus.tpl b/view/tpl/diaspora_consensus.tpl
deleted file mode 100644
index b6b7cf13d..000000000
--- a/view/tpl/diaspora_consensus.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<poll>
-<guid>{{$guid_q}}</guid>
-<question>{{$question}}</question>
-<poll_answer>
-	<guid>{{$guid_y}}</guid>
-	<answer>{{$agree}}</answer>
-</poll_answer>
-<poll_answer>
-	<guid>{{$guid_n}}</guid>
-	<answer>{{$disagree}}</answer>
-</poll_answer>
-<poll_answer>
-	<guid>{{$guid_a}}</guid>
-	<answer>{{$abstain}}</answer>
-</poll_answer>
-</poll>
-
diff --git a/view/tpl/diaspora_conversation.tpl b/view/tpl/diaspora_conversation.tpl
deleted file mode 100644
index dc4482e4b..000000000
--- a/view/tpl/diaspora_conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<XML>
-  <post>
-    <conversation>
-      <guid>{{$conv.guid}}</guid>
-      <subject>{{$conv.subject}}</subject>
-      <created_at>{{$conv.created_at}}</created_at>
-
-      {{foreach $conv.messages as $msg}}
-
-      <message>
-        <guid>{{$msg.guid}}</guid>
-        <parent_guid>{{$msg.parent_guid}}</parent_guid>
-        {{if $msg.parent_author_signature}}
-        <parent_author_signature>{{$msg.parent_author_signature}}</parent_author_signature>
-        {{/if}}
-        <author_signature>{{$msg.author_signature}}</author_signature>
-        <text>{{$msg.text}}</text>
-        <created_at>{{$msg.created_at}}</created_at>
-        <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle>
-        <conversation_guid>{{$msg.conversation_guid}}</conversation_guid>
-      </message>
-
-      {{/foreach}}
-
-      <diaspora_handle>{{$conv.diaspora_handle}}</diaspora_handle>
-      <participant_handles>{{$conv.participant_handles}}</participant_handles>
-    </conversation>
-  </post>
-</XML>
diff --git a/view/tpl/diaspora_like.tpl b/view/tpl/diaspora_like.tpl
deleted file mode 100644
index a27e92240..000000000
--- a/view/tpl/diaspora_like.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<XML>
-  <post>
-    <like>
-      <positive>{{$positive}}</positive>
-      <guid>{{$guid}}</guid>
-      <target_type>{{$target_type}}</target_type>
-      <parent_guid>{{$parent_guid}}</parent_guid>
-      <author_signature>{{$authorsig}}</author_signature>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </like>
-  </post>
-</XML>
diff --git a/view/tpl/diaspora_like_relay.tpl b/view/tpl/diaspora_like_relay.tpl
deleted file mode 100644
index 8209540c5..000000000
--- a/view/tpl/diaspora_like_relay.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-    <like>
-      <positive>{{$positive}}</positive>
-      <guid>{{$guid}}</guid>
-      <target_type>{{$target_type}}</target_type>
-      <parent_guid>{{$parent_guid}}</parent_guid>
-      <parent_author_signature>{{$parentsig}}</parent_author_signature>
-      <author_signature>{{$authorsig}}</author_signature>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </like>
-  </post>
-</XML>
diff --git a/view/tpl/diaspora_message.tpl b/view/tpl/diaspora_message.tpl
deleted file mode 100644
index 3413d79b0..000000000
--- a/view/tpl/diaspora_message.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-      <message>
-        <guid>{{$msg.guid}}</guid>
-        <parent_guid>{{$msg.parent_guid}}</parent_guid>
-        <author_signature>{{$msg.author_signature}}</author_signature>
-        <text>{{$msg.text}}</text>
-        <created_at>{{$msg.created_at}}</created_at>
-        <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle>
-        <conversation_guid>{{$msg.conversation_guid}}</conversation_guid>
-      </message>
-  </post>
-</XML>
diff --git a/view/tpl/diaspora_photo.tpl b/view/tpl/diaspora_photo.tpl
deleted file mode 100644
index 256459d8d..000000000
--- a/view/tpl/diaspora_photo.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-    <photo>
-      <guid>{{$guid}}</guid>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-      <public>{{$public}}</public>
-      <created_at>{{$created_at}}</created_at>
-      <remote_photo_path>{{$path}}</remote_photo_path>
-      <remote_photo_name>{{$filename}}</remote_photo_name>
-      <status_message_guid>{{$msg_guid}}</status_message_guid>
-    </photo>
-  </post>
-</XML>
diff --git a/view/tpl/diaspora_post.tpl b/view/tpl/diaspora_post.tpl
deleted file mode 100644
index ebfe9e5b7..000000000
--- a/view/tpl/diaspora_post.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-    <status_message>
-      <raw_message>{{$body}}</raw_message>
-      <guid>{{$guid}}</guid>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-      {{$poll}}
-      <public>{{$public}}</public>
-      <created_at>{{$created}}</created_at>
-      <provider_display_name>{{$provider}}</provider_display_name>
-    </status_message>
-  </post>
-</XML>
diff --git a/view/tpl/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl
deleted file mode 100644
index 5e7aed41f..000000000
--- a/view/tpl/diaspora_relay_retraction.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<XML>
-  <post>
-    <relayable_retraction>
-      <target_type>{{$type}}</target_type>
-      <target_guid>{{$guid}}</target_guid>
-      <target_author_signature>{{$signature}}</target_author_signature>
-      <sender_handle>{{$handle}}</sender_handle>
-    </relayable_retraction>
-  </post>
-</XML>
diff --git a/view/tpl/diaspora_relayable_retraction.tpl b/view/tpl/diaspora_relayable_retraction.tpl
deleted file mode 100644
index 4e3ff3243..000000000
--- a/view/tpl/diaspora_relayable_retraction.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<XML>
-  <post>
-    <relayable_retraction>
-      <parent_author_signature>{{$parentsig}}</parent_author_signature>
-      <target_guid>{{$guid}}</target_guid>
-      <target_type>{{$target_type}}</target_type>
-      <sender_handle>{{$handle}}</sender_handle>
-      <target_author_signature>{{$authorsig}}</target_author_signature>
-    </relayable_retraction>
-  </post>
-</XML>
diff --git a/view/tpl/diaspora_reshare.tpl b/view/tpl/diaspora_reshare.tpl
deleted file mode 100644
index 963bb9e12..000000000
--- a/view/tpl/diaspora_reshare.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-    <reshare>
-      <root_diaspora_id>{{$root_handle}}</root_diaspora_id>
-      <root_guid>{{$root_guid}}</root_guid>
-      <guid>{{$guid}}</guid>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-      <public>{{$public}}</public>
-      <created_at>{{$created}}</created_at>
-      <provider_display_name>{{$provider}}</provider_display_name>
-    </reshare>
-  </post>
-</XML>
diff --git a/view/tpl/diaspora_retract.tpl b/view/tpl/diaspora_retract.tpl
deleted file mode 100644
index 9df066d38..000000000
--- a/view/tpl/diaspora_retract.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<XML>
-  <post>
-    <retraction>
-      <post_guid>{{$guid}}</post_guid>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-      <type>{{$type}}</type>
-    </retraction>
-  </post>
-</XML>
diff --git a/view/tpl/diaspora_share.tpl b/view/tpl/diaspora_share.tpl
deleted file mode 100644
index 59eb06124..000000000
--- a/view/tpl/diaspora_share.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<XML>
-  <post>
-    <request>
-      <sender_handle>{{$sender}}</sender_handle>
-      <recipient_handle>{{$recipient}}</recipient_handle>
-    </request>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/tpl/diaspora_signed_retract.tpl b/view/tpl/diaspora_signed_retract.tpl
deleted file mode 100644
index f0f346da8..000000000
--- a/view/tpl/diaspora_signed_retract.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<XML>
-  <post>
-    <signed_retraction>
-      <target_guid>{{$guid}}</target_guid>
-      <target_type>{{$type}}</target_type>
-      <sender_handle>{{$handle}}</sender_handle>
-      <target_author_signature>{{$signature}}</target_author_signature>
-    </signed_retraction>
-  </post>
-</XML>
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index 6407f1edd..ecc38beb9 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -14,7 +14,7 @@
 		</div>
 		<h3>{{if $entry.public_forum}}<i class="icon-comments-alt" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
 	</div>
-	<div class="section-content-wrapper directory-collapse">
+	<div class="section-content-tools-wrapper directory-collapse">
 		<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" >
 			<div class="contact-photo" id="directory-photo-{{$entry.hash}}" >
 				<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.hash}}" >
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index e99128bbb..d85c234f1 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -13,6 +13,7 @@
 		<input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />
 		{{/if}}
 		{{if $notself && $field.5}}
+		<input type="hidden" name='{{$field.0}}' value="{{if $field.7}}1{{else}}0{{/if}}" />
 		{{if $field.3}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}}
 		{{/if}}
 	</td>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index e7edb7e64..32a08a9b3 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -118,8 +118,6 @@
 						<li class="divider visible-xs"></li>
 						{{if $writefiles}}<li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li>{{/if}}
 						<li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i>&nbsp;{{$weblink}}</a></li>
-						<!--li class="visible-xs"><a href="#" onclick="jotVideoURL(); return false;"><i class="icon-facetime-video"></i>&nbsp;{{$video}}</a></li-->
-						<!--li class="visible-xs"><a href="#" onclick="jotAudioURL(); return false;"><i class="icon-volume-up"></i>&nbsp;{{$audio}}</a></li-->
 						{{/if}}
 						<li class="divider visible-xs"></li>
 						<li class="visible-xs visible-sm"><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i>&nbsp;{{$setloc}}</a></li>
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index f78a3fc2d..46b32b8a9 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -5,10 +5,13 @@
 
 	<div id="newchannel-desc" class="descriptive-paragraph">{{$desc}}</div>
 
-	<div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div>
-	{{include file="field_select_grouped.tpl" field=$role}}
-	<div id="newchannel-role-end"  class="newchannel-field-end"></div>
-
+	{{if $default_role}}
+		<input type="hidden" name="permissions_role" value="{{$default_role}}" />
+	{{else}}
+		<div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div>
+		{{include file="field_select_grouped.tpl" field=$role}}
+		<div id="newchannel-role-end"  class="newchannel-field-end"></div>
+	{{/if}}
 
 	<label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >{{$label_name}}</label>
 	<input type="text" name="name" id="newchannel-name" class="newchannel-input" value="{{$name}}" />
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index bbcdcefc1..95169164a 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -21,7 +21,7 @@
 	{{$upload_form}}
 	{{$album_edit.1}}
 	<div class="section-content-wrapper-np">
-		<div id="photo-album-contents">
+		<div id="photo-album-contents-{{$album_id}}">
 			{{foreach $photos as $photo}}
 				{{include file="photo_top.tpl"}}
 			{{/foreach}}
@@ -30,5 +30,5 @@
 	</div>
 </div>
 <div class="photos-end"></div>
-<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
+<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
 <div id="page-spinner"></div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 46ac65e87..f3131117c 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -8,7 +8,7 @@
 	</div>
 	{{$upload_form}}
 	<div class="section-content-wrapper-np">
-		<div id="photo-album-contents">
+		<div id="photo-album-contents-{{$album_id}}">
 			{{foreach $photos as $photo}}
 				{{include file="photo_top.tpl"}}
 			{{/foreach}}
@@ -17,5 +17,5 @@
 	</div>
 </div>
 <div class="photos-end"></div>
-<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
+<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
 <div id="page-spinner"></div>
diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl
index 705cb6c75..45191db85 100755
--- a/view/tpl/photosajax.tpl
+++ b/view/tpl/photosajax.tpl
@@ -1,4 +1,4 @@
 {{foreach $photos as $photo}}
 {{include file="photo_top.tpl"}}
 {{/foreach}}
-<script>justifyPhotosAjax()</script>
+<script>justifyPhotosAjax('photo-album-contents-{{$album_id}}')</script>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index b2689c7ba..872551529 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -20,7 +20,7 @@
 					<div class="wall-item-photo-end" style="clear:both"></div>
 				</div>
 				{{if $item.title}}
-				<div class="wall-item-title" id="wall-item-title-{{$item.id}}">
+				<div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}">
 				<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
 				</div>
 				{{/if}}
@@ -65,11 +65,6 @@
 					<span class="tag">{{$item.folders}}</span>
 				</div>
 				{{/if}}
-				{{if $item.attachments}}
-				<div class="body-tags" id="item-attachments">
-					<span class='tag'>{{$item.attachments}}</span>
-				</div>
-				{{/if}}
 				<div class="clear"></div>
 			</div>
 			{{/if}}
@@ -88,6 +83,12 @@
 						{{/if}}
 					</ul>
 				</div>
+				{{if $item.attachments}}
+				<div class="wall-item-tools-left btn-group">
+					<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+					<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
+				</div>
+				{{/if}}
 				<div class="clear"></div>
 			</div>
 			<div class="clear"></div>
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
index 631ed3f18..754eb3944 100755
--- a/view/tpl/xrd_person.tpl
+++ b/view/tpl/xrd_person.tpl
@@ -17,6 +17,8 @@
     <Link rel="http://microformats.org/profile/hcard"
           type="text/html"
           href="{{$hcard_url}}" />
+    <Link rel="http://ostatus.org/schema/1.0/subscribe"
+          template="{{$subscribe}}" />
 
    <Link rel="magic-public-key"
           href="{{$modexp}}" />
diff --git a/zot b/zot
deleted file mode 160000
-Subproject d94e61a7b627381715751fb6cb6c0cecf7ece3f