6 files changed, 624 insertions, 0 deletions
diff --git a/library/Mobile_Detect/Mobile_Detect.php b/library/Mobile_Detect/Mobile_Detect.php
new file mode 100644
index 000000000..4b8c9fecb
--- /dev/null
+++ b/library/Mobile_Detect/Mobile_Detect.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Mobile Detect
+ * $Id: Mobile_Detect.php 49 2012-06-06 20:46:30Z serbanghita@gmail.com $
+ * 
+ * @usage      require_once 'Mobile_Detect.php';
+ *             $detect = new Mobile_Detect();
+ *             $detect->isMobile() or $detect->isTablet()
+ * 
+ *             For more specific usage see the documentation navigate to:
+ *             http://code.google.com/p/php-mobile-detect/wiki/Mobile_Detect
+ * 
+ * @license    http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+class Mobile_Detect {
+    
+    protected $detectionRules;
+    protected $userAgent = null;
+    protected $accept = null;
+    // Assume the visitor has a desktop environment.
+    protected $isMobile = false;
+    protected $isTablet = false;
+    protected $phoneDeviceName = null;
+    protected $tabletDevicename = null;
+    protected $operatingSystemName = null;
+    protected $userAgentName = null;
+    // List of mobile devices (phones)
+    protected $phoneDevices = array(     
+            'iPhone'        => '(iPhone.*Mobile|iPod|iTunes)',
+            'BlackBerry'    => 'BlackBerry|rim[0-9]+',
+            'HTC'           => 'HTC|HTC.*(6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT',
+            'Nexus'         => 'Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus',
+            'Dell'          => 'Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35',
+            'Motorola'      => '\bDroid\b.*Build|DROIDX|HRI39|MOT\-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT909|XT910|XT912|XT928',
+            'Samsung'       => 'Samsung|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9300 |GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-P6810|GT-P7100|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100',
+            'Sony'          => 'E10i|SonyEricsson|SonyEricssonLT15iv',
+            'Asus'          => 'Asus.*Galaxy',
+            'Palm'          => 'PalmSource|Palm', // avantgo|blazer|elaine|hiptop|plucker|xiino ; @todo - complete the regex.
+	        'Vertu'         => 'Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature', // Just for fun ;)
+            'GenericPhone'  => '(mmp|pocket|psp|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|wap|nokia|Series40|Series60|S60|SonyEricsson|N900|PPC;|MAUI.*WAP.*Browser|LG-P500)'
+    );
+    // List of tablet devices.
+    protected $tabletDevices = array(
+        'BlackBerryTablet'  => 'PlayBook|RIM Tablet',
+        'iPad'              => 'iPad|iPad.*Mobile', // @todo: check for mobile friendly emails topic.
+        'Kindle'            => 'Kindle|Silk.*Accelerated',
+        'SamsungTablet'     => 'SAMSUNG.*Tablet|Galaxy.*Tab|GT-P1000|GT-P1010|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P1000|GT-P3100|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7300|GT-P7320|GT-P7500|GT-P7510|GT-P7511',
+        'HTCtablet'         => 'HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200',
+	    'MotorolaTablet'    => 'xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617',
+        'AsusTablet'        => 'Transformer|TF101',
+        'NookTablet'        => 'NookColor|nook browser|BNTV250A|LogicPD Zoom2',
+        'AcerTablet'        => 'Android.*\b(A100|A101|A200|A500|A501|A510|W500|W500P|W501|W501P)\b',
+	    'YarvikTablet'      => 'Android.*(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468)',
+        'GenericTablet'     => 'Tablet(?!.*PC)|ViewPad7|LG-V909|MID7015|BNTV250A|LogicPD Zoom2|\bA7EB\b|CatNova8|A1_07|CT704|CT1002|\bM721\b',
+    );
+    // List of mobile Operating Systems.
+    protected $operatingSystems = array(
+        'AndroidOS'         => '(android.*mobile|android(?!.*mobile))',
+        'BlackBerryOS'      => '(blackberry|rim tablet os)',
+        'PalmOS'            => '(avantgo|blazer|elaine|hiptop|palm|plucker|xiino)',
+        'SymbianOS'         => 'Symbian|SymbOS|Series60|Series40|\bS60\b',
+        'WindowsMobileOS'   => 'IEMobile|Windows Phone|Windows CE.*(PPC|Smartphone)|MSIEMobile|Window Mobile|XBLWP7',
+        'iOS'               => '(iphone|ipod|ipad)',
+        'FlashLiteOS'       => '',
+        'JavaOS'            => '',
+        'NokiaOS'           => '',
+        'webOS'             => '',
+        'badaOS'            => '\bBada\b',
+        'BREWOS'            => '',
+    );
+    // List of mobile User Agents.
+    protected $userAgents = array(      
+      'Chrome'          => '\bCrMo\b|Chrome\/[.0-9]* Mobile',
+      'Dolfin'          => '\bDolfin\b',
+      'Opera'           => 'Opera.*Mini|Opera.*Mobi|Android.*Opera',
+      'Skyfire'         => 'skyfire',
+      'IE'              => 'IEMobile|MSIEMobile',
+      'Firefox'         => 'fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile',
+      'Bolt'            => 'bolt',
+      'TeaShark'        => 'teashark',
+      'Blazer'          => 'Blazer',
+      'Safari'          => 'Mobile.*Safari|Safari.*Mobile',
+      'Midori'          => 'midori',
+      'GenericBrowser'  => 'NokiaBrowser|OviBrowser|SEMC.*Browser'
+    );
+    
+    function __construct(){
+        
+        // Merge all rules together.
+        $this->detectionRules = array_merge(
+                                            $this->phoneDevices, 
+                                            $this->tabletDevices, 
+                                            $this->operatingSystems, 
+                                            $this->userAgents
+                                            );
+        $this->userAgent    = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
+        $this->accept       = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
+        
+        if (
+		isset($_SERVER['HTTP_X_WAP_PROFILE']) ||
+        isset($_SERVER['HTTP_X_WAP_CLIENTID']) ||
+        isset($_SERVER['HTTP_WAP_CONNECTION']) ||
+		isset($_SERVER['HTTP_PROFILE']) ||
+		isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || // Reported by Nokia devices (eg. C3)
+        isset($_SERVER['HTTP_X_NOKIA_IPADDRESS']) ||
+        isset($_SERVER['HTTP_X_NOKIA_GATEWAY_ID']) ||
+        isset($_SERVER['HTTP_X_ORANGE_ID']) ||
+        isset($_SERVER['HTTP_X_VODAFONE_3GPDPCONTEXT']) ||
+        isset($_SERVER['HTTP_X_HUAWEI_USERID']) ||
+        isset($_SERVER['HTTP_UA_OS']) || // Reported by Windows Smartphones
+        (isset($_SERVER['HTTP_UA_CPU']) && $_SERVER['HTTP_UA_CPU'] == 'ARM') // Seen this on a HTC
+		) {
+                $this->isMobile = true;
+        } elseif (!empty($this->accept) && (strpos($this->accept, 'text/vnd.wap.wml') !== false || strpos($this->accept, 'application/vnd.wap.xhtml+xml') !== false)) {
+                $this->isMobile = true;
+        } else {
+                $this->_detect();
+        }        
+        
+    }
+	
+    public function getRules()
+    {
+        return $this->detectionRules;
+    }
+    
+    /**
+     * Magic overloading method.
+     * 
+     * @method boolean is[...]()
+     * @param string $name
+     * @param array $arguments
+     * @return mixed 
+     */
+    public function __call($name, $arguments)
+    {
+                
+        $key = substr($name, 2);
+        return $this->_detect($key);
+        
+    }
+    
+    /**
+     * Private method that does the detection of the 
+     * mobile devices.
+     * 
+     * @param string $key
+     * @return boolean|null 
+     */
+    private function _detect($key='')
+    {
+
+        if(empty($key)){ 
+
+            // Begin general search.
+            foreach($this->detectionRules as $_regex){
+                if(empty($_regex)){ continue; }
+                if(preg_match('/'.$_regex.'/is', $this->userAgent)){
+                    $this->isMobile = true;
+                    return true;
+                } 
+            }
+            return false;
+
+        } else {
+            
+            // Search for a certain key.
+            // Make the keys lowecase so we can match: isIphone(), isiPhone(), isiphone(), etc.
+            $key = strtolower($key);
+            $_rules = array_change_key_case($this->detectionRules);
+            
+            if(array_key_exists($key, $_rules)){
+                if(empty($_rules[$key])){ return null; }
+                if(preg_match('/'.$_rules[$key].'/is', $this->userAgent)){
+                    $this->isMobile = true;
+                    return true;
+                } else {
+                    return false;
+                }           
+            } else {
+                trigger_error("Method $key is not defined", E_USER_WARNING);
+            }
+            
+            return false;
+
+        }
+
+    }
+        
+    /**
+    * Check if the device is mobile.
+    * Returns true if any type of mobile device detected, including special ones
+    * @return bool
+    */
+    public function isMobile()
+    {
+	    return $this->isMobile;
+    } 
+    
+    /**
+    * Check if the device is a tablet.
+    * Return true if any type of tablet device is detected.
+    * @return boolean 
+    */
+    public function isTablet()
+    {
+
+	foreach($this->tabletDevices as $_regex){
+	    if(preg_match('/'.$_regex.'/is', $this->userAgent)){
+		$this->isTablet = true;
+		return true;
+	    }
+	}
+
+	return false;        
+
+    }
+    
+    
+}
+\ No newline at end of file
diff --git a/mod/zentity.php b/mod/zentity.php
new file mode 100644
index 000000000..32170a642
--- /dev/null
+++ b/mod/zentity.php
@@ -0,0 +1,296 @@
+<?php
+
+
+function zentity_init(&$a) {
+	$a->page['template'] = 'full';
+
+	$cmd = ((argc() > 1) ? argv(1) : '');
+
+
+	if($cmd === 'email_check.json') {
+		$result = array('error' => false, 'message' => '');
+		$email = $_REQUEST['email'];
+
+		if(! allowed_email($email))
+			$result['message'] = t('Your email domain is not among those allowed on this site');
+		if((! valid_email($email)) || (! validate_email($email)))
+			$result['message'] .= t('Not a valid email address') . EOL;
+		if($result['message'])
+			$result['error'] = true;
+
+		header('content-type: application/json');
+		echo json_encode($result);
+		killme();		
+	}
+
+	$pw1 = t("Password too short");
+	$pw2 = t("Passwords do not match");
+
+	$a->page['htmlhead'] .= <<< EOT
+<script>
+	function zFormError(elm,x) {
+		if(x) {
+			$(elm).addClass("zform-error");
+			$(elm).removeClass("zform-ok");
+		}
+		else {
+			$(elm).addClass("zform-ok");
+			$(elm).removeClass("zform-error");
+		}											
+	}
+	$(document).ready(function() {
+		$("#zregister-email").blur(function() {
+			var zreg_email = $("#zregister-email").val();
+			$.get("zregister/email_check.json?f=&email=" + encodeURIComponent(zreg_email),function(data) {
+				$("#zregister-email-feedback").html(data.message);
+				zFormError("#zregister-email-feedback",data.error);
+			});
+		});
+		$("#zregister-password").blur(function() {
+			if(($("#zregister-password").val()).length < 6 ) {
+				$("#zregister-password-feedback").html("$pw1");
+				zFormError("#zregister-password-feedback",true);
+			}
+			else {
+				$("#zregister-password-feedback").html("");
+				zFormError("#zregister-password-feedback",false);
+			}
+		});
+		$("#zregister-password2").blur(function() {
+			if($("#zregister-password").val() != $("#zregister-password2").val()) {
+				$("#zregister-password2-feedback").html("$pw2");
+				zFormError("#zregister-password2-feedback",true);
+			}
+			else {
+				$("#zregister-password2-feedback").html("");
+				zFormError("#zregister-password2-feedback",false);
+			}
+		});
+	});
+
+</script>
+
+EOT;
+
+}
+
+
+function zentity_post(&$a) {
+
+	$verified = 0;
+	$blocked  = 1;
+
+	$arr = array('post' => $_POST);
+	call_hooks('zregister_post', $arr);
+
+	$max_dailies = intval(get_config('system','max_daily_registrations'));
+	if($max_dailies) {
+		$r = q("select count(*) as total from account where account_created > UTC_TIMESTAMP - INTERVAL 1 day");
+		if($r && $r[0]['total'] >= $max_dailies) {
+			return;
+		}
+	}
+
+	switch(get_config('system','register_policy')) {
+
+	case REGISTER_OPEN:
+		$blocked = 0;
+		$verified = 0;
+		break;
+
+	case REGISTER_APPROVE:
+		$blocked = 0;
+		$verified = 0;
+		break;
+
+	default:
+	case REGISTER_CLOSED:
+		// TODO check against service class and fix this line
+		if((! x($_SESSION,'authenticated') && (! x($_SESSION,'administrator')))) {
+			notice( t('Permission denied.') . EOL );
+			return;
+		}
+		$blocked = 1;
+		$verified = 0;
+		break;
+	}
+
+	require_once('include/account.php');
+
+	$arr = $_POST;
+
+	$arr['blocked'] = $blocked;
+	$arr['verified'] = $verified;
+
+	$result = create_account($arr);
+
+	if(! $result['success']) {
+		notice($result['message']);
+		return;
+	}
+
+	$user = $result['user'];
+ 
+	$using_invites = get_config('system','invitation_only');
+	$num_invites   = get_config('system','number_invites');
+	$invite_id  = ((x($_POST,'invite_id'))  ? notags(trim($_POST['invite_id']))  : '');
+
+
+	if( $a->config['register_policy'] == REGISTER_OPEN ) {
+
+		if($using_invites && $invite_id) {
+			q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
+			set_pconfig($user['uid'],'system','invites_remaining',$num_invites);
+		}
+
+		$email_tpl = get_intltext_template("register_open_eml.tpl");
+		$email_tpl = replace_macros($email_tpl, array(
+				'$sitename' => $a->config['sitename'],
+				'$siteurl' =>  $a->get_baseurl(),
+				'$username' => $user['username'],
+				'$email' => $user['email'],
+				'$password' => $result['password'],
+				'$uid' => $user['uid'] ));
+
+		$res = mail($user['email'], sprintf(t('Registration details for %s'), $a->config['sitename']),
+			$email_tpl, 
+				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				. 'Content-type: text/plain; charset=UTF-8' . "\n"
+				. 'Content-transfer-encoding: 8bit' );
+
+
+		if($res) {
+			info( t('Registration successful. Please check your email for further instructions.') . EOL ) ;
+			goaway(z_root());
+		}
+	}
+	elseif($a->config['register_policy'] == REGISTER_APPROVE) {
+
+		if(! strlen($a->config['admin_email'])) {
+			notice( t('Your registration can not be processed.') . EOL);
+			goaway(z_root());
+		}
+
+		$hash = random_string();
+		$r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language` ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
+			dbesc($hash),
+			dbesc(datetime_convert()),
+			intval($user['uid']),
+			dbesc($result['password']),
+			dbesc($a->language)
+		);
+
+		$r = q("SELECT `language` FROM `user` WHERE `email` = '%s' LIMIT 1",
+			dbesc($a->config['admin_email'])
+		);
+		if(count($r))
+			push_lang($r[0]['language']);
+		else
+			push_lang('en');
+
+		if($using_invites && $invite_id) {
+			q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
+			set_pconfig($user['uid'],'system','invites_remaining',$num_invites);
+		}
+
+		$email_tpl = get_intltext_template("register_verify_eml.tpl");
+		$email_tpl = replace_macros($email_tpl, array(
+				'$sitename' => $a->config['sitename'],
+				'$siteurl' =>  $a->get_baseurl(),
+				'$username' => $user['username'],
+				'$email' => $user['email'],
+				'$password' => $result['password'],
+				'$uid' => $user['uid'],
+				'$hash' => $hash
+		 ));
+
+		$res = mail($a->config['admin_email'], sprintf(t('Registration request at %s'), $a->config['sitename']),
+			$email_tpl,
+				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				. 'Content-type: text/plain; charset=UTF-8' . "\n"
+				. 'Content-transfer-encoding: 8bit' );
+
+		pop_lang();
+
+		if($res) {
+			info( t('Your registration is pending approval by the site owner.') . EOL ) ;
+			goaway(z_root());
+		}
+
+	}
+
+	return;
+}
+
+
+
+
+
+
+
+function zentity_content(&$a) {
+
+
+	if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
+		notice("Permission denied." . EOL);
+		return;
+	}
+
+	$max_dailies = intval(get_config('system','max_daily_registrations'));
+	if($max_dailies) {
+		$r = q("select count(*) as total from account where account_created > UTC_TIMESTAMP - INTERVAL 1 day");
+		if($r && $r[0]['total'] >= $max_dailies) {
+			logger('max daily registrations exceeded.');
+			notice( t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL);
+			return;
+		}
+	}
+
+	// Configurable terms of service link
+
+	$tosurl = get_config('system','tos_url');
+	if(! $tosurl)
+		$tosurl = $a->get_baseurl() . '/help/TermsOfService';
+
+	$toslink = '<a href="' . $tosurl . '" >' . t('Terms of Service') . '</a>';
+
+	// Configurable whether to restrict age or not - default is based on international legal requirements
+	// This can be relaxed if you are on a restricted server that does not share with public servers
+
+	if(get_config('system','no_age_restriction')) 
+		$label_tos = sprintf( t('I accept the %s for this website'), $toslink);
+	else
+		$label_tos = t('Check this box to import an existing identity file from another location');
+
+
+	$email        = ((x($_REQUEST,'email'))        ? $_REQUEST['email']        :  "" );
+	$password     = ((x($_REQUEST,'password'))     ? $_REQUEST['password']     :  "" );
+	$password2    = ((x($_REQUEST,'password2'))    ? $_REQUEST['password2']    :  "" );
+	$invite_code  = ((x($_REQUEST,'invite_code'))  ? $_REQUEST['invite_code']  :  "" );
+
+
+
+	$o = replace_macros(get_markup_template('zentity.tpl'), array(
+
+		'$title'        => t('Create Identity'),
+		'$registertext' => t('An identity is a profile container for a personal profile, blog, public or private group/forum, celebrity page, and more.<br />You may create as many of these as your hub provider allows.'),
+		'$invitations'  => get_config('system','invitation_only'),
+		'$invite_desc'  => t('Membership on this site is by invitation only.'),
+		'$label_invite' => t('Please enter your invitation code'),
+		'$invite_id'    => $invite_id,
+
+		'$label_email'  => t('Full name'),
+		'$label_pass1'  => t('Choose a short nickname'),
+		'$label_pass2'  => t('Your nickname will be used to create an easily remembered web address ("webbie") for your profile.'),
+		'$label_tos'    => $label_tos,
+	
+		'$email'        => $email,
+		'$pass1'        => $password,
+		'$pass2'        => $password2,
+		'$submit'       => t('Create')
+	));
+
+	return $o;
+
+}
+
diff --git a/view/conv.tpl b/view/conv.tpl
new file mode 100644
index 000000000..b7222f154
--- /dev/null
+++ b/view/conv.tpl
@@ -0,0 +1,17 @@
+{{ for $threads as $thread }}
+<div id="thread-wrapper-$thread.id" class="thread-wrapper">
+	{{ for $thread.items as $item }}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			</div>
+			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+		{{endif}}
+		{{if $item.comment_lastcollapsed}}</div>{{endif}}
+		
+		{{ inc $item.template }}{{ endinc }}
+		
+		
+	{{ endfor }}
+</div>
+{{ endfor }}
diff --git a/view/conv_frame.tpl b/view/conv_frame.tpl
new file mode 100644
index 000000000..ed3e87050
--- /dev/null
+++ b/view/conv_frame.tpl
@@ -0,0 +1,11 @@
+<div id="threads-begin"></div>
+<div id="threads-end"></div>
+<div id="conversation-end"></div>
+
+{{ if $dropping }}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >$dropping</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{ endif }}
diff --git a/view/mod_zentity.css b/view/mod_zentity.css
new file mode 100644
index 000000000..2edb9e9a9
--- /dev/null
+++ b/view/mod_zentity.css
@@ -0,0 +1,33 @@
+
+h2 {
+	margin-left: 15%;
+	margin-top: 15%;
+}
+
+#zregister-form {
+	font-size: 1.4em;	
+	margin-left: 15%;
+	margin-top: 5%;
+}
+
+.zregister-label {
+	float: left;
+	width: 275px;
+}
+
+.zregister-input {
+	float: left;
+	width: 275px;
+	padding: 5px;
+}
+
+.zregister-feedback {
+	float: left;
+	margin-left: 5px;
+}
+
+.zregister-field-end {
+	clear: both;
+	margin-bottom: 20px;
+}
+
diff --git a/view/zentity.tpl b/view/zentity.tpl
new file mode 100644
index 000000000..f34042d05
--- /dev/null
+++ b/view/zentity.tpl
@@ -0,0 +1,46 @@
+<h2>$title</h2>
+
+<form action="zregister" method="post" id="zregister-form">
+
+{{ if $registertext }}
+<div id="zregister-desc" style="color: #888; margin-bottom: 50px;" class="descriptive-paragraph">$registertext</div>
+{{ endif }}
+
+{{ if $invitations }}
+	<p id="register-invite-desc">$invite_desc</p>
+
+	<label for="zregister-invite" id="label-zregister-invite" class="zregister-label">$label_invite</label>
+	<input type="text" maxlength="72" size="32" name="invite_id" id="zregister-invite" class="zregister-input" value="$invite_id" >
+	</div>
+	<div id="zregister-invite-feedback" class="zregister-feedback"></div>
+	<div id="zregister-invite-end" class="zregister-field-end"></div>
+
+{{ endif }}
+
+
+	<label for="zregister-email" id="label-zregister-email" class="zregister-label" >$label_email</label>
+	<input type="text" maxlength="72" size="32" name="email" id="zregister-email" class="zregister-input" value="$email" >
+	<div id="zregister-email-feedback" class="zregister-feedback"></div>
+	<div id="zregister-email-end"  class="zregister-field-end"></div>
+
+	<label for="zregister-password" id="label-zregister-password" class="zregister-label" >$label_pass1</label>
+	<input type="text" maxlength="72" size="32" name="password" id="zregister-password" class="zregister-input" value="$pass1" >
+	<div id="zregister-password-feedback" class="zregister-feedback"></div>
+	<div id="zregister-password-end"  class="zregister-field-end"></div>
+
+	<div class="clear">
+	<div style="color: #888;">$label_pass2</div>
+	<div id="zregister-password2-end"  class="zregister-field-end"></div>
+
+	<div style="margin-bottom: 25px;">&nbsp;</div>
+
+
+	<input type="checkbox" name="tos" id="zregister-tos" value="1" >
+	<label for="zregister-tos" id="label-zregister-tos">$label_tos</label>
+	<div id="zregister-tos-feedback" class="zregister-feedback"></div>
+	<div id="zregister-tos-end"  class="zregister-field-end"></div>
+
+	<input type="submit" name="submit" id="zregister-submit-button" value="$submit" />
+	<div id="zregister-submit-end" class="zregister-field-end"></div>
+
+</form>