From b263f11d77db347122bce22de23587fbb2b0edff Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Fri, 7 Jun 2013 20:40:36 +0100
Subject: Another missing include

---
 mod/import.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod/import.php b/mod/import.php
index d1b3216d0..b7e48ed7a 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -5,6 +5,7 @@
 
 require_once('include/Contact.php');
 require_once('include/zot.php');
+require_once('include/identity.php');
 
 function import_post(&$a) {
 
-- 
cgit v1.2.3


From 4132cab862608f05c7a5b1467e5a66df9070b01b Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Fri, 7 Jun 2013 22:53:43 +0100
Subject: Rename newmessage widget (since we'll need to put more stuff in it as
 we make zotmail look like email), and add a "check mail" button.

---
 mod/message.php           | 9 ++++++++-
 view/tpl/message_side.tpl | 6 +-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/mod/message.php b/mod/message.php
index 93b5c2494..54615f081 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -9,13 +9,20 @@ require_once('include/Contact.php');
 
 function message_aside(&$a) {
 
-	$a->set_widget('newmessage',replace_macros(get_markup_template('message_side.tpl'), array(
+	$a->set_widget('msgaside',replace_macros(get_markup_template('message_side.tpl'), array(
 		'$tabs'=> array(),
+
+		'$check'=>array(
+			'label' => t('Check Mail'),
+			'url' => $a->get_baseurl(true) . '/message',
+			'sel' => (argv(1) == ''),
+		),
 		'$new'=>array(
 			'label' => t('New Message'),
 			'url' => $a->get_baseurl(true) . '/message/new',
 			'sel'=> (argv(1) == 'new'),
 		)
+
 	)));
 
 }
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
index 7da22ee3e..4db427fa7 100755
--- a/view/tpl/message_side.tpl
+++ b/view/tpl/message_side.tpl
@@ -1,9 +1,5 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <div id="message-sidebar" class="widget">
+	<div id="message-check"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div>
 	<div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
 	
 	<ul class="message-ul">
-- 
cgit v1.2.3